1 |
commit: 2d3f45f6f1ac0dbe8d987af727a0f7445cd30048 |
2 |
Author: Jakov Smolic <jakov.smolic <AT> sartura <DOT> hr> |
3 |
AuthorDate: Mon Dec 28 11:50:15 2020 +0000 |
4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Dec 28 11:50:15 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2d3f45f6 |
7 |
|
8 |
sys-devel/remake: fix build with gcc-10 |
9 |
|
10 |
Closes: https://bugs.gentoo.org/707606 |
11 |
Package-Manager: Portage-3.0.9, Repoman-3.0.1 |
12 |
Signed-off-by: Jakov Smolic <jakov.smolic <AT> sartura.hr> |
13 |
Signed-off-by: David Seifert <soap <AT> gentoo.org> |
14 |
|
15 |
.../remake/files/remake-4.2.1.1.4-fno-common.patch | 127 +++++++++++++++++++++ |
16 |
sys-devel/remake/remake-4.2.1.1.4-r1.ebuild | 3 +- |
17 |
2 files changed, 129 insertions(+), 1 deletion(-) |
18 |
|
19 |
diff --git a/sys-devel/remake/files/remake-4.2.1.1.4-fno-common.patch b/sys-devel/remake/files/remake-4.2.1.1.4-fno-common.patch |
20 |
new file mode 100644 |
21 |
index 00000000000..4367bf9332b |
22 |
--- /dev/null |
23 |
+++ b/sys-devel/remake/files/remake-4.2.1.1.4-fno-common.patch |
24 |
@@ -0,0 +1,127 @@ |
25 |
+--- a/dep.h |
26 |
++++ b/dep.h |
27 |
+@@ -134,7 +134,7 @@ |
28 |
+ struct goaldep *read_all_makefiles (const char **makefiles); |
29 |
+ |
30 |
+ /*! The chain of makefiles read by read_makefile. */ |
31 |
+-struct goaldep *read_makefiles; |
32 |
++extern struct goaldep *read_makefiles; |
33 |
+ |
34 |
+ void eval_buffer (char *buffer, const gmk_floc *floc); |
35 |
+ enum update_status update_goal_chain (struct goaldep *goals); |
36 |
+--- a/globals.c |
37 |
++++ b/globals.c |
38 |
+@@ -120,8 +120,6 @@ |
39 |
+ of each job stay together. */ |
40 |
+ int output_sync = OUTPUT_SYNC_NONE; |
41 |
+ |
42 |
+-const char *default_shell; |
43 |
+- |
44 |
+ char *remote_description = 0; |
45 |
+ |
46 |
+ /* Remember the original value of the SHELL variable, from the environment. */ |
47 |
+--- a/globals.h |
48 |
++++ b/globals.h |
49 |
+@@ -85,6 +85,12 @@ |
50 |
+ extern bool b_debugger_preread; |
51 |
+ |
52 |
+ /* Remember the original value of the SHELL variable, from the environment. */ |
53 |
+-struct variable shell_var; |
54 |
++extern struct variable shell_var; |
55 |
++ |
56 |
++/**! The default value of SHELL and the shell that is used when issuing |
57 |
++ commands on targets. |
58 |
++*/ |
59 |
++extern const char *default_shell; |
60 |
++ |
61 |
+ |
62 |
+ #endif /*GLOBALS_H*/ |
63 |
+--- a/main.c |
64 |
++++ b/main.c |
65 |
+@@ -40,6 +40,8 @@ |
66 |
+ # include <fcntl.h> |
67 |
+ #endif |
68 |
+ |
69 |
++struct goaldep *read_makefiles; |
70 |
++ |
71 |
+ extern void initialize_stopchar_map (); |
72 |
+ |
73 |
+ #if defined HAVE_WAITPID || defined HAVE_WAIT3 |
74 |
+--- a/main.h |
75 |
++++ b/main.h |
76 |
+@@ -35,10 +35,5 @@ |
77 |
+ /* is default_shell unixy? */ |
78 |
+ extern int unixy_shell; |
79 |
+ |
80 |
+-/**! The default value of SHELL and the shell that is used when issuing |
81 |
+- commands on targets. |
82 |
+-*/ |
83 |
+-extern char *default_shell; |
84 |
+- |
85 |
+ /*! Print version information. */ |
86 |
+ extern void print_version (void); |
87 |
+--- a/make.h |
88 |
++++ b/make.h |
89 |
+@@ -333,7 +333,7 @@ |
90 |
+ #endif |
91 |
+ #ifdef SET_STACK_SIZE |
92 |
+ # include <sys/resource.h> |
93 |
+-struct rlimit stack_limit; |
94 |
++extern struct rlimit stack_limit; |
95 |
+ #endif |
96 |
+ |
97 |
+ /* We have to have stdarg.h or varargs.h AND v*printf or doprnt to use |
98 |
+--- a/print.h |
99 |
++++ b/print.h |
100 |
+@@ -39,7 +39,7 @@ |
101 |
+ |
102 |
+ /* Think of the below not as an enumeration but as #defines done in a |
103 |
+ way that we'll be able to use the value in a gdb. */ |
104 |
+-enum debug_print_enums_e { |
105 |
++extern enum debug_print_enums_e { |
106 |
+ MAX_STACK_SHOW = 1000, |
107 |
+ } debug_print_enums1; |
108 |
+ |
109 |
+--- a/variable.c |
110 |
++++ b/variable.c |
111 |
+@@ -29,6 +29,7 @@ |
112 |
+ #endif |
113 |
+ #include "hash.h" |
114 |
+ #include "main.h" |
115 |
++#include "globals.h" |
116 |
+ |
117 |
+ /* Incremented every time we add or remove a global variable. */ |
118 |
+ static unsigned long variable_changenum; |
119 |
+--- a/variable.h |
120 |
++++ b/variable.h |
121 |
+@@ -115,7 +115,6 @@ |
122 |
+ extern char *variable_buffer; |
123 |
+ extern struct variable_set_list *current_variable_set_list; |
124 |
+ extern struct variable *default_goal_var; |
125 |
+-extern struct variable shell_var; |
126 |
+ |
127 |
+ /* expand.c */ |
128 |
+ char *variable_buffer_output (char *ptr, const char *string, unsigned int length); |
129 |
+--- a/debugger/file2line.h |
130 |
++++ b/debugger/file2line.h |
131 |
+@@ -19,7 +19,7 @@ |
132 |
+ Boston, MA 02111-1307, USA. */ |
133 |
+ #ifndef REMAKE_FILE2LINE |
134 |
+ #define REMAKE_FILE2LINE |
135 |
+-struct hash_table file2lines; |
136 |
++extern struct hash_table file2lines; |
137 |
+ |
138 |
+ typedef enum { |
139 |
+ F2L_TARGET, |
140 |
+--- a/debugger/file2line.c |
141 |
++++ b/debugger/file2line.c |
142 |
+@@ -26,6 +26,8 @@ |
143 |
+ #include "../rule.h" |
144 |
+ #include "./file2line.h" |
145 |
+ |
146 |
++struct hash_table file2lines; |
147 |
++ |
148 |
+ unsigned long |
149 |
+ file2lines_hash_1 (const void *key) |
150 |
+ { |
151 |
+ |
152 |
|
153 |
diff --git a/sys-devel/remake/remake-4.2.1.1.4-r1.ebuild b/sys-devel/remake/remake-4.2.1.1.4-r1.ebuild |
154 |
index 16971ea8179..447b79c7375 100644 |
155 |
--- a/sys-devel/remake/remake-4.2.1.1.4-r1.ebuild |
156 |
+++ b/sys-devel/remake/remake-4.2.1.1.4-r1.ebuild |
157 |
@@ -21,7 +21,8 @@ DEPEND="${RDEPEND}" |
158 |
S=${WORKDIR}/${MY_P} |
159 |
|
160 |
PATCHES=( |
161 |
- "${FILESDIR}/make-4.2.1-glob-v2.patch" |
162 |
+ "${FILESDIR}"/make-4.2.1-glob-v2.patch |
163 |
+ "${FILESDIR}"/${P}-fno-common.patch |
164 |
) |
165 |
|
166 |
src_configure() { |