[gentoo-commits] proj/elt-patches:master commit in: /, patches/specs/

[Mike Frysinger]

commit:     c89bcab82ce9218522d9b47fe543a419dc74a93b
Author:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Thu Nov  4 10:17:46 2021 +0000
Commit:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Thu Nov  4 10:17:46 2021 +0000
URL:        https://gitweb.gentoo.org/proj/elt-patches.git/commit/?id=c89bcab8

patches: backport -specs patch

This is needed for the -fsanitize/-fuse-ld to apply cleanly to the
original 2.4.6 release and not just what distros are shipping.

Signed-off-by: Mike Frysinger <vapier <AT> gentoo.org>

 eltpatch.in         |  2 +-
 patches/specs/2.4.6 | 29 +++++++++++++++++++++++++++++
 2 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/eltpatch.in b/eltpatch.in
index 7fa21bc..887fc6f 100644
--- a/eltpatch.in
+++ b/eltpatch.in
@@ -127,7 +127,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
-               fsanitize fuse-ld
+               specs fsanitize fuse-ld
        "
 
        for x in "$@" ; do

diff --git a/patches/specs/2.4.6 b/patches/specs/2.4.6
new file mode 100644
index 0000000..8541145
--- /dev/null
+++ b/patches/specs/2.4.6
@@ -0,0 +1,29 @@
+From 702a97fbb09bd7088a50f2b239016d1e32843c24 Mon Sep 17 00:00:00 2001
+From: Pavel Raiskup <prais...@redhat.com>
+Date: Fri, 18 Sep 2015 10:36:43 +0200
+Subject: [PATCH] libtool: fix GCC linking with -specs=*
+
+References:
+https://bugzilla.redhat.com/show_bug.cgi?id=985592
+
+* build-aux/ltmain.in (func_mode_link): Pass -specs=*
+to the linker, Fedora uses this option for hardening.
+
+Signed-off-by: Pavel Raiskup <prais...@redhat.com>
+
+--- ltmain.sh
++++ ltmain.sh
+@@ -7272,10 +7272,12 @@
+       # -tp=*                Portland pgcc target processor selection
+       # --sysroot=*          for sysroot support
+       # -O*, -g*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time 
optimization
++      # -specs=*             GCC specs files
+       # -stdlib=*            select c++ std lib with clang
+       -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=*)
++      
-O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*| \
++      -specs=*)
+         func_quote_for_eval "$arg"
+       arg=$func_quote_for_eval_result
+         func_append compile_command " $arg"