Gentoo Archives: gentoo-commits

From: Mike Frysinger <vapier@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/elt-patches:master commit in: /, patches/specs/
Date: Thu, 04 Nov 2021 10:33:48
Message-Id: 1636021066.c89bcab82ce9218522d9b47fe543a419dc74a93b.vapier@gentoo
1 commit: c89bcab82ce9218522d9b47fe543a419dc74a93b
2 Author: Mike Frysinger <vapier <AT> gentoo <DOT> org>
3 AuthorDate: Thu Nov 4 10:17:46 2021 +0000
4 Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org>
5 CommitDate: Thu Nov 4 10:17:46 2021 +0000
6 URL: https://gitweb.gentoo.org/proj/elt-patches.git/commit/?id=c89bcab8
7
8 patches: backport -specs patch
9
10 This is needed for the -fsanitize/-fuse-ld to apply cleanly to the
11 original 2.4.6 release and not just what distros are shipping.
12
13 Signed-off-by: Mike Frysinger <vapier <AT> gentoo.org>
14
15 eltpatch.in | 2 +-
16 patches/specs/2.4.6 | 29 +++++++++++++++++++++++++++++
17 2 files changed, 30 insertions(+), 1 deletion(-)
18
19 diff --git a/eltpatch.in b/eltpatch.in
20 index 7fa21bc..887fc6f 100644
21 --- a/eltpatch.in
22 +++ b/eltpatch.in
23 @@ -127,7 +127,7 @@ elibtoolize() {
24 local force="false"
25 local elt_patches="
26 install-sh ltmain portage relink max_cmd_len sed test tmp cross as-needed target-nm ppc64le
27 - fsanitize fuse-ld
28 + specs fsanitize fuse-ld
29 "
30
31 for x in "$@" ; do
32
33 diff --git a/patches/specs/2.4.6 b/patches/specs/2.4.6
34 new file mode 100644
35 index 0000000..8541145
36 --- /dev/null
37 +++ b/patches/specs/2.4.6
38 @@ -0,0 +1,29 @@
39 +From 702a97fbb09bd7088a50f2b239016d1e32843c24 Mon Sep 17 00:00:00 2001
40 +From: Pavel Raiskup <praiskup@××××××.com>
41 +Date: Fri, 18 Sep 2015 10:36:43 +0200
42 +Subject: [PATCH] libtool: fix GCC linking with -specs=*
43 +
44 +References:
45 +https://bugzilla.redhat.com/show_bug.cgi?id=985592
46 +
47 +* build-aux/ltmain.in (func_mode_link): Pass -specs=*
48 +to the linker, Fedora uses this option for hardening.
49 +
50 +Signed-off-by: Pavel Raiskup <praiskup@××××××.com>
51 +
52 +--- ltmain.sh
53 ++++ ltmain.sh
54 +@@ -7272,10 +7272,12 @@
55 + # -tp=* Portland pgcc target processor selection
56 + # --sysroot=* for sysroot support
57 + # -O*, -g*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization
58 ++ # -specs=* GCC specs files
59 + # -stdlib=* select c++ std lib with clang
60 + -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
61 + -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \
62 +- -O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*)
63 ++ -O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*| \
64 ++ -specs=*)
65 + func_quote_for_eval "$arg"
66 + arg=$func_quote_for_eval_result
67 + func_append compile_command " $arg"