1 |
commit: c3220a3d428e7c5100347c953d16838c495978ae |
2 |
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri May 29 08:31:11 2020 +0000 |
4 |
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri May 29 08:31:11 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/gcc-patches.git/commit/?id=c3220a3d |
7 |
|
8 |
7.5.0: fix libcpp ar detection |
9 |
|
10 |
Reported-by: Agostino Sarubbo |
11 |
Bug: https://bugs.gentoo.org/718004 |
12 |
Bug: https://gcc.gnu.org/PR94657 |
13 |
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org> |
14 |
|
15 |
7.5.0/gentoo/24_all_libcpp-ar.patch | 143 ++++++++++++++++++++++++++++++++++++ |
16 |
7.5.0/gentoo/README.history | 3 + |
17 |
2 files changed, 146 insertions(+) |
18 |
|
19 |
diff --git a/7.5.0/gentoo/24_all_libcpp-ar.patch b/7.5.0/gentoo/24_all_libcpp-ar.patch |
20 |
new file mode 100644 |
21 |
index 0000000..55f2944 |
22 |
--- /dev/null |
23 |
+++ b/7.5.0/gentoo/24_all_libcpp-ar.patch |
24 |
@@ -0,0 +1,143 @@ |
25 |
+https://bugs.gentoo.org/718004 |
26 |
+https://gcc.gnu.org/PR94657 |
27 |
+ |
28 |
+Make sue we use ${CHOST}-ar and not 'ar'. |
29 |
+ |
30 |
+--- a/libcpp/configure.ac |
31 |
++++ b/libcpp/configure.ac |
32 |
+@@ -12,6 +12,7 @@ AC_PROG_INSTALL |
33 |
+ AC_PROG_CC |
34 |
+ AC_PROG_CXX |
35 |
+ AC_PROG_RANLIB |
36 |
++AC_CHECK_TOOL(AR, ar) |
37 |
+ |
38 |
+ AC_USE_SYSTEM_EXTENSIONS |
39 |
+ AC_SYS_LARGEFILE |
40 |
+--- a/libcpp/Makefile.in |
41 |
++++ b/libcpp/Makefile.in |
42 |
+@@ -25,7 +25,7 @@ srcdir = @srcdir@ |
43 |
+ top_builddir = . |
44 |
+ VPATH = @srcdir@ |
45 |
+ INSTALL = @INSTALL@ |
46 |
+-AR = ar |
47 |
++AR = @AR@ |
48 |
+ ARFLAGS = cru |
49 |
+ ACLOCAL = @ACLOCAL@ |
50 |
+ AUTOCONF = @AUTOCONF@ |
51 |
+--- a/libcpp/configure |
52 |
++++ b/libcpp/configure |
53 |
+@@ -657,6 +657,7 @@ ACLOCAL |
54 |
+ EGREP |
55 |
+ GREP |
56 |
+ CPP |
57 |
++AR |
58 |
+ RANLIB |
59 |
+ ac_ct_CXX |
60 |
+ CXXFLAGS |
61 |
+@@ -1038,6 +1039,7 @@ do |
62 |
+ | -silent | --silent | --silen | --sile | --sil) |
63 |
+ silent=yes ;; |
64 |
+ |
65 |
++ |
66 |
+ -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) |
67 |
+ ac_prev=sbindir ;; |
68 |
+ -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ |
69 |
+@@ -4006,6 +4008,98 @@ else |
70 |
+ RANLIB="$ac_cv_prog_RANLIB" |
71 |
+ fi |
72 |
+ |
73 |
++if test -n "$ac_tool_prefix"; then |
74 |
++ # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. |
75 |
++set dummy ${ac_tool_prefix}ar; ac_word=$2 |
76 |
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
77 |
++$as_echo_n "checking for $ac_word... " >&6; } |
78 |
++if ${ac_cv_prog_AR+:} false; then : |
79 |
++ $as_echo_n "(cached) " >&6 |
80 |
++else |
81 |
++ if test -n "$AR"; then |
82 |
++ ac_cv_prog_AR="$AR" # Let the user override the test. |
83 |
++else |
84 |
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
85 |
++for as_dir in $PATH |
86 |
++do |
87 |
++ IFS=$as_save_IFS |
88 |
++ test -z "$as_dir" && as_dir=. |
89 |
++ for ac_exec_ext in '' $ac_executable_extensions; do |
90 |
++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
91 |
++ ac_cv_prog_AR="${ac_tool_prefix}ar" |
92 |
++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
93 |
++ break 2 |
94 |
++ fi |
95 |
++done |
96 |
++ done |
97 |
++IFS=$as_save_IFS |
98 |
++ |
99 |
++fi |
100 |
++fi |
101 |
++AR=$ac_cv_prog_AR |
102 |
++if test -n "$AR"; then |
103 |
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5 |
104 |
++$as_echo "$AR" >&6; } |
105 |
++else |
106 |
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
107 |
++$as_echo "no" >&6; } |
108 |
++fi |
109 |
++ |
110 |
++ |
111 |
++fi |
112 |
++if test -z "$ac_cv_prog_AR"; then |
113 |
++ ac_ct_AR=$AR |
114 |
++ # Extract the first word of "ar", so it can be a program name with args. |
115 |
++set dummy ar; ac_word=$2 |
116 |
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
117 |
++$as_echo_n "checking for $ac_word... " >&6; } |
118 |
++if ${ac_cv_prog_ac_ct_AR+:} false; then : |
119 |
++ $as_echo_n "(cached) " >&6 |
120 |
++else |
121 |
++ if test -n "$ac_ct_AR"; then |
122 |
++ ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test. |
123 |
++else |
124 |
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
125 |
++for as_dir in $PATH |
126 |
++do |
127 |
++ IFS=$as_save_IFS |
128 |
++ test -z "$as_dir" && as_dir=. |
129 |
++ for ac_exec_ext in '' $ac_executable_extensions; do |
130 |
++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
131 |
++ ac_cv_prog_ac_ct_AR="ar" |
132 |
++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
133 |
++ break 2 |
134 |
++ fi |
135 |
++done |
136 |
++ done |
137 |
++IFS=$as_save_IFS |
138 |
++ |
139 |
++fi |
140 |
++fi |
141 |
++ac_ct_AR=$ac_cv_prog_ac_ct_AR |
142 |
++if test -n "$ac_ct_AR"; then |
143 |
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5 |
144 |
++$as_echo "$ac_ct_AR" >&6; } |
145 |
++else |
146 |
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
147 |
++$as_echo "no" >&6; } |
148 |
++fi |
149 |
++ |
150 |
++ if test "x$ac_ct_AR" = x; then |
151 |
++ AR="" |
152 |
++ else |
153 |
++ case $cross_compiling:$ac_tool_warned in |
154 |
++yes:) |
155 |
++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 |
156 |
++$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} |
157 |
++ac_tool_warned=yes ;; |
158 |
++esac |
159 |
++ AR=$ac_ct_AR |
160 |
++ fi |
161 |
++else |
162 |
++ AR="$ac_cv_prog_AR" |
163 |
++fi |
164 |
++ |
165 |
+ |
166 |
+ |
167 |
+ ac_ext=c |
168 |
|
169 |
diff --git a/7.5.0/gentoo/README.history b/7.5.0/gentoo/README.history |
170 |
index c594c94..f95001c 100644 |
171 |
--- a/7.5.0/gentoo/README.history |
172 |
+++ b/7.5.0/gentoo/README.history |
173 |
@@ -1,3 +1,6 @@ |
174 |
+3 TODO |
175 |
+ + 24_all_libcpp-ar.patch |
176 |
+ |
177 |
2 21 Mar 2020 |
178 |
+ 22_all_libsanitizer-p1.patch |
179 |
+ 23_all_libsanitizer-p2.patch |