summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoakim Tjernlund <Joakim.Tjernlund@infinera.com>2021-11-02 23:42:18 +0100
committerMike Frysinger <vapier@gentoo.org>2021-11-04 06:33:34 -0400
commit2b7112d147d2fe5d418ecdf2f8d150935761de79 (patch)
tree54419def01afdf39f28b213e19779f18cd5d5254
parenttests: start basic framework for ad-hoc testing (diff)
downloadelt-patches-2b7112d147d2fe5d418ecdf2f8d150935761de79.tar.gz
elt-patches-2b7112d147d2fe5d418ecdf2f8d150935761de79.tar.bz2
elt-patches-2b7112d147d2fe5d418ecdf2f8d150935761de79.zip
backport -static-* & -fcilkplus for 2.4.6
Bug: https://bugs.gentoo.org/812026 Signed-off-by: Joakim Tjernlund <Joakim.Tjernlund@infinera.com> Signed-off-by: Mike Frysinger <vapier@gentoo.org>
-rw-r--r--eltpatch.in2
-rw-r--r--patches/static-flags/2.4.638
2 files changed, 39 insertions, 1 deletions
diff --git a/eltpatch.in b/eltpatch.in
index 7d3980e..a0b0607 100644
--- a/eltpatch.in
+++ b/eltpatch.in
@@ -129,7 +129,7 @@ elibtoolize() {
local force="false"
local elt_patches="
install-sh ltmain portage relink max_cmd_len sed test tmp cross as-needed target-nm ppc64le
- specs fsanitize fuse-ld
+ specs fsanitize fuse-ld static-flags
"
for x in "$@" ; do
diff --git a/patches/static-flags/2.4.6 b/patches/static-flags/2.4.6
new file mode 100644
index 0000000..892d7aa
--- /dev/null
+++ b/patches/static-flags/2.4.6
@@ -0,0 +1,38 @@
+https://bugs.gentoo.org/812026
+https://lists.gnu.org/archive/html/libtool-patches/2019-05/msg00000.html
+
+From: Vincent Lefevre <vincent@vinc17.net>
+Subject: [PATCH] libtool: pass more flags to the linker
+Date: Fri, 3 May 2019 15:19:19 +0200
+To: libtool-patches@gnu.org
+
+Resolves bug 17750.
+
+* build-aux/ltmain.in (func_mode_link): In the flags to be passed through
+unchanged, also pass -static-* and -fcilkplus.
+
+Signed-off-by: Vincent Lefevre <vincent@vinc17.net>
+---
+ build-aux/ltmain.in | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/build-aux/ltmain.in b/build-aux/ltmain.in
+index 96b37003..c0e925bb 100644
+--- ltmain.sh
++++ ltmain.sh
+@@ -5380,10 +5380,12 @@ func_mode_link ()
+ # -stdlib=* select c++ std lib with clang
+ # -fsanitize=* Clang/GCC memory and address sanitizer
+ # -fuse-ld=* Linker select flags for GCC
++ # -static-* direct GCC to link specific libraries statically
++ # -fcilkplus Cilk Plus language extension features for C/C++
+ -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
+ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \
+ -O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*| \
+- -specs=*|-fsanitize=*|-fuse-ld=*)
++ -specs=*|-fsanitize=*|-fuse-ld=*|-static-*|-fcilkplus)
+ func_quote_for_eval "$arg"
+ arg=$func_quote_for_eval_result
+ func_append compile_command " $arg"
+--
+2.20.1