From 302635bb8fa9b61e9646dcd49574a2dedcafd3de Mon Sep 17 00:00:00 2001 From: John Darrington Date: Sun, 5 Sep 2021 13:16:33 +0200 Subject: [PATCH] Windows/build-dependencies: Add -fstack-protector flags For some reason this flag seems to be necessary with the latest x86_64_w64-mingw32 toolchain. --- Windows/build-dependencies | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/Windows/build-dependencies b/Windows/build-dependencies index 2ccd4841f7..e758f1be70 100755 --- a/Windows/build-dependencies +++ b/Windows/build-dependencies @@ -282,6 +282,11 @@ for t in $tarballs ; do pre_configure="" prefix=$SANDBOX/Install case $pkg in + cairo-*) + extra_cflags="-fstack-protector";; + gsl-*) + extra_config_flags="GSL_LDFLAGS=-XCClinker -fstack-protector"; + extra_cflags="-fstack-protector";; librsvg-*) extra_config_flags="--disable-tools --enable-introspection=no --disable-gtk-doc-html" build_procs=1 @@ -330,6 +335,8 @@ for t in $tarballs ; do ;; pango-1.48.*) build_system="meson"; + extra_cflags="-fstack-protector"; + extra_ldflags="-fstack-protector"; ;; spread-sheet-widget-*) ;; @@ -345,7 +352,7 @@ for t in $tarballs ; do meson setup --prefix=$prefix \ --libdir=lib \ --cross-file=$SANDBOX/cross-file.txt \ - -Dc_link_args=-L$SANDBOX/Install/lib \ + -Dc_link_args="-L$SANDBOX/Install/lib $extra_ldflags" \ -Dc_args="-I$SANDBOX/Install/include $extra_cflags" \ --wrap-mode=nodownload \ $meson_opts \ @@ -359,9 +366,10 @@ for t in $tarballs ; do $SANDBOX/Source/$pkg/configure \ --host="$arch" \ --prefix="$prefix" \ - $extra_config_flags \ - CPPFLAGS="-I $depdir/include" \ - LDFLAGS="-L$depdir/lib" \ + "$extra_config_flags" \ + CFLAGS="$extra_cflags" \ + CPPFLAGS="-I $depdir/include $extra_cppflags" \ + LDFLAGS="-L$depdir/lib $extra_ldflags" \ PKG_CONFIG_LIBDIR="$depdir/lib/pkgconfig" && make -j $build_procs && make install && $extra_build ;; -- 2.30.2