summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/gettext
diff options
context:
space:
mode:
authorSaul Wold <sgw@linux.intel.com>2011-03-17 01:12:56 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-03-17 17:40:55 +0000
commit3072c245da1a36205cd5e258515eff16f6f7f55e (patch)
tree10633949a1f179d782cb5d6e4ff6934caa5c9d05 /meta/recipes-core/gettext
parent490bbfbe4b4c7ec9c0942b5fadae1ad12af31c20 (diff)
downloadpoky-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')
-rw-r--r--meta/recipes-core/gettext/gettext-0.14.1/gettext-vpath.patch15
-rw-r--r--meta/recipes-core/gettext/gettext-0.16.1/disable_java.patch (renamed from meta/recipes-core/gettext/gettext-0.14.1/disable_java.patch)19
-rw-r--r--meta/recipes-core/gettext/gettext-0.16.1/fix_aclocal_version.patch107
-rw-r--r--meta/recipes-core/gettext/gettext-0.16.1/fix_gnu_source_circular.patch345
-rw-r--r--meta/recipes-core/gettext/gettext-0.16.1/fixchicken.patch (renamed from meta/recipes-core/gettext/gettext-0.14.1/fixchicken.patch)0
-rw-r--r--meta/recipes-core/gettext/gettext-0.16.1/getline.m4.patch (renamed from meta/recipes-core/gettext/gettext-0.14.1/getline.m4.patch)0
-rw-r--r--meta/recipes-core/gettext/gettext-0.16.1/gettext-autoconf-lib-link-no-L.patch (renamed from meta/recipes-core/gettext/gettext-0.14.1/gettext-autoconf-lib-link-no-L.patch)4
-rw-r--r--meta/recipes-core/gettext/gettext-0.16.1/gettext-error_print_progname.patch (renamed from meta/recipes-core/gettext/gettext-0.14.1/gettext-error_print_progname.patch)0
-rw-r--r--meta/recipes-core/gettext/gettext-0.16.1/gettext-vpath.patch17
-rw-r--r--meta/recipes-core/gettext/gettext-0.16.1/hardcode_macro_version.patch48
-rw-r--r--meta/recipes-core/gettext/gettext-0.16.1/linklib_from_0.17.patch (renamed from meta/recipes-core/gettext/gettext-0.14.1/linklib_from_0.17.patch)668
-rw-r--r--meta/recipes-core/gettext/gettext_0.16.1.bb (renamed from meta/recipes-core/gettext/gettext_0.14.1.bb)20
12 files changed, 666 insertions, 577 deletions
diff --git a/meta/recipes-core/gettext/gettext-0.14.1/gettext-vpath.patch b/meta/recipes-core/gettext/gettext-0.14.1/gettext-vpath.patch
deleted file mode 100644
index e31243b066..0000000000
--- a/meta/recipes-core/gettext/gettext-0.14.1/gettext-vpath.patch
+++ /dev/null
@@ -1,15 +0,0 @@
1# Pulled from OpenEmbedded
2#
3# Commented by: Saul Wold <saul.wold@intel.com>
4
5--- gettext-0.14.1/gettext-runtime/intl/Makefile.in~ 2004-04-09 13:23:40.000000000 +0100
6+++ gettext-0.14.1/gettext-runtime/intl/Makefile.in 2004-04-09 13:22:05.000000000 +0100
7@@ -24,7 +24,7 @@
8 srcdir = $(top_srcdir)/../gettext-runtime/intl
9 top_srcdir = /var/tmp/oe-tmp.pb/base/gettext-0.14.1-r0/gettext-0.14.1/gettext-tools
10 top_builddir = ..
11-VPATH = $(srcdir)
12+#VPATH = $(srcdir)
13
14 prefix = /usr
15 exec_prefix = /usr
diff --git a/meta/recipes-core/gettext/gettext-0.14.1/disable_java.patch b/meta/recipes-core/gettext/gettext-0.16.1/disable_java.patch
index f1ae816f37..cf7dc55b68 100644
--- a/meta/recipes-core/gettext/gettext-0.14.1/disable_java.patch
+++ b/meta/recipes-core/gettext/gettext-0.16.1/disable_java.patch
@@ -2,31 +2,30 @@
2# 2#
3# Commented by: Saul Wold <saul.wold@intel.com> 3# Commented by: Saul Wold <saul.wold@intel.com>
4 4
5Index: gettext-0.14.1/gettext-tools/configure.ac 5Index: gettext-0.16.1/gettext-tools/configure.ac
6=================================================================== 6===================================================================
7--- gettext-0.14.1.orig/gettext-tools/configure.ac 2004-01-16 10:49:06.000000000 +0000 7--- gettext-0.16.1.orig/gettext-tools/configure.ac 2006-11-27 09:02:01.000000000 -0800
8+++ gettext-0.14.1/gettext-tools/configure.ac 2007-11-14 21:43:39.000000000 +0000 8+++ gettext-0.16.1/gettext-tools/configure.ac 2011-03-16 16:55:36.111396557 -0700
9@@ -37,28 +37,16 @@ 9@@ -36,27 +36,15 @@
10 AC_PROG_YACC 10 gt_JAVA_CHOICE
11 11
12 gt_GCJ 12 gt_GCJ
13-if test -n "$HAVE_GCJ"; then 13-if test -n "$HAVE_GCJ" && test "$JAVA_CHOICE" = yes; then
14- BUILDJAVAEXE=yes 14- BUILDJAVAEXE=yes
15-else 15-else
16 BUILDJAVAEXE=no 16 BUILDJAVAEXE=no
17-fi 17-fi
18 AC_SUBST(BUILDJAVAEXE) 18 AC_SUBST(BUILDJAVAEXE)
19 19
20 gt_JAVACOMP 20 gt_JAVAEXEC
21 gt_JAVACOMP([1.3])
21 AC_CHECK_PROG(JAR, jar, jar) 22 AC_CHECK_PROG(JAR, jar, jar)
22-if test -n "$HAVE_JAVACOMP" && test -n "$JAR"; then 23-if test -n "$HAVE_JAVACOMP" && test -n "$JAR" && test "$JAVA_CHOICE" != no; then
23- BUILDJAVA=yes 24- BUILDJAVA=yes
24-else 25-else
25 BUILDJAVA=no 26 BUILDJAVA=no
26-fi 27-fi
27 AC_SUBST(BUILDJAVA) 28 AC_SUBST(BUILDJAVA)
28
29 gt_JAVAEXEC
30-if test -n "$HAVE_JAVAEXEC" && test $BUILDJAVA = yes; then 29-if test -n "$HAVE_JAVAEXEC" && test $BUILDJAVA = yes; then
31- TESTJAVA=yes 30- TESTJAVA=yes
32-else 31-else
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 @@
1This patch updates the required version number from 2.61 to the
2current 2.65 version of aclocal, this will need to be updated
3when we update aclocal
4
5Signed-off-by Saul Wold <sgw@linux.intel.com>
6
7Index: 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([
20Index: 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
35Index: 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
50Index: 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])])
63Index: 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
78Index: 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
93Index: 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 @@
1This patch removes the circular dependency on AC_GNU_SOURCE in
2AC_USE_SYSTEM_EXTENSIONS.
3
4Thanks to Mark Hatle for the timely pointers and fixes.
5
6Signed-off-by Saul Wold <sgw@linux.intel.com>
7
8diff -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+])
93diff -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
105diff -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])
117diff -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])
129diff -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])
141diff -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+])
226diff -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],
238diff -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)
250diff -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
262diff -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 ])
274diff -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])
286diff -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
298diff -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
310diff -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])
322diff -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 ])
334diff -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.14.1/fixchicken.patch b/meta/recipes-core/gettext/gettext-0.16.1/fixchicken.patch
index ef51056674..ef51056674 100644
--- a/meta/recipes-core/gettext/gettext-0.14.1/fixchicken.patch
+++ b/meta/recipes-core/gettext/gettext-0.16.1/fixchicken.patch
diff --git a/meta/recipes-core/gettext/gettext-0.14.1/getline.m4.patch b/meta/recipes-core/gettext/gettext-0.16.1/getline.m4.patch
index f71d0e1d82..f71d0e1d82 100644
--- a/meta/recipes-core/gettext/gettext-0.14.1/getline.m4.patch
+++ b/meta/recipes-core/gettext/gettext-0.16.1/getline.m4.patch
diff --git a/meta/recipes-core/gettext/gettext-0.14.1/gettext-autoconf-lib-link-no-L.patch b/meta/recipes-core/gettext/gettext-0.16.1/gettext-autoconf-lib-link-no-L.patch
index 2fe62c0e19..e8bb2f6a38 100644
--- a/meta/recipes-core/gettext/gettext-0.14.1/gettext-autoconf-lib-link-no-L.patch
+++ b/meta/recipes-core/gettext/gettext-0.16.1/gettext-autoconf-lib-link-no-L.patch
@@ -1,3 +1,7 @@
1# Pulled from OpenEmbedded
2#
3# Commented by: Saul Wold <saul.wold@intel.com>
4
1--- gettext-0.17/autoconf-lib-link/m4/lib-link.m4~ 2009-04-17 15:12:30.000000000 -0700 5--- gettext-0.17/autoconf-lib-link/m4/lib-link.m4~ 2009-04-17 15:12:30.000000000 -0700
2+++ gettext-0.17/autoconf-lib-link/m4/lib-link.m4 2009-04-17 15:37:39.000000000 -0700 6+++ gettext-0.17/autoconf-lib-link/m4/lib-link.m4 2009-04-17 15:37:39.000000000 -0700
3@@ -267,6 +267,9 @@ 7@@ -267,6 +267,9 @@
diff --git a/meta/recipes-core/gettext/gettext-0.14.1/gettext-error_print_progname.patch b/meta/recipes-core/gettext/gettext-0.16.1/gettext-error_print_progname.patch
index 96a2196a68..96a2196a68 100644
--- a/meta/recipes-core/gettext/gettext-0.14.1/gettext-error_print_progname.patch
+++ b/meta/recipes-core/gettext/gettext-0.16.1/gettext-error_print_progname.patch
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
5Index: 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 @@
1This patch hardcodes in version 0.17 for the GETTEXT_MACRO_VERSION,
2the version check is only part of 0.17 and will not affect any 0.16.1
3operations
4
5Signed-off-by: Saul Wold <sgw@linux.intel.com>
6
7Index: 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
21Index: 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@
35Index: 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.14.1/linklib_from_0.17.patch b/meta/recipes-core/gettext/gettext-0.16.1/linklib_from_0.17.patch
index f4ae8467d7..2b805c9d8b 100644
--- a/meta/recipes-core/gettext/gettext-0.14.1/linklib_from_0.17.patch
+++ b/meta/recipes-core/gettext/gettext-0.16.1/linklib_from_0.17.patch
@@ -2,46 +2,17 @@
2# 2#
3# Commented by: Saul Wold <saul.wold@intel.com> 3# Commented by: Saul Wold <saul.wold@intel.com>
4 4
5Index: gettext-0.14.1/autoconf-lib-link/m4/lib-ld.m4 5Index: gettext-0.16.1/autoconf-lib-link/m4/lib-link.m4
6=================================================================== 6===================================================================
7--- gettext-0.14.1.orig/autoconf-lib-link/m4/lib-ld.m4 2008-04-15 14:32:45.000000000 +0100 7--- gettext-0.16.1.orig/autoconf-lib-link/m4/lib-link.m4 2006-11-27 09:01:58.000000000 -0800
8+++ gettext-0.14.1/autoconf-lib-link/m4/lib-ld.m4 2008-04-15 14:32:47.000000000 +0100 8+++ gettext-0.16.1/autoconf-lib-link/m4/lib-link.m4 2011-03-17 00:36:08.710836720 -0700
9@@ -1,10 +1,8 @@ 9@@ -6,12 +6,14 @@
10 # lib-ld.m4 serial 3 (gettext-0.13)
11 dnl Copyright (C) 1996-2003 Free Software Foundation, Inc.
12-dnl This file is free software, distributed under the terms of the GNU
13-dnl General Public License. As a special exception to the GNU General
14-dnl Public License, this file may be distributed as part of a program
15-dnl that contains a configuration script generated by Autoconf, under
16-dnl the same distribution terms as the rest of that program.
17+dnl This file is free software; the Free Software Foundation
18+dnl gives unlimited permission to copy and/or distribute it,
19+dnl with or without modifications, as long as this notice is preserved.
20
21 dnl Subroutines of libtool.m4,
22 dnl with replacements s/AC_/AC_LIB/ and s/lt_cv/acl_cv/ to avoid collision
23Index: gettext-0.14.1/autoconf-lib-link/m4/lib-link.m4
24===================================================================
25--- gettext-0.14.1.orig/autoconf-lib-link/m4/lib-link.m4 2008-04-15 14:32:45.000000000 +0100
26+++ gettext-0.14.1/autoconf-lib-link/m4/lib-link.m4 2008-04-15 14:32:47.000000000 +0100
27@@ -1,17 +1,19 @@
28-# lib-link.m4 serial 4 (gettext-0.12)
29-dnl Copyright (C) 2001-2003 Free Software Foundation, Inc.
30-dnl This file is free software, distributed under the terms of the GNU
31-dnl General Public License. As a special exception to the GNU General
32-dnl Public License, this file may be distributed as part of a program
33-dnl that contains a configuration script generated by Autoconf, under
34-dnl the same distribution terms as the rest of that program.
35+# lib-link.m4 serial 13 (gettext-0.17)
36+dnl Copyright (C) 2001-2007 Free Software Foundation, Inc.
37+dnl This file is free software; the Free Software Foundation
38+dnl gives unlimited permission to copy and/or distribute it,
39+dnl with or without modifications, as long as this notice is preserved.
40 10
41 dnl From Bruno Haible. 11 dnl From Bruno Haible.
42 12
13-AC_PREREQ(2.50)
43+AC_PREREQ(2.54) 14+AC_PREREQ(2.54)
44+ 15
45 dnl AC_LIB_LINKFLAGS(name [, dependencies]) searches for libname and 16 dnl AC_LIB_LINKFLAGS(name [, dependencies]) searches for libname and
46 dnl the libraries corresponding to explicit and implicit dependencies. 17 dnl the libraries corresponding to explicit and implicit dependencies.
47 dnl Sets and AC_SUBSTs the LIB${NAME} and LTLIB${NAME} variables and 18 dnl Sets and AC_SUBSTs the LIB${NAME} and LTLIB${NAME} variables and
@@ -77,11 +48,12 @@ Index: gettext-0.14.1/autoconf-lib-link/m4/lib-link.m4
77 AC_DEFUN([AC_LIB_HAVE_LINKFLAGS], 48 AC_DEFUN([AC_LIB_HAVE_LINKFLAGS],
78 [ 49 [
79 AC_REQUIRE([AC_LIB_PREPARE_PREFIX]) 50 AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
80@@ -82,19 +89,27 @@ 51@@ -82,17 +89,24 @@
81 CPPFLAGS="$ac_save_CPPFLAGS" 52 CPPFLAGS="$ac_save_CPPFLAGS"
82 LIB[]NAME= 53 LIB[]NAME=
83 LTLIB[]NAME= 54 LTLIB[]NAME=
84+ LIB[]NAME[]_PREFIX= 55+ LIB[]NAME[]_PREFIX=
56+
85 fi 57 fi
86 AC_SUBST([HAVE_LIB]NAME) 58 AC_SUBST([HAVE_LIB]NAME)
87 AC_SUBST([LIB]NAME) 59 AC_SUBST([LIB]NAME)
@@ -102,12 +74,8 @@ Index: gettext-0.14.1/autoconf-lib-link/m4/lib-link.m4
102+dnl acl_hardcode_minus_L. 74+dnl acl_hardcode_minus_L.
103 AC_DEFUN([AC_LIB_RPATH], 75 AC_DEFUN([AC_LIB_RPATH],
104 [ 76 [
105+ dnl Tell automake >= 1.10 to complain if config.rpath is missing. 77 dnl Tell automake >= 1.10 to complain if config.rpath is missing.
106+ m4_ifdef([AC_REQUIRE_AUX_FILE], [AC_REQUIRE_AUX_FILE([config.rpath])]) 78@@ -109,12 +123,14 @@
107 AC_REQUIRE([AC_PROG_CC]) dnl we use $CC, $GCC, $LDFLAGS
108 AC_REQUIRE([AC_LIB_PROG_LD]) dnl we use $LD, $with_gnu_ld
109 AC_REQUIRE([AC_CANONICAL_HOST]) dnl we use $host
110@@ -107,12 +122,14 @@
111 acl_cv_rpath=done 79 acl_cv_rpath=done
112 ]) 80 ])
113 wl="$acl_cv_wl" 81 wl="$acl_cv_wl"
@@ -128,7 +96,7 @@ Index: gettext-0.14.1/autoconf-lib-link/m4/lib-link.m4
128 dnl Determine whether the user wants rpath handling at all. 96 dnl Determine whether the user wants rpath handling at all.
129 AC_ARG_ENABLE(rpath, 97 AC_ARG_ENABLE(rpath,
130 [ --disable-rpath do not hardcode runtime library paths], 98 [ --disable-rpath do not hardcode runtime library paths],
131@@ -122,19 +139,24 @@ 99@@ -124,20 +140,24 @@
132 dnl AC_LIB_LINKFLAGS_BODY(name [, dependencies]) searches for libname and 100 dnl AC_LIB_LINKFLAGS_BODY(name [, dependencies]) searches for libname and
133 dnl the libraries corresponding to explicit and implicit dependencies. 101 dnl the libraries corresponding to explicit and implicit dependencies.
134 dnl Sets the LIB${NAME}, LTLIB${NAME} and INC${NAME} variables. 102 dnl Sets the LIB${NAME}, LTLIB${NAME} and INC${NAME} variables.
@@ -136,7 +104,7 @@ Index: gettext-0.14.1/autoconf-lib-link/m4/lib-link.m4
136+dnl in ${LIB${NAME}_PREFIX}/$acl_libdirstem. 104+dnl in ${LIB${NAME}_PREFIX}/$acl_libdirstem.
137 AC_DEFUN([AC_LIB_LINKFLAGS_BODY], 105 AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
138 [ 106 [
139+ AC_REQUIRE([AC_LIB_PREPARE_MULTILIB]) 107 AC_REQUIRE([AC_LIB_PREPARE_MULTILIB])
140 define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-], 108 define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
141 [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])]) 109 [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
142+ dnl Autoconf >= 2.61 supports dots in --with options. 110+ dnl Autoconf >= 2.61 supports dots in --with options.
@@ -156,16 +124,7 @@ Index: gettext-0.14.1/autoconf-lib-link/m4/lib-link.m4
156 [ 124 [
157 if test "X$withval" = "Xno"; then 125 if test "X$withval" = "Xno"; then
158 use_additional=no 126 use_additional=no
159@@ -146,7 +168,7 @@ 127@@ -158,6 +178,7 @@
160 ])
161 else
162 additional_includedir="$withval/include"
163- additional_libdir="$withval/lib"
164+ additional_libdir="$withval/$acl_libdirstem"
165 fi
166 fi
167 ])
168@@ -155,6 +177,7 @@
169 LIB[]NAME= 128 LIB[]NAME=
170 LTLIB[]NAME= 129 LTLIB[]NAME=
171 INC[]NAME= 130 INC[]NAME=
@@ -173,7 +132,7 @@ Index: gettext-0.14.1/autoconf-lib-link/m4/lib-link.m4
173 rpathdirs= 132 rpathdirs=
174 ltrpathdirs= 133 ltrpathdirs=
175 names_already_handled= 134 names_already_handled=
176@@ -194,22 +217,55 @@ 135@@ -197,27 +218,53 @@
177 found_la= 136 found_la=
178 found_so= 137 found_so=
179 found_a= 138 found_a=
@@ -184,18 +143,13 @@ Index: gettext-0.14.1/autoconf-lib-link/m4/lib-link.m4
184+ shrext= 143+ shrext=
185+ fi 144+ fi
186 if test $use_additional = yes; then 145 if test $use_additional = yes; then
187- if test -n "$shlibext" && test -f "$additional_libdir/lib$name.$shlibext"; 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
188- found_dir="$additional_libdir" 150- found_dir="$additional_libdir"
189- found_so="$additional_libdir/lib$name.$shlibext" 151- if test -f "$additional_libdir/lib$name.$shlibext"; then
190- if test -f "$additional_libdir/lib$name.la"; then 152- found_so="$additional_libdir/lib$name.$shlibext"
191- found_la="$additional_libdir/lib$name.la"
192- fi
193- else
194- if test -f "$additional_libdir/lib$name.$libext"; then
195- found_dir="$additional_libdir"
196- found_a="$additional_libdir/lib$name.$libext"
197- if test -f "$additional_libdir/lib$name.la"; then
198- found_la="$additional_libdir/lib$name.la"
199+ dir="$additional_libdir" 153+ dir="$additional_libdir"
200+ dnl The same code as in the loop below: 154+ dnl The same code as in the loop below:
201+ dnl First look for a shared library. 155+ dnl First look for a shared library.
@@ -203,7 +157,8 @@ Index: gettext-0.14.1/autoconf-lib-link/m4/lib-link.m4
203+ if test -f "$dir/$libname$shrext"; then 157+ if test -f "$dir/$libname$shrext"; then
204+ found_dir="$dir" 158+ found_dir="$dir"
205+ found_so="$dir/$libname$shrext" 159+ found_so="$dir/$libname$shrext"
206+ else 160 else
161- found_so="$additional_libdir/lib$name.dll.a"
207+ if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then 162+ if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then
208+ ver=`(cd "$dir" && \ 163+ ver=`(cd "$dir" && \
209+ for f in "$libname$shrext".*; do echo "$f"; done \ 164+ for f in "$libname$shrext".*; do echo "$f"; done \
@@ -223,45 +178,52 @@ Index: gettext-0.14.1/autoconf-lib-link/m4/lib-link.m4
223+ break 178+ break
224+ fi 179+ fi
225+ done 180+ done
226 fi 181+ fi
227 fi 182 fi
228 fi 183- if test -f "$additional_libdir/lib$name.la"; then
184- found_la="$additional_libdir/lib$name.la"
185+ fi
229+ dnl Then look for a static library. 186+ dnl Then look for a static library.
230+ if test "X$found_dir" = "X"; then 187+ if test "X$found_dir" = "X"; then
231+ if test -f "$dir/$libname.$acl_libext"; then 188+ if test -f "$dir/$libname.$acl_libext"; then
232+ found_dir="$dir" 189+ found_dir="$dir"
233+ found_a="$dir/$libname.$acl_libext" 190+ found_a="$dir/$libname.$acl_libext"
234+ fi 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
235+ fi 199+ fi
236+ if test "X$found_dir" != "X"; then 200+ if test "X$found_dir" != "X"; then
237+ if test -f "$dir/$libname.la"; then 201+ if test -f "$dir/$libname.la"; then
238+ found_la="$dir/$libname.la" 202+ found_la="$dir/$libname.la"
239+ fi 203 fi
240+ fi 204 fi
241 fi 205 fi
242 if test "X$found_dir" = "X"; then 206@@ -227,26 +274,44 @@
243 for x in $LDFLAGS $LTLIB[]NAME; do
244@@ -217,21 +273,46 @@
245 case "$x" in 207 case "$x" in
246 -L*) 208 -L*)
247 dir=`echo "X$x" | sed -e 's/^X-L//'` 209 dir=`echo "X$x" | sed -e 's/^X-L//'`
248- if test -n "$shlibext" && test -f "$dir/lib$name.$shlibext"; then 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
249- found_dir="$dir" 214- found_dir="$dir"
250- found_so="$dir/lib$name.$shlibext" 215- if test -f "$dir/lib$name.$shlibext"; then
251- if test -f "$dir/lib$name.la"; then 216- found_so="$dir/lib$name.$shlibext"
252- found_la="$dir/lib$name.la"
253- fi
254- else
255- if test -f "$dir/lib$name.$libext"; then
256+ dnl First look for a shared library. 217+ dnl First look for a shared library.
257+ if test -n "$acl_shlibext"; then 218+ if test -n "$acl_shlibext"; then
258+ if test -f "$dir/$libname$shrext"; then 219+ if test -f "$dir/$libname$shrext"; then
259 found_dir="$dir" 220+ found_dir="$dir"
260- found_a="$dir/lib$name.$libext"
261- if test -f "$dir/lib$name.la"; then
262- found_la="$dir/lib$name.la"
263+ found_so="$dir/$libname$shrext" 221+ found_so="$dir/$libname$shrext"
264+ else 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"
265+ if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then 227+ if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then
266+ ver=`(cd "$dir" && \ 228+ ver=`(cd "$dir" && \
267+ for f in "$libname$shrext".*; do echo "$f"; done \ 229+ for f in "$libname$shrext".*; do echo "$f"; done \
@@ -281,34 +243,29 @@ Index: gettext-0.14.1/autoconf-lib-link/m4/lib-link.m4
281+ break 243+ break
282+ fi 244+ fi
283+ done 245+ done
284 fi 246+ fi
285 fi 247 fi
286 fi 248- else
249- if test -f "$dir/lib$name.$libext"; then
250+ fi
287+ dnl Then look for a static library. 251+ dnl Then look for a static library.
288+ if test "X$found_dir" = "X"; then 252+ if test "X$found_dir" = "X"; then
289+ if test -f "$dir/$libname.$acl_libext"; then 253+ if test -f "$dir/$libname.$acl_libext"; then
290+ found_dir="$dir" 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
291+ found_a="$dir/$libname.$acl_libext" 259+ found_a="$dir/$libname.$acl_libext"
292+ fi 260+ fi
293+ fi 261+ fi
294+ if test "X$found_dir" != "X"; then 262+ if test "X$found_dir" != "X"; then
295+ if test -f "$dir/$libname.la"; then 263+ if test -f "$dir/$libname.la"; then
296+ found_la="$dir/$libname.la" 264+ found_la="$dir/$libname.la"
297+ fi 265 fi
298+ fi 266 fi
299 ;; 267 ;;
300 esac 268@@ -282,12 +347,12 @@
301 if test "X$found_dir" != "X"; then
302@@ -246,7 +327,7 @@
303 dnl Linking with a shared library. We attempt to hardcode its
304 dnl directory into the executable's runpath, unless it's the
305 dnl standard /usr/lib.
306- if test "$enable_rpath" = no || test "X$found_dir" = "X/usr/lib"; then
307+ if test "$enable_rpath" = no || test "X$found_dir" = "X/usr/$acl_libdirstem"; then
308 dnl No hardcoding is needed.
309 LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
310 else
311@@ -265,12 +346,12 @@
312 ltrpathdirs="$ltrpathdirs $found_dir" 269 ltrpathdirs="$ltrpathdirs $found_dir"
313 fi 270 fi
314 dnl The hardcoding into $LIBNAME is system dependent. 271 dnl The hardcoding into $LIBNAME is system dependent.
@@ -323,7 +280,7 @@ Index: gettext-0.14.1/autoconf-lib-link/m4/lib-link.m4
323 dnl Use an explicit option to hardcode DIR into the resulting 280 dnl Use an explicit option to hardcode DIR into the resulting
324 dnl binary. 281 dnl binary.
325 LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so" 282 LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
326@@ -301,13 +382,13 @@ 283@@ -318,13 +383,13 @@
327 if test -z "$haveit"; then 284 if test -z "$haveit"; then
328 LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir" 285 LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir"
329 fi 286 fi
@@ -339,44 +296,7 @@ Index: gettext-0.14.1/autoconf-lib-link/m4/lib-link.m4
339 dnl here, because this doesn't fit in flags passed to the 296 dnl here, because this doesn't fit in flags passed to the
340 dnl compiler. So give up. No hardcoding. This affects only 297 dnl compiler. So give up. No hardcoding. This affects only
341 dnl very old systems. 298 dnl very old systems.
342@@ -332,8 +413,9 @@ 299@@ -512,18 +577,18 @@
343 dnl Assume the include files are nearby.
344 additional_includedir=
345 case "$found_dir" in
346- */lib | */lib/)
347- basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e 's,/lib/*$,,'`
348+ */$acl_libdirstem | */$acl_libdirstem/)
349+ basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem/"'*$,,'`
350+ LIB[]NAME[]_PREFIX="$basedir"
351 additional_includedir="$basedir/include"
352 ;;
353 esac
354@@ -350,7 +432,7 @@
355 if test "X$additional_includedir" = "X/usr/local/include"; then
356 if test -n "$GCC"; then
357 case $host_os in
358- linux*) haveit=yes;;
359+ linux* | gnu* | k*bsd*-gnu) haveit=yes;;
360 esac
361 fi
362 fi
363@@ -394,12 +476,12 @@
364 dnl 3. if it's already present in $LDFLAGS or the already
365 dnl constructed $LIBNAME,
366 dnl 4. if it doesn't exist as a directory.
367- if test "X$additional_libdir" != "X/usr/lib"; then
368+ if test "X$additional_libdir" != "X/usr/$acl_libdirstem"; then
369 haveit=
370- if test "X$additional_libdir" = "X/usr/local/lib"; then
371+ if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem"; then
372 if test -n "$GCC"; then
373 case $host_os in
374- linux*) haveit=yes;;
375+ linux* | gnu* | k*bsd*-gnu) haveit=yes;;
376 esac
377 fi
378 fi
379@@ -495,18 +577,18 @@
380 done 300 done
381 done 301 done
382 if test "X$rpathdirs" != "X"; then 302 if test "X$rpathdirs" != "X"; then
@@ -399,7 +319,7 @@ Index: gettext-0.14.1/autoconf-lib-link/m4/lib-link.m4
399 libdir="$acl_save_libdir" 319 libdir="$acl_save_libdir"
400 LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag" 320 LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag"
401 else 321 else
402@@ -514,7 +596,7 @@ 322@@ -531,7 +596,7 @@
403 for found_dir in $rpathdirs; do 323 for found_dir in $rpathdirs; do
404 acl_save_libdir="$libdir" 324 acl_save_libdir="$libdir"
405 libdir="$found_dir" 325 libdir="$found_dir"
@@ -408,9 +328,9 @@ Index: gettext-0.14.1/autoconf-lib-link/m4/lib-link.m4
408 libdir="$acl_save_libdir" 328 libdir="$acl_save_libdir"
409 LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag" 329 LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag"
410 done 330 done
411@@ -549,3 +631,79 @@ 331@@ -642,3 +707,79 @@
412 fi 332 fi
413 done 333 AC_SUBST([$1])
414 ]) 334 ])
415+ 335+
416+dnl For those cases where a variable contains several -L and -l options 336+dnl For those cases where a variable contains several -L and -l options
@@ -488,154 +408,22 @@ Index: gettext-0.14.1/autoconf-lib-link/m4/lib-link.m4
488+ fi 408+ fi
489+ AC_SUBST([$1]) 409+ AC_SUBST([$1])
490+]) 410+])
491Index: gettext-0.14.1/autoconf-lib-link/m4/lib-prefix.m4 411Index: gettext-0.16.1/autoconf-lib-link/config.rpath
492===================================================================
493--- gettext-0.14.1.orig/autoconf-lib-link/m4/lib-prefix.m4 2008-04-15 14:32:45.000000000 +0100
494+++ gettext-0.14.1/autoconf-lib-link/m4/lib-prefix.m4 2008-04-15 14:32:47.000000000 +0100
495@@ -1,10 +1,8 @@
496-# lib-prefix.m4 serial 3 (gettext-0.13)
497-dnl Copyright (C) 2001-2003 Free Software Foundation, Inc.
498-dnl This file is free software, distributed under the terms of the GNU
499-dnl General Public License. As a special exception to the GNU General
500-dnl Public License, this file may be distributed as part of a program
501-dnl that contains a configuration script generated by Autoconf, under
502-dnl the same distribution terms as the rest of that program.
503+# lib-prefix.m4 serial 5 (gettext-0.15)
504+dnl Copyright (C) 2001-2005 Free Software Foundation, Inc.
505+dnl This file is free software; the Free Software Foundation
506+dnl gives unlimited permission to copy and/or distribute it,
507+dnl with or without modifications, as long as this notice is preserved.
508
509 dnl From Bruno Haible.
510
511@@ -26,6 +24,7 @@
512 AC_BEFORE([$0], [AC_LIB_LINKFLAGS])
513 AC_REQUIRE([AC_PROG_CC])
514 AC_REQUIRE([AC_CANONICAL_HOST])
515+ AC_REQUIRE([AC_LIB_PREPARE_MULTILIB])
516 AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
517 dnl By default, look in $includedir and $libdir.
518 use_additional=yes
519@@ -47,7 +46,7 @@
520 ])
521 else
522 additional_includedir="$withval/include"
523- additional_libdir="$withval/lib"
524+ additional_libdir="$withval/$acl_libdirstem"
525 fi
526 fi
527 ])
528@@ -71,7 +70,7 @@
529 if test "X$additional_includedir" = "X/usr/local/include"; then
530 if test -n "$GCC"; then
531 case $host_os in
532- linux*) haveit=yes;;
533+ linux* | gnu* | k*bsd*-gnu) haveit=yes;;
534 esac
535 fi
536 fi
537@@ -89,7 +88,7 @@
538 dnl 2. if it's already present in $LDFLAGS,
539 dnl 3. if it's /usr/local/lib and we are using GCC on Linux,
540 dnl 4. if it doesn't exist as a directory.
541- if test "X$additional_libdir" != "X/usr/lib"; then
542+ if test "X$additional_libdir" != "X/usr/$acl_libdirstem"; then
543 haveit=
544 for x in $LDFLAGS; do
545 AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
546@@ -99,7 +98,7 @@
547 fi
548 done
549 if test -z "$haveit"; then
550- if test "X$additional_libdir" = "X/usr/local/lib"; then
551+ if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem"; then
552 if test -n "$GCC"; then
553 case $host_os in
554 linux*) haveit=yes;;
555@@ -153,3 +152,34 @@
556 exec_prefix="$acl_save_exec_prefix"
557 prefix="$acl_save_prefix"
558 ])
559+
560+dnl AC_LIB_PREPARE_MULTILIB creates a variable acl_libdirstem, containing
561+dnl the basename of the libdir, either "lib" or "lib64".
562+AC_DEFUN([AC_LIB_PREPARE_MULTILIB],
563+[
564+ dnl There is no formal standard regarding lib and lib64. The current
565+ dnl practice is that on a system supporting 32-bit and 64-bit instruction
566+ dnl sets or ABIs, 64-bit libraries go under $prefix/lib64 and 32-bit
567+ dnl libraries go under $prefix/lib. We determine the compiler's default
568+ dnl mode by looking at the compiler's library search path. If at least
569+ dnl of its elements ends in /lib64 or points to a directory whose absolute
570+ dnl pathname ends in /lib64, we assume a 64-bit ABI. Otherwise we use the
571+ dnl default, namely "lib".
572+ acl_libdirstem=lib
573+ searchpath=`(LC_ALL=C $CC -print-search-dirs) 2>/dev/null | sed -n -e 's,^libraries: ,,p' | sed -e 's,^=,,'`
574+ if test -n "$searchpath"; then
575+ acl_save_IFS="${IFS= }"; IFS=":"
576+ for searchdir in $searchpath; do
577+ if test -d "$searchdir"; then
578+ case "$searchdir" in
579+ */lib64/ | */lib64 ) acl_libdirstem=lib64 ;;
580+ *) searchdir=`cd "$searchdir" && pwd`
581+ case "$searchdir" in
582+ */lib64 ) acl_libdirstem=lib64 ;;
583+ esac ;;
584+ esac
585+ fi
586+ done
587+ IFS="$acl_save_IFS"
588+ fi
589+])
590Index: gettext-0.14.1/autoconf-lib-link/config.rpath
591=================================================================== 412===================================================================
592--- gettext-0.14.1.orig/autoconf-lib-link/config.rpath 2008-04-15 14:32:51.000000000 +0100 413--- gettext-0.16.1.orig/autoconf-lib-link/config.rpath 2006-11-27 09:01:58.000000000 -0800
593+++ gettext-0.14.1/autoconf-lib-link/config.rpath 2007-06-28 00:01:49.000000000 +0100 414+++ gettext-0.16.1/autoconf-lib-link/config.rpath 2011-03-17 00:33:23.336539490 -0700
594@@ -2,28 +2,13 @@ 415@@ -2,7 +2,7 @@
595 # Output a system dependent set of variables, describing how to set the 416 # Output a system dependent set of variables, describing how to set the
596 # run time search path of shared libraries in an executable. 417 # run time search path of shared libraries in an executable.
597 # 418 #
598-# Copyright 1996-2003 Free Software Foundation, Inc. 419-# Copyright 1996-2006 Free Software Foundation, Inc.
599+# Copyright 1996-2007 Free Software Foundation, Inc. 420+# Copyright 1996-2007 Free Software Foundation, Inc.
600 # Taken from GNU libtool, 2001 421 # Taken from GNU libtool, 2001
601 # Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996 422 # Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
602 # 423 #
603-# This program is free software; you can redistribute it and/or modify 424@@ -47,6 +47,18 @@
604-# it under the terms of the GNU General Public License as published by 425 done
605-# the Free Software Foundation; either version 2 of the License, or 426 cc_basename=`echo "$cc_temp" | sed -e 's%^.*/%%'`
606-# (at your option) any later version.
607-#
608-# This program is distributed in the hope that it will be useful, but
609-# WITHOUT ANY WARRANTY; without even the implied warranty of
610-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
611-# General Public License for more details.
612-#
613-# You should have received a copy of the GNU General Public License
614-# along with this program; if not, write to the Free Software
615-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
616-#
617-# As a special exception to the GNU General Public License, if you
618-# distribute this file as part of a program that contains a
619-# configuration script generated by Autoconf, you may include it under
620-# the same distribution terms that you use for the rest of that program.
621+# This file is free software; the Free Software Foundation gives
622+# unlimited permission to copy and/or distribute it, with or without
623+# modifications, as long as this notice is preserved.
624 #
625 # The first argument passed to this file is the canonical host specification,
626 # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM
627@@ -40,7 +25,7 @@
628 # known workaround is to choose shorter directory names for the build
629 # directory and/or the installation directory.
630
631-# All known linkers require a `.a' archive for static linking (except M$VC,
632+# All known linkers require a `.a' archive for static linking (except MSVC,
633 # which needs '.lib').
634 libext=a
635 shrext=.so
636@@ -50,6 +35,18 @@
637 host_vendor=`echo "$host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
638 host_os=`echo "$host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
639 427
640+# Code taken from libtool.m4's _LT_CC_BASENAME. 428+# Code taken from libtool.m4's _LT_CC_BASENAME.
641+ 429+
@@ -652,9 +440,9 @@ Index: gettext-0.14.1/autoconf-lib-link/config.rpath
652 # Code taken from libtool.m4's AC_LIBTOOL_PROG_COMPILER_PIC. 440 # Code taken from libtool.m4's AC_LIBTOOL_PROG_COMPILER_PIC.
653 441
654 wl= 442 wl=
655@@ -60,7 +57,14 @@ 443@@ -64,7 +76,14 @@
656 aix*) 444 ;;
657 wl='-Wl,' 445 esac
658 ;; 446 ;;
659- mingw* | pw32* | os2*) 447- mingw* | pw32* | os2*)
660+ darwin*) 448+ darwin*)
@@ -668,37 +456,16 @@ Index: gettext-0.14.1/autoconf-lib-link/config.rpath
668 ;; 456 ;;
669 hpux9* | hpux10* | hpux11*) 457 hpux9* | hpux10* | hpux11*)
670 wl='-Wl,' 458 wl='-Wl,'
671@@ -70,20 +74,33 @@ 459@@ -74,7 +93,7 @@
672 ;; 460 ;;
673 newsos6) 461 newsos6)
674 ;; 462 ;;
675- linux*) 463- linux*)
676- case $CC in
677- icc|ecc)
678+ linux* | k*bsd*-gnu) 464+ linux* | k*bsd*-gnu)
679+ case $cc_basename in 465 case $cc_basename in
680+ icc* | ecc*) 466 icc* | ecc*)
681+ wl='-Wl,'
682+ ;;
683+ pgcc | pgf77 | pgf90)
684 wl='-Wl,' 467 wl='-Wl,'
685 ;; 468@@ -100,7 +119,7 @@
686- ccc)
687+ ccc*)
688 wl='-Wl,'
689 ;;
690+ como)
691+ wl='-lopt='
692+ ;;
693+ *)
694+ case `$CC -V 2>&1 | sed 5q` in
695+ *Sun\ C*)
696+ wl='-Wl,'
697+ ;;
698+ esac
699+ ;;
700 esac
701 ;;
702 osf3* | osf4* | osf5*) 469 osf3* | osf4* | osf5*)
703 wl='-Wl,' 470 wl='-Wl,'
704 ;; 471 ;;
@@ -707,7 +474,7 @@ Index: gettext-0.14.1/autoconf-lib-link/config.rpath
707 ;; 474 ;;
708 solaris*) 475 solaris*)
709 wl='-Wl,' 476 wl='-Wl,'
710@@ -91,11 +108,17 @@ 477@@ -108,11 +127,14 @@
711 sunos4*) 478 sunos4*)
712 wl='-Qoption ld ' 479 wl='-Qoption ld '
713 ;; 480 ;;
@@ -720,15 +487,12 @@ Index: gettext-0.14.1/autoconf-lib-link/config.rpath
720+ sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) 487+ sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
721+ wl='-Wl,' 488+ wl='-Wl,'
722+ ;; 489+ ;;
723+ unicos*) 490 unicos*)
724+ wl='-Wl,' 491 wl='-Wl,'
725+ ;;
726 uts4*)
727 ;; 492 ;;
728 esac 493@@ -141,6 +163,10 @@
729@@ -117,6 +140,10 @@ 494 # we just hope/assume this is gcc and not c89 (= MSVC++)
730 with_gnu_ld=no 495 with_gnu_ld=yes
731 fi
732 ;; 496 ;;
733+ interix*) 497+ interix*)
734+ # we just hope/assume this is gcc and not c89 (= MSVC++) 498+ # we just hope/assume this is gcc and not c89 (= MSVC++)
@@ -737,93 +501,21 @@ Index: gettext-0.14.1/autoconf-lib-link/config.rpath
737 openbsd*) 501 openbsd*)
738 with_gnu_ld=no 502 with_gnu_ld=no
739 ;; 503 ;;
740@@ -124,6 +151,12 @@ 504@@ -189,11 +215,11 @@
741
742 ld_shlibs=yes
743 if test "$with_gnu_ld" = yes; then
744+ # Set some defaults for GNU ld with shared library support. These
745+ # are reset later if shared libraries are not supported. Putting them
746+ # here allows them to be overridden if necessary.
747+ # Unlike libtool, we use -rpath here, not --rpath, since the documented
748+ # option of GNU ld is called -rpath, not --rpath.
749+ hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
750 case "$host_os" in
751 aix3* | aix4* | aix5*)
752 # On AIX/PPC, the GNU linker is very broken
753@@ -138,7 +171,7 @@
754 # that the semantics of dynamic libraries on AmigaOS, at least up
755 # to version 4, is to share data among multiple programs linked
756 # with the same dynamic library. Since this doesn't match the
757- # behavior of shared libraries on other platforms, we can use
758+ # behavior of shared libraries on other platforms, we cannot use
759 # them.
760 ld_shlibs=no
761 ;;
762@@ -159,9 +192,20 @@
763 ld_shlibs=no 505 ld_shlibs=no
764 fi 506 fi
765 ;; 507 ;;
508- interix3*)
766+ interix[3-9]*) 509+ interix[3-9]*)
767+ hardcode_direct=no 510 hardcode_direct=no
768+ hardcode_libdir_flag_spec='${wl}-rpath,$libdir' 511 hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
769+ ;;
770+ gnu* | linux* | k*bsd*-gnu)
771+ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
772+ :
773+ else
774+ ld_shlibs=no
775+ fi
776+ ;;
777 netbsd*)
778 ;;
779- solaris* | sysv5*)
780+ solaris*)
781 if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
782 ld_shlibs=no
783 elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
784@@ -170,6 +214,20 @@
785 ld_shlibs=no
786 fi
787 ;;
788+ sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
789+ case `$LD -v 2>&1` in
790+ *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*)
791+ ld_shlibs=no
792+ ;;
793+ *)
794+ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
795+ hardcode_libdir_flag_spec='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`'
796+ else
797+ ld_shlibs=no
798+ fi
799+ ;;
800+ esac
801+ ;;
802 sunos4*)
803 hardcode_direct=yes
804 ;;
805@@ -181,10 +239,8 @@
806 fi
807 ;; 512 ;;
808 esac 513- linux*)
809- if test "$ld_shlibs" = yes; then 514+ gnu* | linux* | k*bsd*-gnu)
810- # Unlike libtool, we use -rpath here, not --rpath, since the documented 515 if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
811- # option of GNU ld is called -rpath, not --rpath. 516 :
812- hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' 517 else
813+ if test "$ld_shlibs" = no; then 518@@ -280,7 +306,7 @@
814+ hardcode_libdir_flag_spec=
815 fi
816 else
817 case "$host_os" in
818@@ -215,6 +271,7 @@
819 break
820 fi
821 done
822+ ;;
823 esac
824 fi
825 hardcode_direct=yes
826@@ -226,7 +283,7 @@
827 strings "$collect2name" | grep resolve_lib_name >/dev/null 519 strings "$collect2name" | grep resolve_lib_name >/dev/null
828 then 520 then
829 # We have reworked collect2 521 # We have reworked collect2
@@ -832,93 +524,16 @@ Index: gettext-0.14.1/autoconf-lib-link/config.rpath
832 else 524 else
833 # We have old collect2 525 # We have old collect2
834 hardcode_direct=unsupported 526 hardcode_direct=unsupported
835@@ -234,6 +291,7 @@ 527@@ -359,7 +385,7 @@
836 hardcode_libdir_flag_spec='-L$libdir'
837 hardcode_libdir_separator=
838 fi
839+ ;;
840 esac
841 fi
842 # Begin _LT_AC_SYS_LIBPATH_AIX.
843@@ -266,7 +324,7 @@
844 # see comment about different semantics on the GNU ld section
845 ld_shlibs=no
846 ;;
847- bsdi4*)
848+ bsdi[45]*)
849 ;;
850 cygwin* | mingw* | pw32*)
851 # When not using gcc, we currently assume that we are using
852@@ -277,8 +335,17 @@
853 libext=lib
854 ;;
855 darwin* | rhapsody*)
856- if $CC -v 2>&1 | grep 'Apple' >/dev/null ; then
857- hardcode_direct=no
858+ hardcode_direct=no
859+ if test "$GCC" = yes ; then
860+ :
861+ else
862+ case $cc_basename in
863+ xlc*)
864+ ;;
865+ *)
866+ ld_shlibs=no
867+ ;;
868+ esac
869 fi
870 ;;
871 dgux*)
872@@ -295,7 +362,7 @@
873 hardcode_direct=yes 528 hardcode_direct=yes
874 hardcode_minus_L=yes 529 hardcode_minus_L=yes
875 ;; 530 ;;
876- freebsd*) 531- freebsd* | kfreebsd*-gnu | dragonfly*)
877+ freebsd* | dragonfly*) 532+ freebsd* | dragonfly*)
878 hardcode_libdir_flag_spec='-R$libdir' 533 hardcode_libdir_flag_spec='-R$libdir'
879 hardcode_direct=yes 534 hardcode_direct=yes
880 ;; 535 ;;
881@@ -307,24 +374,25 @@ 536@@ -412,18 +438,22 @@
882 # but as the default location of the library.
883 hardcode_minus_L=yes
884 ;;
885- hpux10* | hpux11*)
886+ hpux10*)
887 if test "$with_gnu_ld" = no; then
888- case "$host_cpu" in
889- hppa*64*)
890- hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
891- hardcode_libdir_separator=:
892- hardcode_direct=no
893- ;;
894- ia64*)
895- hardcode_libdir_flag_spec='-L$libdir'
896+ hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
897+ hardcode_libdir_separator=:
898+ hardcode_direct=yes
899+ # hardcode_minus_L: Not really in the search PATH,
900+ # but as the default location of the library.
901+ hardcode_minus_L=yes
902+ fi
903+ ;;
904+ hpux11*)
905+ if test "$with_gnu_ld" = no; then
906+ hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
907+ hardcode_libdir_separator=:
908+ case $host_cpu in
909+ hppa*64*|ia64*)
910 hardcode_direct=no
911- # hardcode_minus_L: Not really in the search PATH,
912- # but as the default location of the library.
913- hardcode_minus_L=yes
914 ;;
915 *)
916- hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
917- hardcode_libdir_separator=:
918 hardcode_direct=yes
919 # hardcode_minus_L: Not really in the search PATH,
920 # but as the default location of the library.
921@@ -347,18 +415,22 @@
922 hardcode_libdir_separator=: 537 hardcode_libdir_separator=:
923 ;; 538 ;;
924 openbsd*) 539 openbsd*)
@@ -952,35 +567,16 @@ Index: gettext-0.14.1/autoconf-lib-link/config.rpath
952 fi 567 fi
953 ;; 568 ;;
954 os2*) 569 os2*)
955@@ -378,8 +450,6 @@ 570@@ -471,7 +501,7 @@
956 fi
957 hardcode_libdir_separator=:
958 ;;
959- sco3.2v5*)
960- ;;
961 solaris*)
962 hardcode_libdir_flag_spec='-R$libdir'
963 ;;
964@@ -408,14 +478,11 @@
965 ld_shlibs=yes 571 ld_shlibs=yes
966 fi 572 fi
967 ;; 573 ;;
968- sysv4.2uw2*) 574- sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7*)
969- hardcode_direct=yes 575+ sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* |sco3.2v5.0.[024]*)
970- hardcode_minus_L=no
971- ;;
972- sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[78]* | unixware7*)
973+ sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)
974 ;; 576 ;;
975- sysv5*) 577 sysv5* | sco3.2v5* | sco5v6*)
976- hardcode_libdir_flag_spec= 578 hardcode_libdir_flag_spec='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
977+ sysv5* | sco3.2v5* | sco5v6*) 579@@ -488,33 +518,51 @@
978+ hardcode_libdir_flag_spec='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
979+ hardcode_libdir_separator=':'
980 ;;
981 uts4*)
982 hardcode_libdir_flag_spec='-L$libdir'
983@@ -428,34 +495,54 @@
984 580
985 # Check dynamic linker characteristics 581 # Check dynamic linker characteristics
986 # Code taken from libtool.m4's AC_LIBTOOL_SYS_DYNAMIC_LINKER. 582 # Code taken from libtool.m4's AC_LIBTOOL_SYS_DYNAMIC_LINKER.
@@ -1003,8 +599,7 @@ Index: gettext-0.14.1/autoconf-lib-link/config.rpath
1003 beos*) 599 beos*)
1004+ library_names_spec='$libname$shrext' 600+ library_names_spec='$libname$shrext'
1005 ;; 601 ;;
1006- bsdi4*) 602 bsdi[45]*)
1007+ bsdi[45]*)
1008+ library_names_spec='$libname$shrext' 603+ library_names_spec='$libname$shrext'
1009 ;; 604 ;;
1010 cygwin* | mingw* | pw32*) 605 cygwin* | mingw* | pw32*)
@@ -1020,8 +615,9 @@ Index: gettext-0.14.1/autoconf-lib-link/config.rpath
1020 ;; 615 ;;
1021 freebsd1*) 616 freebsd1*)
1022 ;; 617 ;;
1023- freebsd*) 618- kfreebsd*-gnu)
1024+ freebsd* | dragonfly*) 619- ;;
620 freebsd* | dragonfly*)
1025+ case "$host_os" in 621+ case "$host_os" in
1026+ freebsd[123]*) 622+ freebsd[123]*)
1027+ library_names_spec='$libname$shrext$versuffix' ;; 623+ library_names_spec='$libname$shrext$versuffix' ;;
@@ -1033,17 +629,14 @@ Index: gettext-0.14.1/autoconf-lib-link/config.rpath
1033+ library_names_spec='$libname$shrext' 629+ library_names_spec='$libname$shrext'
1034 ;; 630 ;;
1035 hpux9* | hpux10* | hpux11*) 631 hpux9* | hpux10* | hpux11*)
1036- case "$host_cpu" in 632 case $host_cpu in
1037+ case $host_cpu in 633@@ -528,10 +576,13 @@
1038 ia64*)
1039 shrext=.so
1040 ;;
1041@@ -466,8 +553,13 @@
1042 shrext=.sl 634 shrext=.sl
1043 ;; 635 ;;
1044 esac 636 esac
1045+ library_names_spec='$libname$shrext' 637+ library_names_spec='$libname$shrext'
1046+ ;; 638 ;;
639- interix3*)
1047+ interix[3-9]*) 640+ interix[3-9]*)
1048+ library_names_spec='$libname$shrext' 641+ library_names_spec='$libname$shrext'
1049 ;; 642 ;;
@@ -1052,15 +645,15 @@ Index: gettext-0.14.1/autoconf-lib-link/config.rpath
1052 case "$host_os" in 645 case "$host_os" in
1053 irix5* | nonstopux*) 646 irix5* | nonstopux*)
1054 libsuff= shlibsuff= 647 libsuff= shlibsuff=
1055@@ -484,42 +576,62 @@ 648@@ -548,33 +599,46 @@
1056 ;; 649 ;;
1057 linux*oldld* | linux*aout* | linux*coff*) 650 linux*oldld* | linux*aout* | linux*coff*)
1058 ;; 651 ;;
1059- linux*) 652- linux*)
1060+ linux* | k*bsd*-gnu) 653+ linux* | k*bsd*-gnu)
1061+ library_names_spec='$libname$shrext' 654+ library_names_spec='$libname$shrext'
1062+ ;; 655 ;;
1063+ knetbsd*-gnu) 656 knetbsd*-gnu)
1064+ library_names_spec='$libname$shrext' 657+ library_names_spec='$libname$shrext'
1065 ;; 658 ;;
1066 netbsd*) 659 netbsd*)
@@ -1069,8 +662,7 @@ Index: gettext-0.14.1/autoconf-lib-link/config.rpath
1069 newsos6) 662 newsos6)
1070+ library_names_spec='$libname$shrext' 663+ library_names_spec='$libname$shrext'
1071 ;; 664 ;;
1072- nto-qnx) 665 nto-qnx*)
1073+ nto-qnx*)
1074+ library_names_spec='$libname$shrext' 666+ library_names_spec='$libname$shrext'
1075 ;; 667 ;;
1076 openbsd*) 668 openbsd*)
@@ -1084,30 +676,24 @@ Index: gettext-0.14.1/autoconf-lib-link/config.rpath
1084 osf3* | osf4* | osf5*) 676 osf3* | osf4* | osf5*)
1085+ library_names_spec='$libname$shrext' 677+ library_names_spec='$libname$shrext'
1086 ;; 678 ;;
1087- sco3.2v5*)
1088+ rdos*)
1089 ;;
1090 solaris*) 679 solaris*)
1091+ library_names_spec='$libname$shrext' 680+ library_names_spec='$libname$shrext'
1092 ;; 681 ;;
1093 sunos4*) 682 sunos4*)
1094+ library_names_spec='$libname$shrext$versuffix' 683+ library_names_spec='$libname$shrext$versuffix'
1095 ;; 684 ;;
1096- sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) 685 sysv4 | sysv4.3*)
1097+ sysv4 | sysv4.3*)
1098+ library_names_spec='$libname$shrext' 686+ library_names_spec='$libname$shrext'
1099 ;; 687 ;;
1100 sysv4*MP*) 688 sysv4*MP*)
1101+ library_names_spec='$libname$shrext' 689+ library_names_spec='$libname$shrext'
1102+ ;; 690 ;;
1103+ sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) 691 sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
1104+ library_names_spec='$libname$shrext' 692+ library_names_spec='$libname$shrext'
1105 ;; 693 ;;
1106 uts4*) 694 uts4*)
1107+ library_names_spec='$libname$shrext'
1108 ;; 695 ;;
1109 esac 696@@ -583,6 +647,8 @@
1110
1111 sed_quote_subst='s/\(["`$\\]\)/\\\1/g' 697 sed_quote_subst='s/\(["`$\\]\)/\\\1/g'
1112 escaped_wl=`echo "X$wl" | sed -e 's/^X//' -e "$sed_quote_subst"` 698 escaped_wl=`echo "X$wl" | sed -e 's/^X//' -e "$sed_quote_subst"`
1113 shlibext=`echo "$shrext" | sed -e 's,^\.,,'` 699 shlibext=`echo "$shrext" | sed -e 's,^\.,,'`
@@ -1115,12 +701,8 @@ Index: gettext-0.14.1/autoconf-lib-link/config.rpath
1115+escaped_library_names_spec=`echo "X$library_names_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"`
1116 escaped_hardcode_libdir_flag_spec=`echo "X$hardcode_libdir_flag_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"`
1117 703
1118-sed -e 's/^\([a-zA-Z0-9_]*\)=/acl_cv_\1=/' <<EOF 704 LC_ALL=C sed -e 's/^\([a-zA-Z0-9_]*\)=/acl_cv_\1=/' <<EOF
1119+LC_ALL=C sed -e 's/^\([a-zA-Z0-9_]*\)=/acl_cv_\1=/' <<EOF 705@@ -596,6 +662,12 @@
1120
1121 # How to pass a linker flag through the compiler.
1122 wl="$escaped_wl"
1123@@ -530,6 +642,12 @@
1124 # Shared library suffix (normally "so"). 706 # Shared library suffix (normally "so").
1125 shlibext="$shlibext" 707 shlibext="$shlibext"
1126 708
diff --git a/meta/recipes-core/gettext/gettext_0.14.1.bb b/meta/recipes-core/gettext/gettext_0.16.1.bb
index 90756bcb28..754b0ad187 100644
--- a/meta/recipes-core/gettext/gettext_0.14.1.bb
+++ b/meta/recipes-core/gettext/gettext_0.16.1.bb
@@ -2,9 +2,9 @@ DESCRIPTION = "The GNU internationalization library."
2HOMEPAGE = "http://www.gnu.org/software/gettext/gettext.html" 2HOMEPAGE = "http://www.gnu.org/software/gettext/gettext.html"
3SECTION = "libs" 3SECTION = "libs"
4LICENSE = "GPLv2" 4LICENSE = "GPLv2"
5LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3" 5LIC_FILES_CHKSUM = "file://COPYING;md5=9ea3144f04c41cd2eada5d3f472e6ea5"
6 6
7PR = "r11" 7PR = "r3"
8DEPENDS = "virtual/libiconv" 8DEPENDS = "virtual/libiconv"
9DEPENDS_virtclass-native = "" 9DEPENDS_virtclass-native = ""
10PROVIDES = "virtual/libintl" 10PROVIDES = "virtual/libintl"
@@ -12,24 +12,26 @@ PROVIDES_virtclass-native = ""
12 12
13SRC_URI = "${GNU_MIRROR}/gettext/gettext-${PV}.tar.gz \ 13SRC_URI = "${GNU_MIRROR}/gettext/gettext-${PV}.tar.gz \
14 file://gettext-vpath.patch \ 14 file://gettext-vpath.patch \
15 file://fixchicken.patch \
16 file://linklib_from_0.17.patch \ 15 file://linklib_from_0.17.patch \
17 file://getline.m4.patch \ 16 file://gettext-autoconf-lib-link-no-L.patch \
18 file://disable_java.patch" 17 file://disable_java.patch \
18 file://fix_aclocal_version.patch \
19 file://fix_gnu_source_circular.patch \
20 file://hardcode_macro_version.patch \
21 "
19 22
20# file://gettext-autoconf-lib-link-no-L.patch
21 23
22SRC_URI_append_linux-uclibc = " file://gettext-error_print_progname.patch" 24SRC_URI_append_linux-uclibc = " file://gettext-error_print_progname.patch"
23SRC_URI_append_linux-uclibceabi = " file://gettext-error_print_progname.patch" 25SRC_URI_append_linux-uclibceabi = " file://gettext-error_print_progname.patch"
24 26
25SRC_URI[md5sum] = "78f4b862510beb2e5d43223dd610e77d" 27SRC_URI[md5sum] = "3d9ad24301c6d6b17ec30704a13fe127"
26SRC_URI[sha256sum] = "41f20c469c7759acb34cfa7e0b3cac9096d59a58ad800e471f07424a8e7adbb7" 28SRC_URI[sha256sum] = "0bf850d1a079fb5a61f0a47b1a9efd35eb44032255375e1cedb0253bc27b376d"
27 29
28PARALLEL_MAKE = "" 30PARALLEL_MAKE = ""
29 31
30inherit autotools 32inherit autotools
31 33
32EXTRA_OECONF += "--without-lisp --disable-csharp" 34EXTRA_OECONF += "--without-lisp --disable-csharp --disable-openmp"
33acpaths = '-I ${S}/autoconf-lib-link/m4/ \ 35acpaths = '-I ${S}/autoconf-lib-link/m4/ \
34 -I ${S}/gettext-runtime/m4 \ 36 -I ${S}/gettext-runtime/m4 \
35 -I ${S}/gettext-tools/m4' 37 -I ${S}/gettext-tools/m4'
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-05-02 07:34:47 +0000