diff options
author | Saul Wold <sgw@linux.intel.com> | 2011-03-17 01:12:56 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-03-17 17:40:55 +0000 |
commit | 3072c245da1a36205cd5e258515eff16f6f7f55e (patch) | |
tree | 10633949a1f179d782cb5d6e4ff6934caa5c9d05 /meta/recipes-core/gettext/gettext-0.16.1 | |
parent | 490bbfbe4b4c7ec9c0942b5fadae1ad12af31c20 (diff) | |
download | poky-3072c245da1a36205cd5e258515eff16f6f7f55e.tar.gz |
gettext: Upgrade GPLv2 version to 0.16.1
This adds a couple of new patches for handling various autoconf
and autolocal issues. It also hardcodes a GETTEXT_MACRO_VERSION
to 0.17 to match the native gettext.
(From OE-Core rev: e897103a58ad672cc87d2bab3ec45501ef09f8f1)
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/gettext/gettext-0.16.1')
10 files changed, 1368 insertions, 0 deletions
diff --git a/meta/recipes-core/gettext/gettext-0.16.1/disable_java.patch b/meta/recipes-core/gettext/gettext-0.16.1/disable_java.patch new file mode 100644 index 0000000000..cf7dc55b68 --- /dev/null +++ b/meta/recipes-core/gettext/gettext-0.16.1/disable_java.patch | |||
@@ -0,0 +1,36 @@ | |||
1 | # Pulled from OpenEmbedded | ||
2 | # | ||
3 | # Commented by: Saul Wold <saul.wold@intel.com> | ||
4 | |||
5 | Index: gettext-0.16.1/gettext-tools/configure.ac | ||
6 | =================================================================== | ||
7 | --- gettext-0.16.1.orig/gettext-tools/configure.ac 2006-11-27 09:02:01.000000000 -0800 | ||
8 | +++ gettext-0.16.1/gettext-tools/configure.ac 2011-03-16 16:55:36.111396557 -0700 | ||
9 | @@ -36,27 +36,15 @@ | ||
10 | gt_JAVA_CHOICE | ||
11 | |||
12 | gt_GCJ | ||
13 | -if test -n "$HAVE_GCJ" && test "$JAVA_CHOICE" = yes; then | ||
14 | - BUILDJAVAEXE=yes | ||
15 | -else | ||
16 | BUILDJAVAEXE=no | ||
17 | -fi | ||
18 | AC_SUBST(BUILDJAVAEXE) | ||
19 | |||
20 | gt_JAVAEXEC | ||
21 | gt_JAVACOMP([1.3]) | ||
22 | AC_CHECK_PROG(JAR, jar, jar) | ||
23 | -if test -n "$HAVE_JAVACOMP" && test -n "$JAR" && test "$JAVA_CHOICE" != no; then | ||
24 | - BUILDJAVA=yes | ||
25 | -else | ||
26 | BUILDJAVA=no | ||
27 | -fi | ||
28 | AC_SUBST(BUILDJAVA) | ||
29 | -if test -n "$HAVE_JAVAEXEC" && test $BUILDJAVA = yes; then | ||
30 | - TESTJAVA=yes | ||
31 | -else | ||
32 | TESTJAVA=no | ||
33 | -fi | ||
34 | AC_SUBST(TESTJAVA) | ||
35 | |||
36 | gt_CSHARPCOMP | ||
diff --git a/meta/recipes-core/gettext/gettext-0.16.1/fix_aclocal_version.patch b/meta/recipes-core/gettext/gettext-0.16.1/fix_aclocal_version.patch new file mode 100644 index 0000000000..3796052a55 --- /dev/null +++ b/meta/recipes-core/gettext/gettext-0.16.1/fix_aclocal_version.patch | |||
@@ -0,0 +1,107 @@ | |||
1 | This patch updates the required version number from 2.61 to the | ||
2 | current 2.65 version of aclocal, this will need to be updated | ||
3 | when we update aclocal | ||
4 | |||
5 | Signed-off-by Saul Wold <sgw@linux.intel.com> | ||
6 | |||
7 | Index: gettext-0.16.1/autoconf-lib-link/m4/lib-link.m4 | ||
8 | =================================================================== | ||
9 | --- gettext-0.16.1.orig/autoconf-lib-link/m4/lib-link.m4 2011-03-17 02:24:36.391519775 -0700 | ||
10 | +++ gettext-0.16.1/autoconf-lib-link/m4/lib-link.m4 2011-03-17 02:24:45.569526073 -0700 | ||
11 | @@ -148,7 +148,7 @@ | ||
12 | define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-], | ||
13 | [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])]) | ||
14 | dnl Autoconf >= 2.61 supports dots in --with options. | ||
15 | - define([N_A_M_E],[m4_if(m4_version_compare(m4_defn([m4_PACKAGE_VERSION]),[2.61]),[-1],[translit([$1],[.],[_])],[$1])]) | ||
16 | + define([N_A_M_E],[m4_if(m4_version_compare(m4_defn([m4_PACKAGE_VERSION]),[2.65]),[-1],[translit([$1],[.],[_])],[$1])]) | ||
17 | dnl By default, look in $includedir and $libdir. | ||
18 | use_additional=yes | ||
19 | AC_LIB_WITH_FINAL_PREFIX([ | ||
20 | Index: gettext-0.16.1/autoconf-lib-link/tests/rpathly/aclocal.m4 | ||
21 | =================================================================== | ||
22 | --- gettext-0.16.1.orig/autoconf-lib-link/tests/rpathly/aclocal.m4 2011-03-17 02:24:36.391519775 -0700 | ||
23 | +++ gettext-0.16.1/autoconf-lib-link/tests/rpathly/aclocal.m4 2011-03-17 02:24:45.570526904 -0700 | ||
24 | @@ -11,8 +11,8 @@ | ||
25 | # even the implied warranty of MERCHANTABILITY or FITNESS FOR A | ||
26 | # PARTICULAR PURPOSE. | ||
27 | |||
28 | -m4_if(m4_PACKAGE_VERSION, [2.61],, | ||
29 | -[m4_fatal([this file was generated for autoconf 2.61. | ||
30 | +m4_if(m4_PACKAGE_VERSION, [2.65],, | ||
31 | +[m4_fatal([this file was generated for autoconf 2.65. | ||
32 | You have another version of autoconf. If you want to use that, | ||
33 | you should regenerate the build system entirely.], [63])]) | ||
34 | |||
35 | Index: gettext-0.16.1/autoconf-lib-link/tests/rpathx/aclocal.m4 | ||
36 | =================================================================== | ||
37 | --- gettext-0.16.1.orig/autoconf-lib-link/tests/rpathx/aclocal.m4 2011-03-17 02:24:36.391519775 -0700 | ||
38 | +++ gettext-0.16.1/autoconf-lib-link/tests/rpathx/aclocal.m4 2011-03-17 02:24:45.572525773 -0700 | ||
39 | @@ -11,8 +11,8 @@ | ||
40 | # even the implied warranty of MERCHANTABILITY or FITNESS FOR A | ||
41 | # PARTICULAR PURPOSE. | ||
42 | |||
43 | -m4_if(m4_PACKAGE_VERSION, [2.61],, | ||
44 | -[m4_fatal([this file was generated for autoconf 2.61. | ||
45 | +m4_if(m4_PACKAGE_VERSION, [2.65],, | ||
46 | +[m4_fatal([this file was generated for autoconf 2.65. | ||
47 | You have another version of autoconf. If you want to use that, | ||
48 | you should regenerate the build system entirely.], [63])]) | ||
49 | |||
50 | Index: gettext-0.16.1/autoconf-lib-link/tests/rpathy/aclocal.m4 | ||
51 | =================================================================== | ||
52 | --- gettext-0.16.1.orig/autoconf-lib-link/tests/rpathy/aclocal.m4 2011-03-17 02:24:36.391519775 -0700 | ||
53 | +++ gettext-0.16.1/autoconf-lib-link/tests/rpathy/aclocal.m4 2011-03-17 02:24:45.578394916 -0700 | ||
54 | @@ -11,7 +11,7 @@ | ||
55 | # even the implied warranty of MERCHANTABILITY or FITNESS FOR A | ||
56 | # PARTICULAR PURPOSE. | ||
57 | |||
58 | -m4_if(m4_PACKAGE_VERSION, [2.61],, | ||
59 | +m4_if(m4_PACKAGE_VERSION, [2.65],, | ||
60 | [m4_fatal([this file was generated for autoconf 2.61. | ||
61 | You have another version of autoconf. If you want to use that, | ||
62 | you should regenerate the build system entirely.], [63])]) | ||
63 | Index: gettext-0.16.1/autoconf-lib-link/tests/rpathz/aclocal.m4 | ||
64 | =================================================================== | ||
65 | --- gettext-0.16.1.orig/autoconf-lib-link/tests/rpathz/aclocal.m4 2011-03-17 02:24:36.391519775 -0700 | ||
66 | +++ gettext-0.16.1/autoconf-lib-link/tests/rpathz/aclocal.m4 2011-03-17 02:24:45.586395416 -0700 | ||
67 | @@ -11,8 +11,8 @@ | ||
68 | # even the implied warranty of MERCHANTABILITY or FITNESS FOR A | ||
69 | # PARTICULAR PURPOSE. | ||
70 | |||
71 | -m4_if(m4_PACKAGE_VERSION, [2.61],, | ||
72 | -[m4_fatal([this file was generated for autoconf 2.61. | ||
73 | +m4_if(m4_PACKAGE_VERSION, [2.65],, | ||
74 | +[m4_fatal([this file was generated for autoconf 2.65. | ||
75 | You have another version of autoconf. If you want to use that, | ||
76 | you should regenerate the build system entirely.], [63])]) | ||
77 | |||
78 | Index: gettext-0.16.1/gettext-tools/aclocal.m4 | ||
79 | =================================================================== | ||
80 | --- gettext-0.16.1.orig/gettext-tools/aclocal.m4 2006-11-27 09:34:32.000000000 -0800 | ||
81 | +++ gettext-0.16.1/gettext-tools/aclocal.m4 2011-03-17 02:27:01.135682807 -0700 | ||
82 | @@ -11,8 +11,8 @@ | ||
83 | # even the implied warranty of MERCHANTABILITY or FITNESS FOR A | ||
84 | # PARTICULAR PURPOSE. | ||
85 | |||
86 | -m4_if(m4_PACKAGE_VERSION, [2.61],, | ||
87 | -[m4_fatal([this file was generated for autoconf 2.61. | ||
88 | +m4_if(m4_PACKAGE_VERSION, [2.65],, | ||
89 | +[m4_fatal([this file was generated for autoconf 2.65. | ||
90 | You have another version of autoconf. If you want to use that, | ||
91 | you should regenerate the build system entirely.], [63])]) | ||
92 | |||
93 | Index: gettext-0.16.1/gettext-tools/examples/aclocal.m4 | ||
94 | =================================================================== | ||
95 | --- gettext-0.16.1.orig/gettext-tools/examples/aclocal.m4 2006-11-27 09:16:23.000000000 -0800 | ||
96 | +++ gettext-0.16.1/gettext-tools/examples/aclocal.m4 2011-03-17 02:26:52.589396683 -0700 | ||
97 | @@ -11,8 +11,8 @@ | ||
98 | # even the implied warranty of MERCHANTABILITY or FITNESS FOR A | ||
99 | # PARTICULAR PURPOSE. | ||
100 | |||
101 | -m4_if(m4_PACKAGE_VERSION, [2.61],, | ||
102 | -[m4_fatal([this file was generated for autoconf 2.61. | ||
103 | +m4_if(m4_PACKAGE_VERSION, [2.65],, | ||
104 | +[m4_fatal([this file was generated for autoconf 2.65. | ||
105 | You have another version of autoconf. If you want to use that, | ||
106 | you should regenerate the build system entirely.], [63])]) | ||
107 | |||
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 new file mode 100644 index 0000000000..8b42f1b37d --- /dev/null +++ b/meta/recipes-core/gettext/gettext-0.16.1/fix_gnu_source_circular.patch | |||
@@ -0,0 +1,345 @@ | |||
1 | This patch removes the circular dependency on AC_GNU_SOURCE in | ||
2 | AC_USE_SYSTEM_EXTENSIONS. | ||
3 | |||
4 | Thanks to Mark Hatle for the timely pointers and fixes. | ||
5 | |||
6 | Signed-off-by Saul Wold <sgw@linux.intel.com> | ||
7 | |||
8 | diff -ru gettext-0.16.1/gettext-runtime/gnulib-m4/extensions.m4 gettext.patched/gettext-runtime/gnulib-m4/extensions.m4 | ||
9 | --- gettext-0.16.1/gettext-runtime/gnulib-m4/extensions.m4 2006-11-27 09:14:38.000000000 -0800 | ||
10 | +++ gettext.patched/gettext-runtime/gnulib-m4/extensions.m4 2011-03-16 23:54:01.711923448 -0700 | ||
11 | @@ -16,43 +16,47 @@ | ||
12 | # ------------------------ | ||
13 | # Enable extensions on systems that normally disable them, | ||
14 | # typically due to standards-conformance issues. | ||
15 | -AC_DEFUN([AC_USE_SYSTEM_EXTENSIONS], | ||
16 | -[ | ||
17 | - AC_BEFORE([$0], [AC_COMPILE_IFELSE]) | ||
18 | - AC_BEFORE([$0], [AC_RUN_IFELSE]) | ||
19 | - | ||
20 | - AC_REQUIRE([AC_GNU_SOURCE]) | ||
21 | - AC_REQUIRE([AC_AIX]) | ||
22 | - AC_REQUIRE([AC_MINIX]) | ||
23 | - | ||
24 | - AH_VERBATIM([__EXTENSIONS__], | ||
25 | -[/* Enable extensions on Solaris. */ | ||
26 | -#ifndef __EXTENSIONS__ | ||
27 | -# undef __EXTENSIONS__ | ||
28 | -#endif | ||
29 | -#ifndef _POSIX_PTHREAD_SEMANTICS | ||
30 | -# undef _POSIX_PTHREAD_SEMANTICS | ||
31 | -#endif | ||
32 | -#ifndef _TANDEM_SOURCE | ||
33 | -# undef _TANDEM_SOURCE | ||
34 | -#endif]) | ||
35 | - AC_CACHE_CHECK([whether it is safe to define __EXTENSIONS__], | ||
36 | - [ac_cv_safe_to_define___extensions__], | ||
37 | - [AC_COMPILE_IFELSE( | ||
38 | - [AC_LANG_PROGRAM([ | ||
39 | -# define __EXTENSIONS__ 1 | ||
40 | - AC_INCLUDES_DEFAULT])], | ||
41 | - [ac_cv_safe_to_define___extensions__=yes], | ||
42 | - [ac_cv_safe_to_define___extensions__=no])]) | ||
43 | - test $ac_cv_safe_to_define___extensions__ = yes && | ||
44 | - AC_DEFINE([__EXTENSIONS__]) | ||
45 | - AC_DEFINE([_POSIX_PTHREAD_SEMANTICS]) | ||
46 | - AC_DEFINE([_TANDEM_SOURCE]) | ||
47 | -]) | ||
48 | +#AC_DEFUN([AC_USE_SYSTEM_EXTENSIONS], | ||
49 | +#[ | ||
50 | +# AC_BEFORE([$0], [AC_COMPILE_IFELSE]) | ||
51 | +# AC_BEFORE([$0], [AC_RUN_IFELSE]) | ||
52 | +# | ||
53 | +# AC_REQUIRE([AC_GNU_SOURCE]) | ||
54 | +# AC_REQUIRE([AC_AIX]) | ||
55 | +# AC_REQUIRE([AC_MINIX]) | ||
56 | +# | ||
57 | +# AH_VERBATIM([__EXTENSIONS__], | ||
58 | +#[/* Enable extensions on Solaris. */ | ||
59 | +##ifndef __EXTENSIONS__ | ||
60 | +## undef __EXTENSIONS__ | ||
61 | +##endif | ||
62 | +##ifndef _POSIX_PTHREAD_SEMANTICS | ||
63 | +## undef _POSIX_PTHREAD_SEMANTICS | ||
64 | +##endif | ||
65 | +##ifndef _TANDEM_SOURCE | ||
66 | +## undef _TANDEM_SOURCE | ||
67 | +##endif]) | ||
68 | +# AC_CACHE_CHECK([whether it is safe to define __EXTENSIONS__], | ||
69 | +# [ac_cv_safe_to_define___extensions__], | ||
70 | +# [AC_COMPILE_IFELSE( | ||
71 | +# [AC_LANG_PROGRAM([ | ||
72 | +## define __EXTENSIONS__ 1 | ||
73 | +# AC_INCLUDES_DEFAULT])], | ||
74 | +# [ac_cv_safe_to_define___extensions__=yes], | ||
75 | +# [ac_cv_safe_to_define___extensions__=no])]) | ||
76 | +# test $ac_cv_safe_to_define___extensions__ = yes && | ||
77 | +# AC_DEFINE([__EXTENSIONS__]) | ||
78 | +# AC_DEFINE([_POSIX_PTHREAD_SEMANTICS]) | ||
79 | +# AC_DEFINE([_TANDEM_SOURCE]) | ||
80 | +#]) | ||
81 | |||
82 | # gl_USE_SYSTEM_EXTENSIONS | ||
83 | # ------------------------ | ||
84 | # Enable extensions on systems that normally disable them, | ||
85 | # typically due to standards-conformance issues. | ||
86 | AC_DEFUN([gl_USE_SYSTEM_EXTENSIONS], | ||
87 | - [AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS])]) | ||
88 | +[ | ||
89 | + AC_REQUIRE([AC_GNU_SOURCE]) | ||
90 | + | ||
91 | + AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS]) | ||
92 | +]) | ||
93 | diff -ru gettext-0.16.1/gettext-runtime/gnulib-m4/gnulib-comp.m4 gettext.patched/gettext-runtime/gnulib-m4/gnulib-comp.m4 | ||
94 | --- gettext-0.16.1/gettext-runtime/gnulib-m4/gnulib-comp.m4 2006-11-27 09:33:19.000000000 -0800 | ||
95 | +++ gettext.patched/gettext-runtime/gnulib-m4/gnulib-comp.m4 2011-03-16 23:50:17.471531838 -0700 | ||
96 | @@ -25,7 +25,7 @@ | ||
97 | m4_pattern_allow([^gl_LIBOBJS$])dnl a variable | ||
98 | m4_pattern_allow([^gl_LTLIBOBJS$])dnl a variable | ||
99 | AC_REQUIRE([AC_PROG_RANLIB]) | ||
100 | - AC_REQUIRE([AC_GNU_SOURCE]) | ||
101 | + dnl AC_REQUIRE([AC_GNU_SOURCE]) | ||
102 | AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS]) | ||
103 | ]) | ||
104 | |||
105 | diff -ru gettext-0.16.1/gettext-runtime/gnulib-m4/mbchar.m4 gettext.patched/gettext-runtime/gnulib-m4/mbchar.m4 | ||
106 | --- gettext-0.16.1/gettext-runtime/gnulib-m4/mbchar.m4 2006-11-27 09:14:38.000000000 -0800 | ||
107 | +++ gettext.patched/gettext-runtime/gnulib-m4/mbchar.m4 2011-03-16 23:50:10.814396529 -0700 | ||
108 | @@ -9,7 +9,7 @@ | ||
109 | |||
110 | AC_DEFUN([gl_MBCHAR], | ||
111 | [ | ||
112 | - AC_REQUIRE([AC_GNU_SOURCE]) | ||
113 | + dnl AC_REQUIRE([AC_GNU_SOURCE]) | ||
114 | dnl The following line is that so the user can test HAVE_WCHAR_H | ||
115 | dnl before #include "mbchar.h". | ||
116 | AC_CHECK_HEADERS_ONCE([wchar.h]) | ||
117 | diff -ru gettext-0.16.1/gettext-runtime/gnulib-m4/wcwidth.m4 gettext.patched/gettext-runtime/gnulib-m4/wcwidth.m4 | ||
118 | --- gettext-0.16.1/gettext-runtime/gnulib-m4/wcwidth.m4 2006-11-27 09:14:38.000000000 -0800 | ||
119 | +++ gettext.patched/gettext-runtime/gnulib-m4/wcwidth.m4 2011-03-16 23:50:08.357396247 -0700 | ||
120 | @@ -7,7 +7,7 @@ | ||
121 | AC_DEFUN([gl_FUNC_WCWIDTH], | ||
122 | [ | ||
123 | dnl Persuade glibc <wchar.h> to declare wcwidth(). | ||
124 | - AC_REQUIRE([AC_GNU_SOURCE]) | ||
125 | + dnl AC_REQUIRE([AC_GNU_SOURCE]) | ||
126 | |||
127 | AC_REQUIRE([AC_C_INLINE]) | ||
128 | AC_REQUIRE([gt_TYPE_WCHAR_T]) | ||
129 | diff -ru gettext-0.16.1/gettext-runtime/m4/lock.m4 gettext.patched/gettext-runtime/m4/lock.m4 | ||
130 | --- gettext-0.16.1/gettext-runtime/m4/lock.m4 2006-10-24 13:59:59.000000000 -0700 | ||
131 | +++ gettext.patched/gettext-runtime/m4/lock.m4 2011-03-16 23:50:04.355891676 -0700 | ||
132 | @@ -35,7 +35,7 @@ | ||
133 | AC_BEFORE([$0], [gl_ARGP])dnl | ||
134 | |||
135 | AC_REQUIRE([AC_CANONICAL_HOST]) | ||
136 | - AC_REQUIRE([AC_GNU_SOURCE]) dnl needed for pthread_rwlock_t on glibc systems | ||
137 | + dnl AC_REQUIRE([AC_GNU_SOURCE]) dnl needed for pthread_rwlock_t on glibc systems | ||
138 | dnl Check for multithreading. | ||
139 | AC_ARG_ENABLE(threads, | ||
140 | AC_HELP_STRING([--enable-threads={posix|solaris|pth|win32}], [specify multithreading API]) | ||
141 | diff -ru gettext-0.16.1/gettext-tools/gnulib-m4/extensions.m4 gettext.patched/gettext-tools/gnulib-m4/extensions.m4 | ||
142 | --- gettext-0.16.1/gettext-tools/gnulib-m4/extensions.m4 2006-11-27 09:14:54.000000000 -0800 | ||
143 | +++ gettext.patched/gettext-tools/gnulib-m4/extensions.m4 2011-03-16 23:53:28.487671266 -0700 | ||
144 | @@ -16,43 +16,47 @@ | ||
145 | # ------------------------ | ||
146 | # Enable extensions on systems that normally disable them, | ||
147 | # typically due to standards-conformance issues. | ||
148 | -AC_DEFUN([AC_USE_SYSTEM_EXTENSIONS], | ||
149 | -[ | ||
150 | - AC_BEFORE([$0], [AC_COMPILE_IFELSE]) | ||
151 | - AC_BEFORE([$0], [AC_RUN_IFELSE]) | ||
152 | - | ||
153 | - AC_REQUIRE([AC_GNU_SOURCE]) | ||
154 | - AC_REQUIRE([AC_AIX]) | ||
155 | - AC_REQUIRE([AC_MINIX]) | ||
156 | - | ||
157 | - AH_VERBATIM([__EXTENSIONS__], | ||
158 | -[/* Enable extensions on Solaris. */ | ||
159 | -#ifndef __EXTENSIONS__ | ||
160 | -# undef __EXTENSIONS__ | ||
161 | -#endif | ||
162 | -#ifndef _POSIX_PTHREAD_SEMANTICS | ||
163 | -# undef _POSIX_PTHREAD_SEMANTICS | ||
164 | -#endif | ||
165 | -#ifndef _TANDEM_SOURCE | ||
166 | -# undef _TANDEM_SOURCE | ||
167 | -#endif]) | ||
168 | - AC_CACHE_CHECK([whether it is safe to define __EXTENSIONS__], | ||
169 | - [ac_cv_safe_to_define___extensions__], | ||
170 | - [AC_COMPILE_IFELSE( | ||
171 | - [AC_LANG_PROGRAM([ | ||
172 | -# define __EXTENSIONS__ 1 | ||
173 | - AC_INCLUDES_DEFAULT])], | ||
174 | - [ac_cv_safe_to_define___extensions__=yes], | ||
175 | - [ac_cv_safe_to_define___extensions__=no])]) | ||
176 | - test $ac_cv_safe_to_define___extensions__ = yes && | ||
177 | - AC_DEFINE([__EXTENSIONS__]) | ||
178 | - AC_DEFINE([_POSIX_PTHREAD_SEMANTICS]) | ||
179 | - AC_DEFINE([_TANDEM_SOURCE]) | ||
180 | -]) | ||
181 | +#AC_DEFUN([AC_USE_SYSTEM_EXTENSIONS], | ||
182 | +#[ | ||
183 | +# AC_BEFORE([$0], [AC_COMPILE_IFELSE]) | ||
184 | +# AC_BEFORE([$0], [AC_RUN_IFELSE]) | ||
185 | +# | ||
186 | +# AC_REQUIRE([AC_GNU_SOURCE]) | ||
187 | +# AC_REQUIRE([AC_AIX]) | ||
188 | +# AC_REQUIRE([AC_MINIX]) | ||
189 | +# | ||
190 | +# AH_VERBATIM([__EXTENSIONS__], | ||
191 | +#[/* Enable extensions on Solaris. */ | ||
192 | +##ifndef __EXTENSIONS__ | ||
193 | +## undef __EXTENSIONS__ | ||
194 | +##endif | ||
195 | +##ifndef _POSIX_PTHREAD_SEMANTICS | ||
196 | +## undef _POSIX_PTHREAD_SEMANTICS | ||
197 | +##endif | ||
198 | +##ifndef _TANDEM_SOURCE | ||
199 | +## undef _TANDEM_SOURCE | ||
200 | +##endif]) | ||
201 | +# AC_CACHE_CHECK([whether it is safe to define __EXTENSIONS__], | ||
202 | +# [ac_cv_safe_to_define___extensions__], | ||
203 | +# [AC_COMPILE_IFELSE( | ||
204 | +# [AC_LANG_PROGRAM([ | ||
205 | +## define __EXTENSIONS__ 1 | ||
206 | +# AC_INCLUDES_DEFAULT])], | ||
207 | +# [ac_cv_safe_to_define___extensions__=yes], | ||
208 | +# [ac_cv_safe_to_define___extensions__=no])]) | ||
209 | +# test $ac_cv_safe_to_define___extensions__ = yes && | ||
210 | +# AC_DEFINE([__EXTENSIONS__]) | ||
211 | +# AC_DEFINE([_POSIX_PTHREAD_SEMANTICS]) | ||
212 | +# AC_DEFINE([_TANDEM_SOURCE]) | ||
213 | +#]) | ||
214 | |||
215 | # gl_USE_SYSTEM_EXTENSIONS | ||
216 | # ------------------------ | ||
217 | # Enable extensions on systems that normally disable them, | ||
218 | # typically due to standards-conformance issues. | ||
219 | AC_DEFUN([gl_USE_SYSTEM_EXTENSIONS], | ||
220 | - [AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS])]) | ||
221 | +[ | ||
222 | + AC_REQUIRE([AC_GNU_SOURCE]) | ||
223 | + | ||
224 | + AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS]) | ||
225 | +]) | ||
226 | diff -ru gettext-0.16.1/gettext-tools/gnulib-m4/fnmatch.m4 gettext.patched/gettext-tools/gnulib-m4/fnmatch.m4 | ||
227 | --- gettext-0.16.1/gettext-tools/gnulib-m4/fnmatch.m4 2006-11-27 09:14:54.000000000 -0800 | ||
228 | +++ gettext.patched/gettext-tools/gnulib-m4/fnmatch.m4 2011-03-16 23:52:06.477463671 -0700 | ||
229 | @@ -91,7 +91,7 @@ | ||
230 | AC_DEFUN([gl_FUNC_FNMATCH_GNU], | ||
231 | [ | ||
232 | dnl Persuade glibc <fnmatch.h> to declare FNM_CASEFOLD etc. | ||
233 | - AC_REQUIRE([AC_GNU_SOURCE]) | ||
234 | + dnl AC_REQUIRE([AC_GNU_SOURCE]) | ||
235 | |||
236 | FNMATCH_H= | ||
237 | _AC_FUNC_FNMATCH_IF([GNU], [ac_cv_func_fnmatch_gnu], | ||
238 | diff -ru gettext-0.16.1/gettext-tools/gnulib-m4/getdelim.m4 gettext.patched/gettext-tools/gnulib-m4/getdelim.m4 | ||
239 | --- gettext-0.16.1/gettext-tools/gnulib-m4/getdelim.m4 2006-11-27 09:14:54.000000000 -0800 | ||
240 | +++ gettext.patched/gettext-tools/gnulib-m4/getdelim.m4 2011-03-16 23:52:22.871674845 -0700 | ||
241 | @@ -12,7 +12,7 @@ | ||
242 | [ | ||
243 | |||
244 | dnl Persuade glibc <stdio.h> to declare getdelim(). | ||
245 | - AC_REQUIRE([AC_GNU_SOURCE]) | ||
246 | + dnl AC_REQUIRE([AC_GNU_SOURCE]) | ||
247 | |||
248 | AC_REPLACE_FUNCS(getdelim) | ||
249 | AC_CHECK_DECLS_ONCE(getdelim) | ||
250 | diff -ru gettext-0.16.1/gettext-tools/gnulib-m4/getline.m4 gettext.patched/gettext-tools/gnulib-m4/getline.m4 | ||
251 | --- gettext-0.16.1/gettext-tools/gnulib-m4/getline.m4 2006-11-27 09:14:54.000000000 -0800 | ||
252 | +++ gettext.patched/gettext-tools/gnulib-m4/getline.m4 2011-03-16 23:51:49.829971108 -0700 | ||
253 | @@ -16,7 +16,7 @@ | ||
254 | AC_DEFUN([gl_FUNC_GETLINE], | ||
255 | [ | ||
256 | dnl Persuade glibc <stdio.h> to declare getline(). | ||
257 | - AC_REQUIRE([AC_GNU_SOURCE]) | ||
258 | + dnl AC_REQUIRE([AC_GNU_SOURCE]) | ||
259 | |||
260 | AC_CHECK_DECLS([getline]) | ||
261 | |||
262 | diff -ru gettext-0.16.1/gettext-tools/gnulib-m4/gnulib-comp.m4 gettext.patched/gettext-tools/gnulib-m4/gnulib-comp.m4 | ||
263 | --- gettext-0.16.1/gettext-tools/gnulib-m4/gnulib-comp.m4 2006-11-27 09:33:36.000000000 -0800 | ||
264 | +++ gettext.patched/gettext-tools/gnulib-m4/gnulib-comp.m4 2011-03-16 23:52:18.970450488 -0700 | ||
265 | @@ -25,7 +25,7 @@ | ||
266 | m4_pattern_allow([^gl_LIBOBJS$])dnl a variable | ||
267 | m4_pattern_allow([^gl_LTLIBOBJS$])dnl a variable | ||
268 | AC_REQUIRE([AC_PROG_RANLIB]) | ||
269 | - AC_REQUIRE([AC_GNU_SOURCE]) | ||
270 | + dnl AC_REQUIRE([AC_GNU_SOURCE]) | ||
271 | AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS]) | ||
272 | AC_REQUIRE([gl_LOCK_EARLY]) | ||
273 | ]) | ||
274 | diff -ru gettext-0.16.1/gettext-tools/gnulib-m4/mbchar.m4 gettext.patched/gettext-tools/gnulib-m4/mbchar.m4 | ||
275 | --- gettext-0.16.1/gettext-tools/gnulib-m4/mbchar.m4 2006-11-27 09:14:55.000000000 -0800 | ||
276 | +++ gettext.patched/gettext-tools/gnulib-m4/mbchar.m4 2011-03-16 23:51:40.844410216 -0700 | ||
277 | @@ -9,7 +9,7 @@ | ||
278 | |||
279 | AC_DEFUN([gl_MBCHAR], | ||
280 | [ | ||
281 | - AC_REQUIRE([AC_GNU_SOURCE]) | ||
282 | + dnl AC_REQUIRE([AC_GNU_SOURCE]) | ||
283 | dnl The following line is that so the user can test HAVE_WCHAR_H | ||
284 | dnl before #include "mbchar.h". | ||
285 | AC_CHECK_HEADERS_ONCE([wchar.h]) | ||
286 | diff -ru gettext-0.16.1/gettext-tools/gnulib-m4/stpcpy.m4 gettext.patched/gettext-tools/gnulib-m4/stpcpy.m4 | ||
287 | --- gettext-0.16.1/gettext-tools/gnulib-m4/stpcpy.m4 2006-11-27 09:14:55.000000000 -0800 | ||
288 | +++ gettext.patched/gettext-tools/gnulib-m4/stpcpy.m4 2011-03-16 23:52:14.691396045 -0700 | ||
289 | @@ -7,7 +7,7 @@ | ||
290 | AC_DEFUN([gl_FUNC_STPCPY], | ||
291 | [ | ||
292 | dnl Persuade glibc <string.h> to declare stpcpy(). | ||
293 | - AC_REQUIRE([AC_GNU_SOURCE]) | ||
294 | + dnl AC_REQUIRE([AC_GNU_SOURCE]) | ||
295 | |||
296 | AC_REPLACE_FUNCS(stpcpy) | ||
297 | if test $ac_cv_func_stpcpy = no; then | ||
298 | diff -ru gettext-0.16.1/gettext-tools/gnulib-m4/stpncpy.m4 gettext.patched/gettext-tools/gnulib-m4/stpncpy.m4 | ||
299 | --- gettext-0.16.1/gettext-tools/gnulib-m4/stpncpy.m4 2006-11-27 09:14:55.000000000 -0800 | ||
300 | +++ gettext.patched/gettext-tools/gnulib-m4/stpncpy.m4 2011-03-16 23:52:10.356641459 -0700 | ||
301 | @@ -7,7 +7,7 @@ | ||
302 | AC_DEFUN([gl_FUNC_STPNCPY], | ||
303 | [ | ||
304 | dnl Persuade glibc <string.h> to declare stpncpy(). | ||
305 | - AC_REQUIRE([AC_GNU_SOURCE]) | ||
306 | + dnl AC_REQUIRE([AC_GNU_SOURCE]) | ||
307 | |||
308 | dnl Both glibc and AIX (4.3.3, 5.1) have an stpncpy() function | ||
309 | dnl declared in <string.h>. Its side effects are the same as those | ||
310 | diff -ru gettext-0.16.1/gettext-tools/gnulib-m4/wcwidth.m4 gettext.patched/gettext-tools/gnulib-m4/wcwidth.m4 | ||
311 | --- gettext-0.16.1/gettext-tools/gnulib-m4/wcwidth.m4 2006-11-27 09:14:55.000000000 -0800 | ||
312 | +++ gettext.patched/gettext-tools/gnulib-m4/wcwidth.m4 2011-03-16 23:51:08.260324221 -0700 | ||
313 | @@ -7,7 +7,7 @@ | ||
314 | AC_DEFUN([gl_FUNC_WCWIDTH], | ||
315 | [ | ||
316 | dnl Persuade glibc <wchar.h> to declare wcwidth(). | ||
317 | - AC_REQUIRE([AC_GNU_SOURCE]) | ||
318 | + dnl AC_REQUIRE([AC_GNU_SOURCE]) | ||
319 | |||
320 | AC_REQUIRE([AC_C_INLINE]) | ||
321 | AC_REQUIRE([gt_TYPE_WCHAR_T]) | ||
322 | diff -ru gettext-0.16.1/gettext-tools/libgettextpo/gnulib-m4/gnulib-comp.m4 gettext.patched/gettext-tools/libgettextpo/gnulib-m4/gnulib-comp.m4 | ||
323 | --- gettext-0.16.1/gettext-tools/libgettextpo/gnulib-m4/gnulib-comp.m4 2006-11-27 09:33:45.000000000 -0800 | ||
324 | +++ gettext.patched/gettext-tools/libgettextpo/gnulib-m4/gnulib-comp.m4 2011-03-16 23:51:02.036061317 -0700 | ||
325 | @@ -25,7 +25,7 @@ | ||
326 | m4_pattern_allow([^gl_LIBOBJS$])dnl a variable | ||
327 | m4_pattern_allow([^gl_LTLIBOBJS$])dnl a variable | ||
328 | AC_REQUIRE([AC_PROG_RANLIB]) | ||
329 | - AC_REQUIRE([AC_GNU_SOURCE]) | ||
330 | + dnl AC_REQUIRE([AC_GNU_SOURCE]) | ||
331 | AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS]) | ||
332 | AC_REQUIRE([gl_LOCK_EARLY]) | ||
333 | ]) | ||
334 | diff -ru gettext-0.16.1/gettext-tools/m4/regex.m4 gettext.patched/gettext-tools/m4/regex.m4 | ||
335 | --- gettext-0.16.1/gettext-tools/m4/regex.m4 2006-11-27 09:02:05.000000000 -0800 | ||
336 | +++ gettext.patched/gettext-tools/m4/regex.m4 2011-03-16 23:50:53.533477195 -0700 | ||
337 | @@ -116,7 +116,7 @@ | ||
338 | dnl to get them. | ||
339 | |||
340 | dnl Persuade glibc <string.h> to declare mempcpy(). | ||
341 | - AC_REQUIRE([AC_GNU_SOURCE]) | ||
342 | + dnl AC_REQUIRE([AC_GNU_SOURCE]) | ||
343 | |||
344 | AC_REQUIRE([AC_C_RESTRICT]) | ||
345 | AC_REQUIRE([AC_FUNC_ALLOCA]) | ||
diff --git a/meta/recipes-core/gettext/gettext-0.16.1/fixchicken.patch b/meta/recipes-core/gettext/gettext-0.16.1/fixchicken.patch new file mode 100644 index 0000000000..ef51056674 --- /dev/null +++ b/meta/recipes-core/gettext/gettext-0.16.1/fixchicken.patch | |||
@@ -0,0 +1,30 @@ | |||
1 | # Pulled from OpenEmbedded | ||
2 | # | ||
3 | # Commented by: Saul Wold <saul.wold@intel.com> | ||
4 | |||
5 | Index: gettext-tools/m4/csharpcomp.m4 | ||
6 | =================================================================== | ||
7 | RCS file: /cvs/gettext/gettext/gettext-tools/m4/csharpcomp.m4,v | ||
8 | retrieving revision 1.4 | ||
9 | retrieving revision 1.6 | ||
10 | diff -u -r1.4 -r1.6 | ||
11 | --- a/gettext-tools/m4/csharpcomp.m4 30 Jan 2004 11:01:18 -0000 1.4 | ||
12 | +++ a/gettext-tools/m4/csharpcomp.m4 26 May 2004 12:15:23 -0000 1.6 | ||
13 | @@ -1,4 +1,4 @@ | ||
14 | -# csharpcomp.m4 serial 2 (gettext-0.14.1) | ||
15 | +# csharpcomp.m4 serial 4 (gettext-0.15) | ||
16 | dnl Copyright (C) 2003-2004 Free Software Foundation, Inc. | ||
17 | dnl This file is free software, distributed under the terms of the GNU | ||
18 | dnl General Public License. As a special exception to the GNU General | ||
19 | @@ -43,7 +43,8 @@ | ||
20 | ;; | ||
21 | sscli) | ||
22 | if test -n "$HAVE_CSC_IN_PATH" \ | ||
23 | - && csc -help >/dev/null 2>/dev/null; then | ||
24 | + && csc -help >/dev/null 2>/dev/null \ | ||
25 | + && { if csc -help 2>/dev/null | grep -i chicken > /dev/null; then false; else true; fi; }; then | ||
26 | HAVE_CSC=1 | ||
27 | ac_result="csc" | ||
28 | break | ||
29 | |||
30 | |||
diff --git a/meta/recipes-core/gettext/gettext-0.16.1/getline.m4.patch b/meta/recipes-core/gettext/gettext-0.16.1/getline.m4.patch new file mode 100644 index 0000000000..f71d0e1d82 --- /dev/null +++ b/meta/recipes-core/gettext/gettext-0.16.1/getline.m4.patch | |||
@@ -0,0 +1,36 @@ | |||
1 | # Pulled from OpenEmbedded | ||
2 | # | ||
3 | # Commented by: Saul Wold <saul.wold@intel.com> | ||
4 | |||
5 | --- /gettext-tools/m4/orig-getline.m4 2003-07-18 18:11:37.000000000 +0300 | ||
6 | +++ /gettext-tools/m4/getline.m4 2007-02-03 13:33:41.000000000 +0200 | ||
7 | @@ -42,12 +42,23 @@ | ||
8 | return 1; | ||
9 | len = getline (&line, &siz, in); | ||
10 | exit ((len == 4 && line && strcmp (line, "foo\n") == 0) ? 0 : 1); | ||
11 | - } | ||
12 | - ], am_cv_func_working_getline=yes dnl The library version works. | ||
13 | - , am_cv_func_working_getline=no dnl The library version does NOT work. | ||
14 | - , am_cv_func_working_getline=no dnl We're cross compiling. | ||
15 | - )]) | ||
16 | - fi | ||
17 | + } | ||
18 | + ], am_cv_func_working_getline=yes dnl The library version works. | ||
19 | + , am_cv_func_working_getline=no dnl The library version does NOT work. | ||
20 | +! , dnl We're cross compiling. Assume ir works on glibc2 systems. | ||
21 | +! [AC_EGREP_CPP([Lucky GNU user], | ||
22 | +! [ | ||
23 | +! #include <features.h> | ||
24 | +! #ifdef __GNU_LIBRARY__ | ||
25 | +! #if (__GLIBC__ >= 2) | ||
26 | +! Lucky GNU user | ||
27 | +! #endif | ||
28 | +! #endif | ||
29 | +! ], | ||
30 | +! [am_cv_func_working_getline=yes], | ||
31 | +! [am_cv_func_working_getline=no])] | ||
32 | + )]) | ||
33 | + fi | ||
34 | |||
35 | if test $am_cv_func_working_getline = no; then | ||
36 | dnl We must choose a different name for our function, since on ELF systems | ||
diff --git a/meta/recipes-core/gettext/gettext-0.16.1/gettext-autoconf-lib-link-no-L.patch b/meta/recipes-core/gettext/gettext-0.16.1/gettext-autoconf-lib-link-no-L.patch new file mode 100644 index 0000000000..e8bb2f6a38 --- /dev/null +++ b/meta/recipes-core/gettext/gettext-0.16.1/gettext-autoconf-lib-link-no-L.patch | |||
@@ -0,0 +1,16 @@ | |||
1 | # Pulled from OpenEmbedded | ||
2 | # | ||
3 | # Commented by: Saul Wold <saul.wold@intel.com> | ||
4 | |||
5 | --- gettext-0.17/autoconf-lib-link/m4/lib-link.m4~ 2009-04-17 15:12:30.000000000 -0700 | ||
6 | +++ gettext-0.17/autoconf-lib-link/m4/lib-link.m4 2009-04-17 15:37:39.000000000 -0700 | ||
7 | @@ -267,6 +267,9 @@ | ||
8 | fi | ||
9 | fi | ||
10 | fi | ||
11 | + dnl Just let the compiler find the library, the compiler and user are smarter then this script | ||
12 | + dnl when cross compiling and working with a relocated install. | ||
13 | + found_dir="" | ||
14 | if test "X$found_dir" = "X"; then | ||
15 | for x in $LDFLAGS $LTLIB[]NAME; do | ||
16 | AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) | ||
diff --git a/meta/recipes-core/gettext/gettext-0.16.1/gettext-error_print_progname.patch b/meta/recipes-core/gettext/gettext-0.16.1/gettext-error_print_progname.patch new file mode 100644 index 0000000000..96a2196a68 --- /dev/null +++ b/meta/recipes-core/gettext/gettext-0.16.1/gettext-error_print_progname.patch | |||
@@ -0,0 +1,16 @@ | |||
1 | # Pulled from OpenEmbedded | ||
2 | # | ||
3 | # Commented by: Saul Wold <saul.wold@intel.com> | ||
4 | |||
5 | diff -ur gettext-0.14.6/gettext-tools/lib/error.h gettext-0.14.6-patched/gettext-tools/lib/error.h | ||
6 | --- gettext-0.14.6/gettext-tools/lib/error.h 2005-05-20 16:03:42.000000000 -0500 | ||
7 | +++ gettext-0.14.6-patched/gettext-tools/lib/error.h 2007-01-13 20:57:24.422168053 -0600 | ||
8 | @@ -50,7 +50,7 @@ | ||
9 | /* If NULL, error will flush stdout, then print on stderr the program | ||
10 | name, a colon and a space. Otherwise, error will call this | ||
11 | function without parameters instead. */ | ||
12 | -extern DLL_VARIABLE void (*error_print_progname) (void); | ||
13 | +void (*error_print_progname) (void); | ||
14 | |||
15 | /* This variable is incremented each time `error' is called. */ | ||
16 | extern DLL_VARIABLE unsigned int error_message_count; | ||
diff --git a/meta/recipes-core/gettext/gettext-0.16.1/gettext-vpath.patch b/meta/recipes-core/gettext/gettext-0.16.1/gettext-vpath.patch new file mode 100644 index 0000000000..62420b7e44 --- /dev/null +++ b/meta/recipes-core/gettext/gettext-0.16.1/gettext-vpath.patch | |||
@@ -0,0 +1,17 @@ | |||
1 | # Pulled from OpenEmbedded | ||
2 | # | ||
3 | # Commented by: Saul Wold <saul.wold@intel.com> | ||
4 | |||
5 | Index: gettext-0.16.1/gettext-runtime/intl/Makefile.in | ||
6 | =================================================================== | ||
7 | --- gettext-0.16.1.orig/gettext-runtime/intl/Makefile.in 2006-11-27 09:02:00.000000000 -0800 | ||
8 | +++ gettext-0.16.1/gettext-runtime/intl/Makefile.in 2011-03-16 16:04:49.175419930 -0700 | ||
9 | @@ -35,7 +35,7 @@ | ||
10 | # 'make' does the wrong thing if GNU gettext was configured with | ||
11 | # "./configure --srcdir=`pwd`", namely it gets confused by the .lo and .la | ||
12 | # files it finds in srcdir = ../../gettext-runtime/intl. | ||
13 | -VPATH = $(srcdir) | ||
14 | +#VPATH = $(srcdir) | ||
15 | |||
16 | prefix = @prefix@ | ||
17 | exec_prefix = @exec_prefix@ | ||
diff --git a/meta/recipes-core/gettext/gettext-0.16.1/hardcode_macro_version.patch b/meta/recipes-core/gettext/gettext-0.16.1/hardcode_macro_version.patch new file mode 100644 index 0000000000..ef57dc254a --- /dev/null +++ b/meta/recipes-core/gettext/gettext-0.16.1/hardcode_macro_version.patch | |||
@@ -0,0 +1,48 @@ | |||
1 | This patch hardcodes in version 0.17 for the GETTEXT_MACRO_VERSION, | ||
2 | the version check is only part of 0.17 and will not affect any 0.16.1 | ||
3 | operations | ||
4 | |||
5 | Signed-off-by: Saul Wold <sgw@linux.intel.com> | ||
6 | |||
7 | Index: gettext-0.16.1/gettext-runtime/m4/po.m4 | ||
8 | =================================================================== | ||
9 | --- gettext-0.16.1.orig/gettext-runtime/m4/po.m4 2011-03-17 02:24:28.953520231 -0700 | ||
10 | +++ gettext-0.16.1/gettext-runtime/m4/po.m4 2011-03-17 02:28:25.455396862 -0700 | ||
11 | @@ -27,6 +27,9 @@ | ||
12 | AC_REQUIRE([AM_PROG_MKDIR_P])dnl defined by automake | ||
13 | AC_REQUIRE([AM_NLS])dnl | ||
14 | |||
15 | + dnl Hardcode the MACRO_VERSION to 0.17 for gnutls | ||
16 | + AC_SUBST([GETTEXT_MACRO_VERSION], [0.17]) | ||
17 | + | ||
18 | dnl Perform the following tests also if --disable-nls has been given, | ||
19 | dnl because they are needed for "make dist" to work. | ||
20 | |||
21 | Index: gettext-0.16.1/gettext-runtime/po/Makefile.in.in | ||
22 | =================================================================== | ||
23 | --- gettext-0.16.1.orig/gettext-runtime/po/Makefile.in.in 2011-03-17 02:24:28.953520231 -0700 | ||
24 | +++ gettext-0.16.1/gettext-runtime/po/Makefile.in.in 2011-03-17 02:28:07.574395144 -0700 | ||
25 | @@ -10,6 +10,9 @@ | ||
26 | # | ||
27 | # Origin: gettext-0.16 | ||
28 | |||
29 | +# Hardcode this value for gnutls building against gplv2 code | ||
30 | +GETTEXT_MACRO_VERSION = 0.17 | ||
31 | + | ||
32 | PACKAGE = @PACKAGE@ | ||
33 | VERSION = @VERSION@ | ||
34 | PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ | ||
35 | Index: gettext-0.16.1/gettext-tools/po/Makefile.in.in | ||
36 | =================================================================== | ||
37 | --- gettext-0.16.1.orig/gettext-tools/po/Makefile.in.in 2011-03-17 02:24:28.953520231 -0700 | ||
38 | +++ gettext-0.16.1/gettext-tools/po/Makefile.in.in 2011-03-17 02:28:07.574395144 -0700 | ||
39 | @@ -10,6 +10,9 @@ | ||
40 | # | ||
41 | # Origin: gettext-0.16 | ||
42 | |||
43 | +# Hardcode this value for gnutls building against gplv2 code | ||
44 | +GETTEXT_MACRO_VERSION = 0.17 | ||
45 | + | ||
46 | PACKAGE = @PACKAGE@ | ||
47 | VERSION = @VERSION@ | ||
48 | PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ | ||
diff --git a/meta/recipes-core/gettext/gettext-0.16.1/linklib_from_0.17.patch b/meta/recipes-core/gettext/gettext-0.16.1/linklib_from_0.17.patch new file mode 100644 index 0000000000..2b805c9d8b --- /dev/null +++ b/meta/recipes-core/gettext/gettext-0.16.1/linklib_from_0.17.patch | |||
@@ -0,0 +1,717 @@ | |||
1 | # Pulled from OpenEmbedded | ||
2 | # | ||
3 | # Commented by: Saul Wold <saul.wold@intel.com> | ||
4 | |||
5 | Index: gettext-0.16.1/autoconf-lib-link/m4/lib-link.m4 | ||
6 | =================================================================== | ||
7 | --- gettext-0.16.1.orig/autoconf-lib-link/m4/lib-link.m4 2006-11-27 09:01:58.000000000 -0800 | ||
8 | +++ gettext-0.16.1/autoconf-lib-link/m4/lib-link.m4 2011-03-17 00:36:08.710836720 -0700 | ||
9 | @@ -6,12 +6,14 @@ | ||
10 | |||
11 | dnl From Bruno Haible. | ||
12 | |||
13 | -AC_PREREQ(2.50) | ||
14 | +AC_PREREQ(2.54) | ||
15 | |||
16 | dnl AC_LIB_LINKFLAGS(name [, dependencies]) searches for libname and | ||
17 | dnl the libraries corresponding to explicit and implicit dependencies. | ||
18 | dnl Sets and AC_SUBSTs the LIB${NAME} and LTLIB${NAME} variables and | ||
19 | dnl augments the CPPFLAGS variable. | ||
20 | +dnl Sets and AC_SUBSTs the LIB${NAME}_PREFIX variable to nonempty if libname | ||
21 | +dnl was found in ${LIB${NAME}_PREFIX}/$acl_libdirstem. | ||
22 | AC_DEFUN([AC_LIB_LINKFLAGS], | ||
23 | [ | ||
24 | AC_REQUIRE([AC_LIB_PREPARE_PREFIX]) | ||
25 | @@ -24,13 +26,16 @@ | ||
26 | ac_cv_lib[]Name[]_libs="$LIB[]NAME" | ||
27 | ac_cv_lib[]Name[]_ltlibs="$LTLIB[]NAME" | ||
28 | ac_cv_lib[]Name[]_cppflags="$INC[]NAME" | ||
29 | + ac_cv_lib[]Name[]_prefix="$LIB[]NAME[]_PREFIX" | ||
30 | ]) | ||
31 | LIB[]NAME="$ac_cv_lib[]Name[]_libs" | ||
32 | LTLIB[]NAME="$ac_cv_lib[]Name[]_ltlibs" | ||
33 | INC[]NAME="$ac_cv_lib[]Name[]_cppflags" | ||
34 | + LIB[]NAME[]_PREFIX="$ac_cv_lib[]Name[]_prefix" | ||
35 | AC_LIB_APPENDTOVAR([CPPFLAGS], [$INC]NAME) | ||
36 | AC_SUBST([LIB]NAME) | ||
37 | AC_SUBST([LTLIB]NAME) | ||
38 | + AC_SUBST([LIB]NAME[_PREFIX]) | ||
39 | dnl Also set HAVE_LIB[]NAME so that AC_LIB_HAVE_LINKFLAGS can reuse the | ||
40 | dnl results of this search when this library appears as a dependency. | ||
41 | HAVE_LIB[]NAME=yes | ||
42 | @@ -46,6 +51,8 @@ | ||
43 | dnl LTLIB${NAME} variables and augments the CPPFLAGS variable, and | ||
44 | dnl #defines HAVE_LIB${NAME} to 1. Otherwise, it sets and AC_SUBSTs | ||
45 | dnl HAVE_LIB${NAME}=no and LIB${NAME} and LTLIB${NAME} to empty. | ||
46 | +dnl Sets and AC_SUBSTs the LIB${NAME}_PREFIX variable to nonempty if libname | ||
47 | +dnl was found in ${LIB${NAME}_PREFIX}/$acl_libdirstem. | ||
48 | AC_DEFUN([AC_LIB_HAVE_LINKFLAGS], | ||
49 | [ | ||
50 | AC_REQUIRE([AC_LIB_PREPARE_PREFIX]) | ||
51 | @@ -82,17 +89,24 @@ | ||
52 | CPPFLAGS="$ac_save_CPPFLAGS" | ||
53 | LIB[]NAME= | ||
54 | LTLIB[]NAME= | ||
55 | + LIB[]NAME[]_PREFIX= | ||
56 | + | ||
57 | fi | ||
58 | AC_SUBST([HAVE_LIB]NAME) | ||
59 | AC_SUBST([LIB]NAME) | ||
60 | AC_SUBST([LTLIB]NAME) | ||
61 | + AC_SUBST([LIB]NAME[_PREFIX]) | ||
62 | undefine([Name]) | ||
63 | undefine([NAME]) | ||
64 | ]) | ||
65 | |||
66 | dnl Determine the platform dependent parameters needed to use rpath: | ||
67 | -dnl libext, shlibext, hardcode_libdir_flag_spec, hardcode_libdir_separator, | ||
68 | -dnl hardcode_direct, hardcode_minus_L. | ||
69 | +dnl acl_libext, | ||
70 | +dnl acl_shlibext, | ||
71 | +dnl acl_hardcode_libdir_flag_spec, | ||
72 | +dnl acl_hardcode_libdir_separator, | ||
73 | +dnl acl_hardcode_direct, | ||
74 | +dnl acl_hardcode_minus_L. | ||
75 | AC_DEFUN([AC_LIB_RPATH], | ||
76 | [ | ||
77 | dnl Tell automake >= 1.10 to complain if config.rpath is missing. | ||
78 | @@ -109,12 +123,14 @@ | ||
79 | acl_cv_rpath=done | ||
80 | ]) | ||
81 | wl="$acl_cv_wl" | ||
82 | - libext="$acl_cv_libext" | ||
83 | - shlibext="$acl_cv_shlibext" | ||
84 | - hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec" | ||
85 | - hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator" | ||
86 | - hardcode_direct="$acl_cv_hardcode_direct" | ||
87 | - hardcode_minus_L="$acl_cv_hardcode_minus_L" | ||
88 | + acl_libext="$acl_cv_libext" | ||
89 | + acl_shlibext="$acl_cv_shlibext" | ||
90 | + acl_libname_spec="$acl_cv_libname_spec" | ||
91 | + acl_library_names_spec="$acl_cv_library_names_spec" | ||
92 | + acl_hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec" | ||
93 | + acl_hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator" | ||
94 | + acl_hardcode_direct="$acl_cv_hardcode_direct" | ||
95 | + acl_hardcode_minus_L="$acl_cv_hardcode_minus_L" | ||
96 | dnl Determine whether the user wants rpath handling at all. | ||
97 | AC_ARG_ENABLE(rpath, | ||
98 | [ --disable-rpath do not hardcode runtime library paths], | ||
99 | @@ -124,20 +140,24 @@ | ||
100 | dnl AC_LIB_LINKFLAGS_BODY(name [, dependencies]) searches for libname and | ||
101 | dnl the libraries corresponding to explicit and implicit dependencies. | ||
102 | dnl Sets the LIB${NAME}, LTLIB${NAME} and INC${NAME} variables. | ||
103 | +dnl Also, sets the LIB${NAME}_PREFIX variable to nonempty if libname was found | ||
104 | +dnl in ${LIB${NAME}_PREFIX}/$acl_libdirstem. | ||
105 | AC_DEFUN([AC_LIB_LINKFLAGS_BODY], | ||
106 | [ | ||
107 | AC_REQUIRE([AC_LIB_PREPARE_MULTILIB]) | ||
108 | define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-], | ||
109 | [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])]) | ||
110 | + dnl Autoconf >= 2.61 supports dots in --with options. | ||
111 | + define([N_A_M_E],[m4_if(m4_version_compare(m4_defn([m4_PACKAGE_VERSION]),[2.61]),[-1],[translit([$1],[.],[_])],[$1])]) | ||
112 | dnl By default, look in $includedir and $libdir. | ||
113 | use_additional=yes | ||
114 | AC_LIB_WITH_FINAL_PREFIX([ | ||
115 | eval additional_includedir=\"$includedir\" | ||
116 | eval additional_libdir=\"$libdir\" | ||
117 | ]) | ||
118 | - AC_LIB_ARG_WITH([lib$1-prefix], | ||
119 | -[ --with-lib$1-prefix[=DIR] search for lib$1 in DIR/include and DIR/lib | ||
120 | - --without-lib$1-prefix don't search for lib$1 in includedir and libdir], | ||
121 | + AC_LIB_ARG_WITH([lib]N_A_M_E[-prefix], | ||
122 | +[ --with-lib]N_A_M_E[-prefix[=DIR] search for lib$1 in DIR/include and DIR/lib | ||
123 | + --without-lib]N_A_M_E[-prefix don't search for lib$1 in includedir and libdir], | ||
124 | [ | ||
125 | if test "X$withval" = "Xno"; then | ||
126 | use_additional=no | ||
127 | @@ -158,6 +178,7 @@ | ||
128 | LIB[]NAME= | ||
129 | LTLIB[]NAME= | ||
130 | INC[]NAME= | ||
131 | + LIB[]NAME[]_PREFIX= | ||
132 | rpathdirs= | ||
133 | ltrpathdirs= | ||
134 | names_already_handled= | ||
135 | @@ -197,27 +218,53 @@ | ||
136 | found_la= | ||
137 | found_so= | ||
138 | found_a= | ||
139 | + eval libname=\"$acl_libname_spec\" # typically: libname=lib$name | ||
140 | + if test -n "$acl_shlibext"; then | ||
141 | + shrext=".$acl_shlibext" # typically: shrext=.so | ||
142 | + else | ||
143 | + shrext= | ||
144 | + fi | ||
145 | if test $use_additional = yes; then | ||
146 | - if test -n "$shlibext" \ | ||
147 | - && { test -f "$additional_libdir/lib$name.$shlibext" \ | ||
148 | - || { test "$shlibext" = dll \ | ||
149 | - && test -f "$additional_libdir/lib$name.dll.a"; }; }; then | ||
150 | - found_dir="$additional_libdir" | ||
151 | - if test -f "$additional_libdir/lib$name.$shlibext"; then | ||
152 | - found_so="$additional_libdir/lib$name.$shlibext" | ||
153 | + dir="$additional_libdir" | ||
154 | + dnl The same code as in the loop below: | ||
155 | + dnl First look for a shared library. | ||
156 | + if test -n "$acl_shlibext"; then | ||
157 | + if test -f "$dir/$libname$shrext"; then | ||
158 | + found_dir="$dir" | ||
159 | + found_so="$dir/$libname$shrext" | ||
160 | else | ||
161 | - found_so="$additional_libdir/lib$name.dll.a" | ||
162 | + if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then | ||
163 | + ver=`(cd "$dir" && \ | ||
164 | + for f in "$libname$shrext".*; do echo "$f"; done \ | ||
165 | + | sed -e "s,^$libname$shrext\\\\.,," \ | ||
166 | + | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \ | ||
167 | + | sed 1q ) 2>/dev/null` | ||
168 | + if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then | ||
169 | + found_dir="$dir" | ||
170 | + found_so="$dir/$libname$shrext.$ver" | ||
171 | + fi | ||
172 | + else | ||
173 | + eval library_names=\"$acl_library_names_spec\" | ||
174 | + for f in $library_names; do | ||
175 | + if test -f "$dir/$f"; then | ||
176 | + found_dir="$dir" | ||
177 | + found_so="$dir/$f" | ||
178 | + break | ||
179 | + fi | ||
180 | + done | ||
181 | + fi | ||
182 | fi | ||
183 | - if test -f "$additional_libdir/lib$name.la"; then | ||
184 | - found_la="$additional_libdir/lib$name.la" | ||
185 | + fi | ||
186 | + dnl Then look for a static library. | ||
187 | + if test "X$found_dir" = "X"; then | ||
188 | + if test -f "$dir/$libname.$acl_libext"; then | ||
189 | + found_dir="$dir" | ||
190 | + found_a="$dir/$libname.$acl_libext" | ||
191 | fi | ||
192 | - else | ||
193 | - if test -f "$additional_libdir/lib$name.$libext"; then | ||
194 | - found_dir="$additional_libdir" | ||
195 | - found_a="$additional_libdir/lib$name.$libext" | ||
196 | - if test -f "$additional_libdir/lib$name.la"; then | ||
197 | - found_la="$additional_libdir/lib$name.la" | ||
198 | - fi | ||
199 | + fi | ||
200 | + if test "X$found_dir" != "X"; then | ||
201 | + if test -f "$dir/$libname.la"; then | ||
202 | + found_la="$dir/$libname.la" | ||
203 | fi | ||
204 | fi | ||
205 | fi | ||
206 | @@ -227,26 +274,44 @@ | ||
207 | case "$x" in | ||
208 | -L*) | ||
209 | dir=`echo "X$x" | sed -e 's/^X-L//'` | ||
210 | - if test -n "$shlibext" \ | ||
211 | - && { test -f "$dir/lib$name.$shlibext" \ | ||
212 | - || { test "$shlibext" = dll \ | ||
213 | - && test -f "$dir/lib$name.dll.a"; }; }; then | ||
214 | - found_dir="$dir" | ||
215 | - if test -f "$dir/lib$name.$shlibext"; then | ||
216 | - found_so="$dir/lib$name.$shlibext" | ||
217 | + dnl First look for a shared library. | ||
218 | + if test -n "$acl_shlibext"; then | ||
219 | + if test -f "$dir/$libname$shrext"; then | ||
220 | + found_dir="$dir" | ||
221 | + found_so="$dir/$libname$shrext" | ||
222 | else | ||
223 | - found_so="$dir/lib$name.dll.a" | ||
224 | - fi | ||
225 | - if test -f "$dir/lib$name.la"; then | ||
226 | - found_la="$dir/lib$name.la" | ||
227 | + if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then | ||
228 | + ver=`(cd "$dir" && \ | ||
229 | + for f in "$libname$shrext".*; do echo "$f"; done \ | ||
230 | + | sed -e "s,^$libname$shrext\\\\.,," \ | ||
231 | + | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \ | ||
232 | + | sed 1q ) 2>/dev/null` | ||
233 | + if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then | ||
234 | + found_dir="$dir" | ||
235 | + found_so="$dir/$libname$shrext.$ver" | ||
236 | + fi | ||
237 | + else | ||
238 | + eval library_names=\"$acl_library_names_spec\" | ||
239 | + for f in $library_names; do | ||
240 | + if test -f "$dir/$f"; then | ||
241 | + found_dir="$dir" | ||
242 | + found_so="$dir/$f" | ||
243 | + break | ||
244 | + fi | ||
245 | + done | ||
246 | + fi | ||
247 | fi | ||
248 | - else | ||
249 | - if test -f "$dir/lib$name.$libext"; then | ||
250 | + fi | ||
251 | + dnl Then look for a static library. | ||
252 | + if test "X$found_dir" = "X"; then | ||
253 | + if test -f "$dir/$libname.$acl_libext"; then | ||
254 | found_dir="$dir" | ||
255 | - found_a="$dir/lib$name.$libext" | ||
256 | - if test -f "$dir/lib$name.la"; then | ||
257 | - found_la="$dir/lib$name.la" | ||
258 | - fi | ||
259 | + found_a="$dir/$libname.$acl_libext" | ||
260 | + fi | ||
261 | + fi | ||
262 | + if test "X$found_dir" != "X"; then | ||
263 | + if test -f "$dir/$libname.la"; then | ||
264 | + found_la="$dir/$libname.la" | ||
265 | fi | ||
266 | fi | ||
267 | ;; | ||
268 | @@ -282,12 +347,12 @@ | ||
269 | ltrpathdirs="$ltrpathdirs $found_dir" | ||
270 | fi | ||
271 | dnl The hardcoding into $LIBNAME is system dependent. | ||
272 | - if test "$hardcode_direct" = yes; then | ||
273 | + if test "$acl_hardcode_direct" = yes; then | ||
274 | dnl Using DIR/libNAME.so during linking hardcodes DIR into the | ||
275 | dnl resulting binary. | ||
276 | LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so" | ||
277 | else | ||
278 | - if test -n "$hardcode_libdir_flag_spec" && test "$hardcode_minus_L" = no; then | ||
279 | + if test -n "$acl_hardcode_libdir_flag_spec" && test "$acl_hardcode_minus_L" = no; then | ||
280 | dnl Use an explicit option to hardcode DIR into the resulting | ||
281 | dnl binary. | ||
282 | LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so" | ||
283 | @@ -318,13 +383,13 @@ | ||
284 | if test -z "$haveit"; then | ||
285 | LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir" | ||
286 | fi | ||
287 | - if test "$hardcode_minus_L" != no; then | ||
288 | + if test "$acl_hardcode_minus_L" != no; then | ||
289 | dnl FIXME: Not sure whether we should use | ||
290 | dnl "-L$found_dir -l$name" or "-L$found_dir $found_so" | ||
291 | dnl here. | ||
292 | LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so" | ||
293 | else | ||
294 | - dnl We cannot use $hardcode_runpath_var and LD_RUN_PATH | ||
295 | + dnl We cannot use $acl_hardcode_runpath_var and LD_RUN_PATH | ||
296 | dnl here, because this doesn't fit in flags passed to the | ||
297 | dnl compiler. So give up. No hardcoding. This affects only | ||
298 | dnl very old systems. | ||
299 | @@ -512,18 +577,18 @@ | ||
300 | done | ||
301 | done | ||
302 | if test "X$rpathdirs" != "X"; then | ||
303 | - if test -n "$hardcode_libdir_separator"; then | ||
304 | + if test -n "$acl_hardcode_libdir_separator"; then | ||
305 | dnl Weird platform: only the last -rpath option counts, the user must | ||
306 | dnl pass all path elements in one option. We can arrange that for a | ||
307 | dnl single library, but not when more than one $LIBNAMEs are used. | ||
308 | alldirs= | ||
309 | for found_dir in $rpathdirs; do | ||
310 | - alldirs="${alldirs}${alldirs:+$hardcode_libdir_separator}$found_dir" | ||
311 | + alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$found_dir" | ||
312 | done | ||
313 | - dnl Note: hardcode_libdir_flag_spec uses $libdir and $wl. | ||
314 | + dnl Note: acl_hardcode_libdir_flag_spec uses $libdir and $wl. | ||
315 | acl_save_libdir="$libdir" | ||
316 | libdir="$alldirs" | ||
317 | - eval flag=\"$hardcode_libdir_flag_spec\" | ||
318 | + eval flag=\"$acl_hardcode_libdir_flag_spec\" | ||
319 | libdir="$acl_save_libdir" | ||
320 | LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag" | ||
321 | else | ||
322 | @@ -531,7 +596,7 @@ | ||
323 | for found_dir in $rpathdirs; do | ||
324 | acl_save_libdir="$libdir" | ||
325 | libdir="$found_dir" | ||
326 | - eval flag=\"$hardcode_libdir_flag_spec\" | ||
327 | + eval flag=\"$acl_hardcode_libdir_flag_spec\" | ||
328 | libdir="$acl_save_libdir" | ||
329 | LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag" | ||
330 | done | ||
331 | @@ -642,3 +707,79 @@ | ||
332 | fi | ||
333 | AC_SUBST([$1]) | ||
334 | ]) | ||
335 | + | ||
336 | +dnl For those cases where a variable contains several -L and -l options | ||
337 | +dnl referring to unknown libraries and directories, this macro determines the | ||
338 | +dnl necessary additional linker options for the runtime path. | ||
339 | +dnl AC_LIB_LINKFLAGS_FROM_LIBS([LDADDVAR], [LIBSVALUE], [USE-LIBTOOL]) | ||
340 | +dnl sets LDADDVAR to linker options needed together with LIBSVALUE. | ||
341 | +dnl If USE-LIBTOOL evaluates to non-empty, linking with libtool is assumed, | ||
342 | +dnl otherwise linking without libtool is assumed. | ||
343 | +AC_DEFUN([AC_LIB_LINKFLAGS_FROM_LIBS], | ||
344 | +[ | ||
345 | + AC_REQUIRE([AC_LIB_RPATH]) | ||
346 | + AC_REQUIRE([AC_LIB_PREPARE_MULTILIB]) | ||
347 | + $1= | ||
348 | + if test "$enable_rpath" != no; then | ||
349 | + if test -n "$acl_hardcode_libdir_flag_spec" && test "$acl_hardcode_minus_L" = no; then | ||
350 | + dnl Use an explicit option to hardcode directories into the resulting | ||
351 | + dnl binary. | ||
352 | + rpathdirs= | ||
353 | + next= | ||
354 | + for opt in $2; do | ||
355 | + if test -n "$next"; then | ||
356 | + dir="$next" | ||
357 | + dnl No need to hardcode the standard /usr/lib. | ||
358 | + if test "X$dir" != "X/usr/$acl_libdirstem"; then | ||
359 | + rpathdirs="$rpathdirs $dir" | ||
360 | + fi | ||
361 | + next= | ||
362 | + else | ||
363 | + case $opt in | ||
364 | + -L) next=yes ;; | ||
365 | + -L*) dir=`echo "X$opt" | sed -e 's,^X-L,,'` | ||
366 | + dnl No need to hardcode the standard /usr/lib. | ||
367 | + if test "X$dir" != "X/usr/$acl_libdirstem"; then | ||
368 | + rpathdirs="$rpathdirs $dir" | ||
369 | + fi | ||
370 | + next= ;; | ||
371 | + *) next= ;; | ||
372 | + esac | ||
373 | + fi | ||
374 | + done | ||
375 | + if test "X$rpathdirs" != "X"; then | ||
376 | + if test -n ""$3""; then | ||
377 | + dnl libtool is used for linking. Use -R options. | ||
378 | + for dir in $rpathdirs; do | ||
379 | + $1="${$1}${$1:+ }-R$dir" | ||
380 | + done | ||
381 | + else | ||
382 | + dnl The linker is used for linking directly. | ||
383 | + if test -n "$acl_hardcode_libdir_separator"; then | ||
384 | + dnl Weird platform: only the last -rpath option counts, the user | ||
385 | + dnl must pass all path elements in one option. | ||
386 | + alldirs= | ||
387 | + for dir in $rpathdirs; do | ||
388 | + alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$dir" | ||
389 | + done | ||
390 | + acl_save_libdir="$libdir" | ||
391 | + libdir="$alldirs" | ||
392 | + eval flag=\"$acl_hardcode_libdir_flag_spec\" | ||
393 | + libdir="$acl_save_libdir" | ||
394 | + $1="$flag" | ||
395 | + else | ||
396 | + dnl The -rpath options are cumulative. | ||
397 | + for dir in $rpathdirs; do | ||
398 | + acl_save_libdir="$libdir" | ||
399 | + libdir="$dir" | ||
400 | + eval flag=\"$acl_hardcode_libdir_flag_spec\" | ||
401 | + libdir="$acl_save_libdir" | ||
402 | + $1="${$1}${$1:+ }$flag" | ||
403 | + done | ||
404 | + fi | ||
405 | + fi | ||
406 | + fi | ||
407 | + fi | ||
408 | + fi | ||
409 | + AC_SUBST([$1]) | ||
410 | +]) | ||
411 | Index: gettext-0.16.1/autoconf-lib-link/config.rpath | ||
412 | =================================================================== | ||
413 | --- gettext-0.16.1.orig/autoconf-lib-link/config.rpath 2006-11-27 09:01:58.000000000 -0800 | ||
414 | +++ gettext-0.16.1/autoconf-lib-link/config.rpath 2011-03-17 00:33:23.336539490 -0700 | ||
415 | @@ -2,7 +2,7 @@ | ||
416 | # Output a system dependent set of variables, describing how to set the | ||
417 | # run time search path of shared libraries in an executable. | ||
418 | # | ||
419 | -# Copyright 1996-2006 Free Software Foundation, Inc. | ||
420 | +# Copyright 1996-2007 Free Software Foundation, Inc. | ||
421 | # Taken from GNU libtool, 2001 | ||
422 | # Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996 | ||
423 | # | ||
424 | @@ -47,6 +47,18 @@ | ||
425 | done | ||
426 | cc_basename=`echo "$cc_temp" | sed -e 's%^.*/%%'` | ||
427 | |||
428 | +# Code taken from libtool.m4's _LT_CC_BASENAME. | ||
429 | + | ||
430 | +for cc_temp in $CC""; do | ||
431 | + case $cc_temp in | ||
432 | + compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; | ||
433 | + distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; | ||
434 | + \-*) ;; | ||
435 | + *) break;; | ||
436 | + esac | ||
437 | +done | ||
438 | +cc_basename=`echo "$cc_temp" | sed -e 's%^.*/%%'` | ||
439 | + | ||
440 | # Code taken from libtool.m4's AC_LIBTOOL_PROG_COMPILER_PIC. | ||
441 | |||
442 | wl= | ||
443 | @@ -64,7 +76,14 @@ | ||
444 | ;; | ||
445 | esac | ||
446 | ;; | ||
447 | - mingw* | pw32* | os2*) | ||
448 | + darwin*) | ||
449 | + case $cc_basename in | ||
450 | + xlc*) | ||
451 | + wl='-Wl,' | ||
452 | + ;; | ||
453 | + esac | ||
454 | + ;; | ||
455 | + mingw* | cygwin* | pw32* | os2*) | ||
456 | ;; | ||
457 | hpux9* | hpux10* | hpux11*) | ||
458 | wl='-Wl,' | ||
459 | @@ -74,7 +93,7 @@ | ||
460 | ;; | ||
461 | newsos6) | ||
462 | ;; | ||
463 | - linux*) | ||
464 | + linux* | k*bsd*-gnu) | ||
465 | case $cc_basename in | ||
466 | icc* | ecc*) | ||
467 | wl='-Wl,' | ||
468 | @@ -100,7 +119,7 @@ | ||
469 | osf3* | osf4* | osf5*) | ||
470 | wl='-Wl,' | ||
471 | ;; | ||
472 | - sco3.2v5*) | ||
473 | + rdos*) | ||
474 | ;; | ||
475 | solaris*) | ||
476 | wl='-Wl,' | ||
477 | @@ -108,11 +127,14 @@ | ||
478 | sunos4*) | ||
479 | wl='-Qoption ld ' | ||
480 | ;; | ||
481 | - sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) | ||
482 | + sysv4 | sysv4.2uw2* | sysv4.3*) | ||
483 | wl='-Wl,' | ||
484 | ;; | ||
485 | sysv4*MP*) | ||
486 | ;; | ||
487 | + sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) | ||
488 | + wl='-Wl,' | ||
489 | + ;; | ||
490 | unicos*) | ||
491 | wl='-Wl,' | ||
492 | ;; | ||
493 | @@ -141,6 +163,10 @@ | ||
494 | # we just hope/assume this is gcc and not c89 (= MSVC++) | ||
495 | with_gnu_ld=yes | ||
496 | ;; | ||
497 | + interix*) | ||
498 | + # we just hope/assume this is gcc and not c89 (= MSVC++) | ||
499 | + with_gnu_ld=yes | ||
500 | + ;; | ||
501 | openbsd*) | ||
502 | with_gnu_ld=no | ||
503 | ;; | ||
504 | @@ -189,11 +215,11 @@ | ||
505 | ld_shlibs=no | ||
506 | fi | ||
507 | ;; | ||
508 | - interix3*) | ||
509 | + interix[3-9]*) | ||
510 | hardcode_direct=no | ||
511 | hardcode_libdir_flag_spec='${wl}-rpath,$libdir' | ||
512 | ;; | ||
513 | - linux*) | ||
514 | + gnu* | linux* | k*bsd*-gnu) | ||
515 | if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then | ||
516 | : | ||
517 | else | ||
518 | @@ -280,7 +306,7 @@ | ||
519 | strings "$collect2name" | grep resolve_lib_name >/dev/null | ||
520 | then | ||
521 | # We have reworked collect2 | ||
522 | - hardcode_direct=yes | ||
523 | + : | ||
524 | else | ||
525 | # We have old collect2 | ||
526 | hardcode_direct=unsupported | ||
527 | @@ -359,7 +385,7 @@ | ||
528 | hardcode_direct=yes | ||
529 | hardcode_minus_L=yes | ||
530 | ;; | ||
531 | - freebsd* | kfreebsd*-gnu | dragonfly*) | ||
532 | + freebsd* | dragonfly*) | ||
533 | hardcode_libdir_flag_spec='-R$libdir' | ||
534 | hardcode_direct=yes | ||
535 | ;; | ||
536 | @@ -412,18 +438,22 @@ | ||
537 | hardcode_libdir_separator=: | ||
538 | ;; | ||
539 | openbsd*) | ||
540 | - hardcode_direct=yes | ||
541 | - if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then | ||
542 | - hardcode_libdir_flag_spec='${wl}-rpath,$libdir' | ||
543 | + if test -f /usr/libexec/ld.so; then | ||
544 | + hardcode_direct=yes | ||
545 | + if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then | ||
546 | + hardcode_libdir_flag_spec='${wl}-rpath,$libdir' | ||
547 | + else | ||
548 | + case "$host_os" in | ||
549 | + openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*) | ||
550 | + hardcode_libdir_flag_spec='-R$libdir' | ||
551 | + ;; | ||
552 | + *) | ||
553 | + hardcode_libdir_flag_spec='${wl}-rpath,$libdir' | ||
554 | + ;; | ||
555 | + esac | ||
556 | + fi | ||
557 | else | ||
558 | - case "$host_os" in | ||
559 | - openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*) | ||
560 | - hardcode_libdir_flag_spec='-R$libdir' | ||
561 | - ;; | ||
562 | - *) | ||
563 | - hardcode_libdir_flag_spec='${wl}-rpath,$libdir' | ||
564 | - ;; | ||
565 | - esac | ||
566 | + ld_shlibs=no | ||
567 | fi | ||
568 | ;; | ||
569 | os2*) | ||
570 | @@ -471,7 +501,7 @@ | ||
571 | ld_shlibs=yes | ||
572 | fi | ||
573 | ;; | ||
574 | - sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7*) | ||
575 | + sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* |sco3.2v5.0.[024]*) | ||
576 | ;; | ||
577 | sysv5* | sco3.2v5* | sco5v6*) | ||
578 | hardcode_libdir_flag_spec='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`' | ||
579 | @@ -488,33 +518,51 @@ | ||
580 | |||
581 | # Check dynamic linker characteristics | ||
582 | # Code taken from libtool.m4's AC_LIBTOOL_SYS_DYNAMIC_LINKER. | ||
583 | +# Unlike libtool.m4, here we don't care about _all_ names of the library, but | ||
584 | +# only about the one the linker finds when passed -lNAME. This is the last | ||
585 | +# element of library_names_spec in libtool.m4, or possibly two of them if the | ||
586 | +# linker has special search rules. | ||
587 | +library_names_spec= # the last element of library_names_spec in libtool.m4 | ||
588 | libname_spec='lib$name' | ||
589 | case "$host_os" in | ||
590 | aix3*) | ||
591 | + library_names_spec='$libname.a' | ||
592 | ;; | ||
593 | aix4* | aix5*) | ||
594 | + library_names_spec='$libname$shrext' | ||
595 | ;; | ||
596 | amigaos*) | ||
597 | + library_names_spec='$libname.a' | ||
598 | ;; | ||
599 | beos*) | ||
600 | + library_names_spec='$libname$shrext' | ||
601 | ;; | ||
602 | bsdi[45]*) | ||
603 | + library_names_spec='$libname$shrext' | ||
604 | ;; | ||
605 | cygwin* | mingw* | pw32*) | ||
606 | shrext=.dll | ||
607 | + library_names_spec='$libname.dll.a $libname.lib' | ||
608 | ;; | ||
609 | darwin* | rhapsody*) | ||
610 | shrext=.dylib | ||
611 | + library_names_spec='$libname$shrext' | ||
612 | ;; | ||
613 | dgux*) | ||
614 | + library_names_spec='$libname$shrext' | ||
615 | ;; | ||
616 | freebsd1*) | ||
617 | ;; | ||
618 | - kfreebsd*-gnu) | ||
619 | - ;; | ||
620 | freebsd* | dragonfly*) | ||
621 | + case "$host_os" in | ||
622 | + freebsd[123]*) | ||
623 | + library_names_spec='$libname$shrext$versuffix' ;; | ||
624 | + *) | ||
625 | + library_names_spec='$libname$shrext' ;; | ||
626 | + esac | ||
627 | ;; | ||
628 | gnu*) | ||
629 | + library_names_spec='$libname$shrext' | ||
630 | ;; | ||
631 | hpux9* | hpux10* | hpux11*) | ||
632 | case $host_cpu in | ||
633 | @@ -528,10 +576,13 @@ | ||
634 | shrext=.sl | ||
635 | ;; | ||
636 | esac | ||
637 | + library_names_spec='$libname$shrext' | ||
638 | ;; | ||
639 | - interix3*) | ||
640 | + interix[3-9]*) | ||
641 | + library_names_spec='$libname$shrext' | ||
642 | ;; | ||
643 | irix5* | irix6* | nonstopux*) | ||
644 | + library_names_spec='$libname$shrext' | ||
645 | case "$host_os" in | ||
646 | irix5* | nonstopux*) | ||
647 | libsuff= shlibsuff= | ||
648 | @@ -548,33 +599,46 @@ | ||
649 | ;; | ||
650 | linux*oldld* | linux*aout* | linux*coff*) | ||
651 | ;; | ||
652 | - linux*) | ||
653 | + linux* | k*bsd*-gnu) | ||
654 | + library_names_spec='$libname$shrext' | ||
655 | ;; | ||
656 | knetbsd*-gnu) | ||
657 | + library_names_spec='$libname$shrext' | ||
658 | ;; | ||
659 | netbsd*) | ||
660 | + library_names_spec='$libname$shrext' | ||
661 | ;; | ||
662 | newsos6) | ||
663 | + library_names_spec='$libname$shrext' | ||
664 | ;; | ||
665 | nto-qnx*) | ||
666 | + library_names_spec='$libname$shrext' | ||
667 | ;; | ||
668 | openbsd*) | ||
669 | + library_names_spec='$libname$shrext$versuffix' | ||
670 | ;; | ||
671 | os2*) | ||
672 | libname_spec='$name' | ||
673 | shrext=.dll | ||
674 | + library_names_spec='$libname.a' | ||
675 | ;; | ||
676 | osf3* | osf4* | osf5*) | ||
677 | + library_names_spec='$libname$shrext' | ||
678 | ;; | ||
679 | solaris*) | ||
680 | + library_names_spec='$libname$shrext' | ||
681 | ;; | ||
682 | sunos4*) | ||
683 | + library_names_spec='$libname$shrext$versuffix' | ||
684 | ;; | ||
685 | sysv4 | sysv4.3*) | ||
686 | + library_names_spec='$libname$shrext' | ||
687 | ;; | ||
688 | sysv4*MP*) | ||
689 | + library_names_spec='$libname$shrext' | ||
690 | ;; | ||
691 | sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) | ||
692 | + library_names_spec='$libname$shrext' | ||
693 | ;; | ||
694 | uts4*) | ||
695 | ;; | ||
696 | @@ -583,6 +647,8 @@ | ||
697 | sed_quote_subst='s/\(["`$\\]\)/\\\1/g' | ||
698 | escaped_wl=`echo "X$wl" | sed -e 's/^X//' -e "$sed_quote_subst"` | ||
699 | shlibext=`echo "$shrext" | sed -e 's,^\.,,'` | ||
700 | +escaped_libname_spec=`echo "X$libname_spec" | sed -e 's/^X//' -e "$sed_quote_subst"` | ||
701 | +escaped_library_names_spec=`echo "X$library_names_spec" | sed -e 's/^X//' -e "$sed_quote_subst"` | ||
702 | escaped_hardcode_libdir_flag_spec=`echo "X$hardcode_libdir_flag_spec" | sed -e 's/^X//' -e "$sed_quote_subst"` | ||
703 | |||
704 | LC_ALL=C sed -e 's/^\([a-zA-Z0-9_]*\)=/acl_cv_\1=/' <<EOF | ||
705 | @@ -596,6 +662,12 @@ | ||
706 | # Shared library suffix (normally "so"). | ||
707 | shlibext="$shlibext" | ||
708 | |||
709 | +# Format of library name prefix. | ||
710 | +libname_spec="$escaped_libname_spec" | ||
711 | + | ||
712 | +# Library names that the linker finds when passed -lNAME. | ||
713 | +library_names_spec="$escaped_library_names_spec" | ||
714 | + | ||
715 | # Flag to hardcode \$libdir into a binary during linking. | ||
716 | # This must work even if \$libdir does not exist. | ||
717 | hardcode_libdir_flag_spec="$escaped_hardcode_libdir_flag_spec" | ||