diff options
author | wiz <wiz@pkgsrc.org> | 2017-07-14 17:35:07 +0000 |
---|---|---|
committer | wiz <wiz@pkgsrc.org> | 2017-07-14 17:35:07 +0000 |
commit | 65e0dd70fc9835602fcca2beb7cf1c4f1e0cdaba (patch) | |
tree | 5f23f85745d0c90a527209df7f5a62870a613275 /meta-pkgs | |
parent | d64c482c5e60939263a3e2e7d698431ac4c12409 (diff) | |
download | pkgsrc-65e0dd70fc9835602fcca2beb7cf1c4f1e0cdaba.tar.gz |
Pass CFLAGS and LDFLAGS to compiler. Fixes RELRO build.
Diffstat (limited to 'meta-pkgs')
-rw-r--r-- | meta-pkgs/boost/distinfo | 6 | ||||
-rw-r--r-- | meta-pkgs/boost/patches/patch-ae | 6 | ||||
-rw-r--r-- | meta-pkgs/boost/patches/patch-ag | 21 |
3 files changed, 24 insertions, 9 deletions
diff --git a/meta-pkgs/boost/distinfo b/meta-pkgs/boost/distinfo index c39eaf9643e..0166c46644d 100644 --- a/meta-pkgs/boost/distinfo +++ b/meta-pkgs/boost/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.101 2017/06/28 08:27:00 joerg Exp $ +$NetBSD: distinfo,v 1.102 2017/07/14 17:35:07 wiz Exp $ SHA1 (boost_1_64_0.tar.bz2) = 51421ef259a4530edea0fbfc448460fcc5c64edb RMD160 (boost_1_64_0.tar.bz2) = 377ea4325f5e3ccd2820002143bb5baa1aeb3b41 @@ -8,8 +8,8 @@ SHA1 (patch-aa) = 408a63a807aaa491130db018cd89bca6a427090d SHA1 (patch-ab) = 234dfd1582dd62f0b149ee12aabcc1f1f602af97 SHA1 (patch-ac) = 32d14b50682dae1950ed927ecb9318ad6b07687a SHA1 (patch-ad) = 0e5dc31c3425de94444f97a9b7dec97ed5967733 -SHA1 (patch-ae) = ac2e4afcf243c2fee2394cfe3fe92f4890e9ab83 -SHA1 (patch-ag) = 117eabbbbc26d04bb5e56df5ad92e55b5061c0f8 +SHA1 (patch-ae) = f72c166163dbcbfb0408a49b57d7af24debc620b +SHA1 (patch-ag) = dc59422ade217aa49eb5d6928f02f7bc4734aa43 SHA1 (patch-aq) = 7503ba9813a143b9e99e43b3017a30bc5543fe16 SHA1 (patch-ar) = 2fec2c51272cc4ee376e6538d8f1fd8561a7f0a3 SHA1 (patch-boost_atomic_detail_ops_gcc_sparc.hpp) = 6cd1b6fbb8659d7af8ecff63d4558f365f28c12b diff --git a/meta-pkgs/boost/patches/patch-ae b/meta-pkgs/boost/patches/patch-ae index c300ae394c7..15c4d16e6ee 100644 --- a/meta-pkgs/boost/patches/patch-ae +++ b/meta-pkgs/boost/patches/patch-ae @@ -1,6 +1,6 @@ -$NetBSD: patch-ae,v 1.8 2014/08/13 10:56:36 adam Exp $ +$NetBSD: patch-ae,v 1.9 2017/07/14 17:35:07 wiz Exp $ -Pass CFLAGS to the compiler. +Pass CFLAGS and LDFLAGS to the compiler. --- tools/build/src/engine/build.sh.orig 2011-02-24 08:42:55.000000000 +0000 +++ tools/build/src/engine/build.sh @@ -8,7 +8,7 @@ Pass CFLAGS to the compiler. error_exit "Unknown toolset: $BOOST_JAM_TOOLSET" ;; esac -+BOOST_JAM_CC="${BOOST_JAM_CC} ${CFLAGS}" ++BOOST_JAM_CC="${BOOST_JAM_CC} ${CFLAGS} ${LDFLAGS}" echo "###" echo "### Using '$BOOST_JAM_TOOLSET' toolset." diff --git a/meta-pkgs/boost/patches/patch-ag b/meta-pkgs/boost/patches/patch-ag index b982a666e2e..db20b0fa2b4 100644 --- a/meta-pkgs/boost/patches/patch-ag +++ b/meta-pkgs/boost/patches/patch-ag @@ -1,10 +1,10 @@ -$NetBSD: patch-ag,v 1.8 2014/08/13 10:56:36 adam Exp $ +$NetBSD: patch-ag,v 1.9 2017/07/14 17:35:07 wiz Exp $ Pass CFLAGS to the compiler. ---- tools/build/src/engine/build.jam.orig 2011-02-24 08:50:34.000000000 +0000 +--- tools/build/src/engine/build.jam.orig 2017-07-14 17:28:45.790581884 +0000 +++ tools/build/src/engine/build.jam -@@ -192,7 +192,7 @@ toolset como como : "-o " : -D +@@ -199,7 +199,7 @@ toolset como como : "-o " : -D : -L$(--python-lib[1]) -l$(--python-lib[2]) ; ## Clang Linux 2.8+ toolset clang clang : "-o " : -D @@ -13,3 +13,18 @@ Pass CFLAGS to the compiler. [ opt --release : -Os ] [ opt --debug : -g -O0 -fno-inline ] [ opt --profile : -finline-functions -g ] +@@ -215,12 +215,12 @@ toolset darwin cc : "-o " : -D + : -L$(--python-lib[1]) -l$(--python-lib[2]) ; + ## GCC 2.x, 3.x, 4.x + toolset gcc gcc : "-o " : -D +- : -pedantic -fno-strict-aliasing ++ : $(CFLAGS) -pedantic -fno-strict-aliasing + [ opt --release : [ opt --symbols : -g : -s ] -O3 ] + [ opt --debug : -g -O0 -fno-inline ] + [ opt --profile : -O3 -g -pg ] + -I$(--python-include) -I$(--extra-include) -Wno-long-long +- : -L$(--python-lib[1]) -l$(--python-lib[2]) ; ++ : $(LDFLAGS) -L$(--python-lib[1]) -l$(--python-lib[2]) ; + ## GCC 2.x, 3.x on CYGWIN but without cygwin1.dll + toolset gcc-nocygwin gcc : "-o " : -D + : -s -O3 -mno-cygwin |