projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
cleanup
[pspp]
/
Windows
/
build-dependencies
diff --git
a/Windows/build-dependencies
b/Windows/build-dependencies
index 2ccd4841f7813d026b759c1a3d6a22b31fe36874..e758f1be7026710aa95232d3adf9ae48d9d67a49 100755
(executable)
--- 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
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
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";
;;
pango-1.48.*)
build_system="meson";
+ extra_cflags="-fstack-protector";
+ extra_ldflags="-fstack-protector";
;;
spread-sheet-widget-*)
;;
;;
spread-sheet-widget-*)
;;
@@
-345,7
+352,7
@@
for t in $tarballs ; do
meson setup --prefix=$prefix \
--libdir=lib \
--cross-file=$SANDBOX/cross-file.txt \
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 \
-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" \
$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
;;
PKG_CONFIG_LIBDIR="$depdir/lib/pkgconfig" &&
make -j $build_procs && make install && $extra_build
;;