diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-03-02 12:04:08 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-03-07 20:05:31 +0000 |
commit | 2345af9b4829ed3eed5abf60f2483055649f8af7 (patch) | |
tree | 96a9a31e4b1957b93c4fe3eb669117d2752caf0d /meta/recipes-core/gettext/gettext-0.16.1/fix_gnu_source_circular.patch | |
parent | c4901328fe5cf912c0965e5b011b64a95a9bcb9d (diff) | |
download | poky-2345af9b4829ed3eed5abf60f2483055649f8af7.tar.gz |
recipes: Move out stale GPLv2 versions to a seperate layeruninative-1.5
These are recipes where the upstream has moved to GPLv3 and these old
versions are the last ones under the GPLv2 license.
There are several reasons for making this move. There is a different
quality of service with these recipes in that they don't get security
fixes and upstream no longer care about them, in fact they're actively
hostile against people using old versions. The recipes tend to need a
different kind of maintenance to work with changes in the wider ecosystem
and there needs to be isolation between changes made in the v3 versions
and those in the v2 versions.
There are probably better ways to handle a "non-GPLv3" system but right
now having these in OE-Core makes them look like a first class citizen
when I believe they have potential for a variety of undesireable issues.
Moving them into a separate layer makes their different needs clearer, it
also makes it clear how many of these there are. Some are probably not
needed (e.g. mc), I also wonder whether some are useful (e.g. gmp)
since most things that use them are GPLv3 only already. Someone could
now more clearly see how to streamline the list of recipes here.
I'm proposing we mmove to this separate layer for 2.3 with its future
maintinership and testing to be determined in 2.4 and beyond.
(From OE-Core rev: 19b7e950346fb1dde6505c45236eba6cd9b33b4b)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/gettext/gettext-0.16.1/fix_gnu_source_circular.patch')
-rw-r--r-- | meta/recipes-core/gettext/gettext-0.16.1/fix_gnu_source_circular.patch | 348 |
1 files changed, 0 insertions, 348 deletions
diff --git a/meta/recipes-core/gettext/gettext-0.16.1/fix_gnu_source_circular.patch b/meta/recipes-core/gettext/gettext-0.16.1/fix_gnu_source_circular.patch deleted file mode 100644 index fd5feebc85..0000000000 --- a/meta/recipes-core/gettext/gettext-0.16.1/fix_gnu_source_circular.patch +++ /dev/null | |||
@@ -1,348 +0,0 @@ | |||
1 | |||
2 | This patch removes the circular dependency on AC_GNU_SOURCE in | ||
3 | AC_USE_SYSTEM_EXTENSIONS. | ||
4 | |||
5 | Thanks to Mark Hatle for the timely pointers and fixes. | ||
6 | |||
7 | Upstream-Status: Inappropriate [licensing] | ||
8 | |||
9 | Signed-off-by: Saul Wold <sgw@linux.intel.com> | ||
10 | |||
11 | diff -ru gettext-0.16.1/gettext-runtime/gnulib-m4/extensions.m4 gettext.patched/gettext-runtime/gnulib-m4/extensions.m4 | ||
12 | --- gettext-0.16.1/gettext-runtime/gnulib-m4/extensions.m4 2006-11-27 09:14:38.000000000 -0800 | ||
13 | +++ gettext.patched/gettext-runtime/gnulib-m4/extensions.m4 2011-03-16 23:54:01.711923448 -0700 | ||
14 | @@ -16,43 +16,47 @@ | ||
15 | # ------------------------ | ||
16 | # Enable extensions on systems that normally disable them, | ||
17 | # typically due to standards-conformance issues. | ||
18 | -AC_DEFUN([AC_USE_SYSTEM_EXTENSIONS], | ||
19 | -[ | ||
20 | - AC_BEFORE([$0], [AC_COMPILE_IFELSE]) | ||
21 | - AC_BEFORE([$0], [AC_RUN_IFELSE]) | ||
22 | - | ||
23 | - AC_REQUIRE([AC_GNU_SOURCE]) | ||
24 | - AC_REQUIRE([AC_AIX]) | ||
25 | - AC_REQUIRE([AC_MINIX]) | ||
26 | - | ||
27 | - AH_VERBATIM([__EXTENSIONS__], | ||
28 | -[/* Enable extensions on Solaris. */ | ||
29 | -#ifndef __EXTENSIONS__ | ||
30 | -# undef __EXTENSIONS__ | ||
31 | -#endif | ||
32 | -#ifndef _POSIX_PTHREAD_SEMANTICS | ||
33 | -# undef _POSIX_PTHREAD_SEMANTICS | ||
34 | -#endif | ||
35 | -#ifndef _TANDEM_SOURCE | ||
36 | -# undef _TANDEM_SOURCE | ||
37 | -#endif]) | ||
38 | - AC_CACHE_CHECK([whether it is safe to define __EXTENSIONS__], | ||
39 | - [ac_cv_safe_to_define___extensions__], | ||
40 | - [AC_COMPILE_IFELSE( | ||
41 | - [AC_LANG_PROGRAM([ | ||
42 | -# define __EXTENSIONS__ 1 | ||
43 | - AC_INCLUDES_DEFAULT])], | ||
44 | - [ac_cv_safe_to_define___extensions__=yes], | ||
45 | - [ac_cv_safe_to_define___extensions__=no])]) | ||
46 | - test $ac_cv_safe_to_define___extensions__ = yes && | ||
47 | - AC_DEFINE([__EXTENSIONS__]) | ||
48 | - AC_DEFINE([_POSIX_PTHREAD_SEMANTICS]) | ||
49 | - AC_DEFINE([_TANDEM_SOURCE]) | ||
50 | -]) | ||
51 | +#AC_DEFUN([AC_USE_SYSTEM_EXTENSIONS], | ||
52 | +#[ | ||
53 | +# AC_BEFORE([$0], [AC_COMPILE_IFELSE]) | ||
54 | +# AC_BEFORE([$0], [AC_RUN_IFELSE]) | ||
55 | +# | ||
56 | +# AC_REQUIRE([AC_GNU_SOURCE]) | ||
57 | +# AC_REQUIRE([AC_AIX]) | ||
58 | +# AC_REQUIRE([AC_MINIX]) | ||
59 | +# | ||
60 | +# AH_VERBATIM([__EXTENSIONS__], | ||
61 | +#[/* Enable extensions on Solaris. */ | ||
62 | +##ifndef __EXTENSIONS__ | ||
63 | +## undef __EXTENSIONS__ | ||
64 | +##endif | ||
65 | +##ifndef _POSIX_PTHREAD_SEMANTICS | ||
66 | +## undef _POSIX_PTHREAD_SEMANTICS | ||
67 | +##endif | ||
68 | +##ifndef _TANDEM_SOURCE | ||
69 | +## undef _TANDEM_SOURCE | ||
70 | +##endif]) | ||
71 | +# AC_CACHE_CHECK([whether it is safe to define __EXTENSIONS__], | ||
72 | +# [ac_cv_safe_to_define___extensions__], | ||
73 | +# [AC_COMPILE_IFELSE( | ||
74 | +# [AC_LANG_PROGRAM([ | ||
75 | +## define __EXTENSIONS__ 1 | ||
76 | +# AC_INCLUDES_DEFAULT])], | ||
77 | +# [ac_cv_safe_to_define___extensions__=yes], | ||
78 | +# [ac_cv_safe_to_define___extensions__=no])]) | ||
79 | +# test $ac_cv_safe_to_define___extensions__ = yes && | ||
80 | +# AC_DEFINE([__EXTENSIONS__]) | ||
81 | +# AC_DEFINE([_POSIX_PTHREAD_SEMANTICS]) | ||
82 | +# AC_DEFINE([_TANDEM_SOURCE]) | ||
83 | +#]) | ||
84 | |||
85 | # gl_USE_SYSTEM_EXTENSIONS | ||
86 | # ------------------------ | ||
87 | # Enable extensions on systems that normally disable them, | ||
88 | # typically due to standards-conformance issues. | ||
89 | AC_DEFUN([gl_USE_SYSTEM_EXTENSIONS], | ||
90 | - [AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS])]) | ||
91 | +[ | ||
92 | + AC_REQUIRE([AC_GNU_SOURCE]) | ||
93 | + | ||
94 | + AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS]) | ||
95 | +]) | ||
96 | diff -ru gettext-0.16.1/gettext-runtime/gnulib-m4/gnulib-comp.m4 gettext.patched/gettext-runtime/gnulib-m4/gnulib-comp.m4 | ||
97 | --- gettext-0.16.1/gettext-runtime/gnulib-m4/gnulib-comp.m4 2006-11-27 09:33:19.000000000 -0800 | ||
98 | +++ gettext.patched/gettext-runtime/gnulib-m4/gnulib-comp.m4 2011-03-16 23:50:17.471531838 -0700 | ||
99 | @@ -25,7 +25,7 @@ | ||
100 | m4_pattern_allow([^gl_LIBOBJS$])dnl a variable | ||
101 | m4_pattern_allow([^gl_LTLIBOBJS$])dnl a variable | ||
102 | AC_REQUIRE([AC_PROG_RANLIB]) | ||
103 | - AC_REQUIRE([AC_GNU_SOURCE]) | ||
104 | + dnl AC_REQUIRE([AC_GNU_SOURCE]) | ||
105 | AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS]) | ||
106 | ]) | ||
107 | |||
108 | diff -ru gettext-0.16.1/gettext-runtime/gnulib-m4/mbchar.m4 gettext.patched/gettext-runtime/gnulib-m4/mbchar.m4 | ||
109 | --- gettext-0.16.1/gettext-runtime/gnulib-m4/mbchar.m4 2006-11-27 09:14:38.000000000 -0800 | ||
110 | +++ gettext.patched/gettext-runtime/gnulib-m4/mbchar.m4 2011-03-16 23:50:10.814396529 -0700 | ||
111 | @@ -9,7 +9,7 @@ | ||
112 | |||
113 | AC_DEFUN([gl_MBCHAR], | ||
114 | [ | ||
115 | - AC_REQUIRE([AC_GNU_SOURCE]) | ||
116 | + dnl AC_REQUIRE([AC_GNU_SOURCE]) | ||
117 | dnl The following line is that so the user can test HAVE_WCHAR_H | ||
118 | dnl before #include "mbchar.h". | ||
119 | AC_CHECK_HEADERS_ONCE([wchar.h]) | ||
120 | diff -ru gettext-0.16.1/gettext-runtime/gnulib-m4/wcwidth.m4 gettext.patched/gettext-runtime/gnulib-m4/wcwidth.m4 | ||
121 | --- gettext-0.16.1/gettext-runtime/gnulib-m4/wcwidth.m4 2006-11-27 09:14:38.000000000 -0800 | ||
122 | +++ gettext.patched/gettext-runtime/gnulib-m4/wcwidth.m4 2011-03-16 23:50:08.357396247 -0700 | ||
123 | @@ -7,7 +7,7 @@ | ||
124 | AC_DEFUN([gl_FUNC_WCWIDTH], | ||
125 | [ | ||
126 | dnl Persuade glibc <wchar.h> to declare wcwidth(). | ||
127 | - AC_REQUIRE([AC_GNU_SOURCE]) | ||
128 | + dnl AC_REQUIRE([AC_GNU_SOURCE]) | ||
129 | |||
130 | AC_REQUIRE([AC_C_INLINE]) | ||
131 | AC_REQUIRE([gt_TYPE_WCHAR_T]) | ||
132 | diff -ru gettext-0.16.1/gettext-runtime/m4/lock.m4 gettext.patched/gettext-runtime/m4/lock.m4 | ||
133 | --- gettext-0.16.1/gettext-runtime/m4/lock.m4 2006-10-24 13:59:59.000000000 -0700 | ||
134 | +++ gettext.patched/gettext-runtime/m4/lock.m4 2011-03-16 23:50:04.355891676 -0700 | ||
135 | @@ -35,7 +35,7 @@ | ||
136 | AC_BEFORE([$0], [gl_ARGP])dnl | ||
137 | |||
138 | AC_REQUIRE([AC_CANONICAL_HOST]) | ||
139 | - AC_REQUIRE([AC_GNU_SOURCE]) dnl needed for pthread_rwlock_t on glibc systems | ||
140 | + dnl AC_REQUIRE([AC_GNU_SOURCE]) dnl needed for pthread_rwlock_t on glibc systems | ||
141 | dnl Check for multithreading. | ||
142 | AC_ARG_ENABLE(threads, | ||
143 | AC_HELP_STRING([--enable-threads={posix|solaris|pth|win32}], [specify multithreading API]) | ||
144 | diff -ru gettext-0.16.1/gettext-tools/gnulib-m4/extensions.m4 gettext.patched/gettext-tools/gnulib-m4/extensions.m4 | ||
145 | --- gettext-0.16.1/gettext-tools/gnulib-m4/extensions.m4 2006-11-27 09:14:54.000000000 -0800 | ||
146 | +++ gettext.patched/gettext-tools/gnulib-m4/extensions.m4 2011-03-16 23:53:28.487671266 -0700 | ||
147 | @@ -16,43 +16,47 @@ | ||
148 | # ------------------------ | ||
149 | # Enable extensions on systems that normally disable them, | ||
150 | # typically due to standards-conformance issues. | ||
151 | -AC_DEFUN([AC_USE_SYSTEM_EXTENSIONS], | ||
152 | -[ | ||
153 | - AC_BEFORE([$0], [AC_COMPILE_IFELSE]) | ||
154 | - AC_BEFORE([$0], [AC_RUN_IFELSE]) | ||
155 | - | ||
156 | - AC_REQUIRE([AC_GNU_SOURCE]) | ||
157 | - AC_REQUIRE([AC_AIX]) | ||
158 | - AC_REQUIRE([AC_MINIX]) | ||
159 | - | ||
160 | - AH_VERBATIM([__EXTENSIONS__], | ||
161 | -[/* Enable extensions on Solaris. */ | ||
162 | -#ifndef __EXTENSIONS__ | ||
163 | -# undef __EXTENSIONS__ | ||
164 | -#endif | ||
165 | -#ifndef _POSIX_PTHREAD_SEMANTICS | ||
166 | -# undef _POSIX_PTHREAD_SEMANTICS | ||
167 | -#endif | ||
168 | -#ifndef _TANDEM_SOURCE | ||
169 | -# undef _TANDEM_SOURCE | ||
170 | -#endif]) | ||
171 | - AC_CACHE_CHECK([whether it is safe to define __EXTENSIONS__], | ||
172 | - [ac_cv_safe_to_define___extensions__], | ||
173 | - [AC_COMPILE_IFELSE( | ||
174 | - [AC_LANG_PROGRAM([ | ||
175 | -# define __EXTENSIONS__ 1 | ||
176 | - AC_INCLUDES_DEFAULT])], | ||
177 | - [ac_cv_safe_to_define___extensions__=yes], | ||
178 | - [ac_cv_safe_to_define___extensions__=no])]) | ||
179 | - test $ac_cv_safe_to_define___extensions__ = yes && | ||
180 | - AC_DEFINE([__EXTENSIONS__]) | ||
181 | - AC_DEFINE([_POSIX_PTHREAD_SEMANTICS]) | ||
182 | - AC_DEFINE([_TANDEM_SOURCE]) | ||
183 | -]) | ||
184 | +#AC_DEFUN([AC_USE_SYSTEM_EXTENSIONS], | ||
185 | +#[ | ||
186 | +# AC_BEFORE([$0], [AC_COMPILE_IFELSE]) | ||
187 | +# AC_BEFORE([$0], [AC_RUN_IFELSE]) | ||
188 | +# | ||
189 | +# AC_REQUIRE([AC_GNU_SOURCE]) | ||
190 | +# AC_REQUIRE([AC_AIX]) | ||
191 | +# AC_REQUIRE([AC_MINIX]) | ||
192 | +# | ||
193 | +# AH_VERBATIM([__EXTENSIONS__], | ||
194 | +#[/* Enable extensions on Solaris. */ | ||
195 | +##ifndef __EXTENSIONS__ | ||
196 | +## undef __EXTENSIONS__ | ||
197 | +##endif | ||
198 | +##ifndef _POSIX_PTHREAD_SEMANTICS | ||
199 | +## undef _POSIX_PTHREAD_SEMANTICS | ||
200 | +##endif | ||
201 | +##ifndef _TANDEM_SOURCE | ||
202 | +## undef _TANDEM_SOURCE | ||
203 | +##endif]) | ||
204 | +# AC_CACHE_CHECK([whether it is safe to define __EXTENSIONS__], | ||
205 | +# [ac_cv_safe_to_define___extensions__], | ||
206 | +# [AC_COMPILE_IFELSE( | ||
207 | +# [AC_LANG_PROGRAM([ | ||
208 | +## define __EXTENSIONS__ 1 | ||
209 | +# AC_INCLUDES_DEFAULT])], | ||
210 | +# [ac_cv_safe_to_define___extensions__=yes], | ||
211 | +# [ac_cv_safe_to_define___extensions__=no])]) | ||
212 | +# test $ac_cv_safe_to_define___extensions__ = yes && | ||
213 | +# AC_DEFINE([__EXTENSIONS__]) | ||
214 | +# AC_DEFINE([_POSIX_PTHREAD_SEMANTICS]) | ||
215 | +# AC_DEFINE([_TANDEM_SOURCE]) | ||
216 | +#]) | ||
217 | |||
218 | # gl_USE_SYSTEM_EXTENSIONS | ||
219 | # ------------------------ | ||
220 | # Enable extensions on systems that normally disable them, | ||
221 | # typically due to standards-conformance issues. | ||
222 | AC_DEFUN([gl_USE_SYSTEM_EXTENSIONS], | ||
223 | - [AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS])]) | ||
224 | +[ | ||
225 | + AC_REQUIRE([AC_GNU_SOURCE]) | ||
226 | + | ||
227 | + AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS]) | ||
228 | +]) | ||
229 | diff -ru gettext-0.16.1/gettext-tools/gnulib-m4/fnmatch.m4 gettext.patched/gettext-tools/gnulib-m4/fnmatch.m4 | ||
230 | --- gettext-0.16.1/gettext-tools/gnulib-m4/fnmatch.m4 2006-11-27 09:14:54.000000000 -0800 | ||
231 | +++ gettext.patched/gettext-tools/gnulib-m4/fnmatch.m4 2011-03-16 23:52:06.477463671 -0700 | ||
232 | @@ -91,7 +91,7 @@ | ||
233 | AC_DEFUN([gl_FUNC_FNMATCH_GNU], | ||
234 | [ | ||
235 | dnl Persuade glibc <fnmatch.h> to declare FNM_CASEFOLD etc. | ||
236 | - AC_REQUIRE([AC_GNU_SOURCE]) | ||
237 | + dnl AC_REQUIRE([AC_GNU_SOURCE]) | ||
238 | |||
239 | FNMATCH_H= | ||
240 | _AC_FUNC_FNMATCH_IF([GNU], [ac_cv_func_fnmatch_gnu], | ||
241 | diff -ru gettext-0.16.1/gettext-tools/gnulib-m4/getdelim.m4 gettext.patched/gettext-tools/gnulib-m4/getdelim.m4 | ||
242 | --- gettext-0.16.1/gettext-tools/gnulib-m4/getdelim.m4 2006-11-27 09:14:54.000000000 -0800 | ||
243 | +++ gettext.patched/gettext-tools/gnulib-m4/getdelim.m4 2011-03-16 23:52:22.871674845 -0700 | ||
244 | @@ -12,7 +12,7 @@ | ||
245 | [ | ||
246 | |||
247 | dnl Persuade glibc <stdio.h> to declare getdelim(). | ||
248 | - AC_REQUIRE([AC_GNU_SOURCE]) | ||
249 | + dnl AC_REQUIRE([AC_GNU_SOURCE]) | ||
250 | |||
251 | AC_REPLACE_FUNCS(getdelim) | ||
252 | AC_CHECK_DECLS_ONCE(getdelim) | ||
253 | diff -ru gettext-0.16.1/gettext-tools/gnulib-m4/getline.m4 gettext.patched/gettext-tools/gnulib-m4/getline.m4 | ||
254 | --- gettext-0.16.1/gettext-tools/gnulib-m4/getline.m4 2006-11-27 09:14:54.000000000 -0800 | ||
255 | +++ gettext.patched/gettext-tools/gnulib-m4/getline.m4 2011-03-16 23:51:49.829971108 -0700 | ||
256 | @@ -16,7 +16,7 @@ | ||
257 | AC_DEFUN([gl_FUNC_GETLINE], | ||
258 | [ | ||
259 | dnl Persuade glibc <stdio.h> to declare getline(). | ||
260 | - AC_REQUIRE([AC_GNU_SOURCE]) | ||
261 | + dnl AC_REQUIRE([AC_GNU_SOURCE]) | ||
262 | |||
263 | AC_CHECK_DECLS([getline]) | ||
264 | |||
265 | diff -ru gettext-0.16.1/gettext-tools/gnulib-m4/gnulib-comp.m4 gettext.patched/gettext-tools/gnulib-m4/gnulib-comp.m4 | ||
266 | --- gettext-0.16.1/gettext-tools/gnulib-m4/gnulib-comp.m4 2006-11-27 09:33:36.000000000 -0800 | ||
267 | +++ gettext.patched/gettext-tools/gnulib-m4/gnulib-comp.m4 2011-03-16 23:52:18.970450488 -0700 | ||
268 | @@ -25,7 +25,7 @@ | ||
269 | m4_pattern_allow([^gl_LIBOBJS$])dnl a variable | ||
270 | m4_pattern_allow([^gl_LTLIBOBJS$])dnl a variable | ||
271 | AC_REQUIRE([AC_PROG_RANLIB]) | ||
272 | - AC_REQUIRE([AC_GNU_SOURCE]) | ||
273 | + dnl AC_REQUIRE([AC_GNU_SOURCE]) | ||
274 | AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS]) | ||
275 | AC_REQUIRE([gl_LOCK_EARLY]) | ||
276 | ]) | ||
277 | diff -ru gettext-0.16.1/gettext-tools/gnulib-m4/mbchar.m4 gettext.patched/gettext-tools/gnulib-m4/mbchar.m4 | ||
278 | --- gettext-0.16.1/gettext-tools/gnulib-m4/mbchar.m4 2006-11-27 09:14:55.000000000 -0800 | ||
279 | +++ gettext.patched/gettext-tools/gnulib-m4/mbchar.m4 2011-03-16 23:51:40.844410216 -0700 | ||
280 | @@ -9,7 +9,7 @@ | ||
281 | |||
282 | AC_DEFUN([gl_MBCHAR], | ||
283 | [ | ||
284 | - AC_REQUIRE([AC_GNU_SOURCE]) | ||
285 | + dnl AC_REQUIRE([AC_GNU_SOURCE]) | ||
286 | dnl The following line is that so the user can test HAVE_WCHAR_H | ||
287 | dnl before #include "mbchar.h". | ||
288 | AC_CHECK_HEADERS_ONCE([wchar.h]) | ||
289 | diff -ru gettext-0.16.1/gettext-tools/gnulib-m4/stpcpy.m4 gettext.patched/gettext-tools/gnulib-m4/stpcpy.m4 | ||
290 | --- gettext-0.16.1/gettext-tools/gnulib-m4/stpcpy.m4 2006-11-27 09:14:55.000000000 -0800 | ||
291 | +++ gettext.patched/gettext-tools/gnulib-m4/stpcpy.m4 2011-03-16 23:52:14.691396045 -0700 | ||
292 | @@ -7,7 +7,7 @@ | ||
293 | AC_DEFUN([gl_FUNC_STPCPY], | ||
294 | [ | ||
295 | dnl Persuade glibc <string.h> to declare stpcpy(). | ||
296 | - AC_REQUIRE([AC_GNU_SOURCE]) | ||
297 | + dnl AC_REQUIRE([AC_GNU_SOURCE]) | ||
298 | |||
299 | AC_REPLACE_FUNCS(stpcpy) | ||
300 | if test $ac_cv_func_stpcpy = no; then | ||
301 | diff -ru gettext-0.16.1/gettext-tools/gnulib-m4/stpncpy.m4 gettext.patched/gettext-tools/gnulib-m4/stpncpy.m4 | ||
302 | --- gettext-0.16.1/gettext-tools/gnulib-m4/stpncpy.m4 2006-11-27 09:14:55.000000000 -0800 | ||
303 | +++ gettext.patched/gettext-tools/gnulib-m4/stpncpy.m4 2011-03-16 23:52:10.356641459 -0700 | ||
304 | @@ -7,7 +7,7 @@ | ||
305 | AC_DEFUN([gl_FUNC_STPNCPY], | ||
306 | [ | ||
307 | dnl Persuade glibc <string.h> to declare stpncpy(). | ||
308 | - AC_REQUIRE([AC_GNU_SOURCE]) | ||
309 | + dnl AC_REQUIRE([AC_GNU_SOURCE]) | ||
310 | |||
311 | dnl Both glibc and AIX (4.3.3, 5.1) have an stpncpy() function | ||
312 | dnl declared in <string.h>. Its side effects are the same as those | ||
313 | diff -ru gettext-0.16.1/gettext-tools/gnulib-m4/wcwidth.m4 gettext.patched/gettext-tools/gnulib-m4/wcwidth.m4 | ||
314 | --- gettext-0.16.1/gettext-tools/gnulib-m4/wcwidth.m4 2006-11-27 09:14:55.000000000 -0800 | ||
315 | +++ gettext.patched/gettext-tools/gnulib-m4/wcwidth.m4 2011-03-16 23:51:08.260324221 -0700 | ||
316 | @@ -7,7 +7,7 @@ | ||
317 | AC_DEFUN([gl_FUNC_WCWIDTH], | ||
318 | [ | ||
319 | dnl Persuade glibc <wchar.h> to declare wcwidth(). | ||
320 | - AC_REQUIRE([AC_GNU_SOURCE]) | ||
321 | + dnl AC_REQUIRE([AC_GNU_SOURCE]) | ||
322 | |||
323 | AC_REQUIRE([AC_C_INLINE]) | ||
324 | AC_REQUIRE([gt_TYPE_WCHAR_T]) | ||
325 | diff -ru gettext-0.16.1/gettext-tools/libgettextpo/gnulib-m4/gnulib-comp.m4 gettext.patched/gettext-tools/libgettextpo/gnulib-m4/gnulib-comp.m4 | ||
326 | --- gettext-0.16.1/gettext-tools/libgettextpo/gnulib-m4/gnulib-comp.m4 2006-11-27 09:33:45.000000000 -0800 | ||
327 | +++ gettext.patched/gettext-tools/libgettextpo/gnulib-m4/gnulib-comp.m4 2011-03-16 23:51:02.036061317 -0700 | ||
328 | @@ -25,7 +25,7 @@ | ||
329 | m4_pattern_allow([^gl_LIBOBJS$])dnl a variable | ||
330 | m4_pattern_allow([^gl_LTLIBOBJS$])dnl a variable | ||
331 | AC_REQUIRE([AC_PROG_RANLIB]) | ||
332 | - AC_REQUIRE([AC_GNU_SOURCE]) | ||
333 | + dnl AC_REQUIRE([AC_GNU_SOURCE]) | ||
334 | AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS]) | ||
335 | AC_REQUIRE([gl_LOCK_EARLY]) | ||
336 | ]) | ||
337 | diff -ru gettext-0.16.1/gettext-tools/m4/regex.m4 gettext.patched/gettext-tools/m4/regex.m4 | ||
338 | --- gettext-0.16.1/gettext-tools/m4/regex.m4 2006-11-27 09:02:05.000000000 -0800 | ||
339 | +++ gettext.patched/gettext-tools/m4/regex.m4 2011-03-16 23:50:53.533477195 -0700 | ||
340 | @@ -116,7 +116,7 @@ | ||
341 | dnl to get them. | ||
342 | |||
343 | dnl Persuade glibc <string.h> to declare mempcpy(). | ||
344 | - AC_REQUIRE([AC_GNU_SOURCE]) | ||
345 | + dnl AC_REQUIRE([AC_GNU_SOURCE]) | ||
346 | |||
347 | AC_REQUIRE([AC_C_RESTRICT]) | ||
348 | AC_REQUIRE([AC_FUNC_ALLOCA]) | ||