gettext/gettext.patch@870131689a5c
gettext/gettext.patch
Sat, 21 May 2011 22:05:42 +0200
- author
- Michael Schloh von Bennewitz <michael@schloh.com>
- date
- Sat, 21 May 2011 22:05:42 +0200
- changeset 340
- 870131689a5c
- permissions
- -rw-r--r--
Correct diverse buildconf of upstream release and reconcile packaging somewhat.
These changes stem from the obvious changes in the latest vendor release, but
from discussions with trolls Daniel and Oswald as well regarding build config.
This commital follows conclusion of buildconf adjustments to allow the new
vendor version to build on Linux AMD64, but is incomplete as many packaging
comments show. The next series of changes focus on Solaris IA32 and reduction
of buildconf adjustments testing old problems comprehensively in anticipation
of discussion at the upcoming Nokia Contributor Summit in Berlin.
1 Index: gettext-runtime/intl/plural-exp.c
2 --- gettext-runtime/intl/plural-exp.c.orig 2009-06-28 21:44:04.000000000 +0200
3 +++ gettext-runtime/intl/plural-exp.c 2010-05-10 08:51:14.000000000 +0200
4 @@ -27,7 +27,7 @@
6 #include "plural-exp.h"
8 -#if (defined __GNUC__ && !(__APPLE_CC__ > 1) && !defined __cplusplus) \
9 +#if (defined __GNUC__ && !(__APPLE_CC__+0 > 1) && !defined __cplusplus) \
10 || (defined __STDC_VERSION__ && __STDC_VERSION__ >= 199901L)
12 /* These structs are the constant expression for the germanic plural
13 Index: gettext-tools/gnulib-lib/execute.c
14 --- gettext-tools/gnulib-lib/execute.c.orig 2010-02-16 22:32:17.000000000 +0100
15 +++ gettext-tools/gnulib-lib/execute.c 2010-05-10 20:22:18.000000000 +0200
16 @@ -200,6 +200,9 @@
17 subprocess to exit with return code 127. It is implementation
18 dependent which error is reported which way. We treat both cases as
19 equivalent. */
20 +#ifndef HAVE_ENVIRON_DECL
21 + extern char **environ;
22 +#endif
23 sigset_t blocked_signals;
24 posix_spawn_file_actions_t actions;
25 bool actions_allocated;
