summaryrefslogtreecommitdiffstats
path: root/meta/packages
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@linux.intel.com>2010-10-09 15:05:09 +0100
committerRichard Purdie <rpurdie@linux.intel.com>2010-10-09 15:05:09 +0100
commit939e2fe270553ac4675520adeaf23761e856c468 (patch)
tree966942ac34f8d449478f6cbe2e77982398c97e31 /meta/packages
parent530fb7fdea401fd33e4ef90a7ee411f675a4a20c (diff)
downloadpoky-939e2fe270553ac4675520adeaf23761e856c468.tar.gz
gettext: Move files to the correct place
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'meta/packages')
-rw-r--r--meta/packages/gettext/files/gettext-autoconf-lib-link-no-L.patch12
-rw-r--r--meta/packages/gettext/gettext-0.14.1/disable_java.patch37
-rw-r--r--meta/packages/gettext/gettext-0.14.1/fixchicken.patch30
-rw-r--r--meta/packages/gettext/gettext-0.14.1/getline.m4.patch36
-rw-r--r--meta/packages/gettext/gettext-0.14.1/gettext-error_print_progname.patch16
-rw-r--r--meta/packages/gettext/gettext-0.14.1/gettext-vpath.patch15
-rw-r--r--meta/packages/gettext/gettext-0.14.1/linklib_from_0.17.patch1135
-rw-r--r--meta/packages/gettext/gettext_0.14.1.bb52
8 files changed, 0 insertions, 1333 deletions
diff --git a/meta/packages/gettext/files/gettext-autoconf-lib-link-no-L.patch b/meta/packages/gettext/files/gettext-autoconf-lib-link-no-L.patch
deleted file mode 100644
index 2fe62c0e19..0000000000
--- a/meta/packages/gettext/files/gettext-autoconf-lib-link-no-L.patch
+++ /dev/null
@@ -1,12 +0,0 @@
1--- 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
3@@ -267,6 +267,9 @@
4 fi
5 fi
6 fi
7+ dnl Just let the compiler find the library, the compiler and user are smarter then this script
8+ dnl when cross compiling and working with a relocated install.
9+ found_dir=""
10 if test "X$found_dir" = "X"; then
11 for x in $LDFLAGS $LTLIB[]NAME; do
12 AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
diff --git a/meta/packages/gettext/gettext-0.14.1/disable_java.patch b/meta/packages/gettext/gettext-0.14.1/disable_java.patch
deleted file mode 100644
index f1ae816f37..0000000000
--- a/meta/packages/gettext/gettext-0.14.1/disable_java.patch
+++ /dev/null
@@ -1,37 +0,0 @@
1# Pulled from OpenEmbedded
2#
3# Commented by: Saul Wold <saul.wold@intel.com>
4
5Index: gettext-0.14.1/gettext-tools/configure.ac
6===================================================================
7--- gettext-0.14.1.orig/gettext-tools/configure.ac 2004-01-16 10:49:06.000000000 +0000
8+++ gettext-0.14.1/gettext-tools/configure.ac 2007-11-14 21:43:39.000000000 +0000
9@@ -37,28 +37,16 @@
10 AC_PROG_YACC
11
12 gt_GCJ
13-if test -n "$HAVE_GCJ"; then
14- BUILDJAVAEXE=yes
15-else
16 BUILDJAVAEXE=no
17-fi
18 AC_SUBST(BUILDJAVAEXE)
19
20 gt_JAVACOMP
21 AC_CHECK_PROG(JAR, jar, jar)
22-if test -n "$HAVE_JAVACOMP" && test -n "$JAR"; then
23- BUILDJAVA=yes
24-else
25 BUILDJAVA=no
26-fi
27 AC_SUBST(BUILDJAVA)
28
29 gt_JAVAEXEC
30-if test -n "$HAVE_JAVAEXEC" && test $BUILDJAVA = yes; then
31- TESTJAVA=yes
32-else
33 TESTJAVA=no
34-fi
35 AC_SUBST(TESTJAVA)
36
37 gt_CSHARPCOMP
diff --git a/meta/packages/gettext/gettext-0.14.1/fixchicken.patch b/meta/packages/gettext/gettext-0.14.1/fixchicken.patch
deleted file mode 100644
index ef51056674..0000000000
--- a/meta/packages/gettext/gettext-0.14.1/fixchicken.patch
+++ /dev/null
@@ -1,30 +0,0 @@
1# Pulled from OpenEmbedded
2#
3# Commented by: Saul Wold <saul.wold@intel.com>
4
5Index: gettext-tools/m4/csharpcomp.m4
6===================================================================
7RCS file: /cvs/gettext/gettext/gettext-tools/m4/csharpcomp.m4,v
8retrieving revision 1.4
9retrieving revision 1.6
10diff -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/packages/gettext/gettext-0.14.1/getline.m4.patch b/meta/packages/gettext/gettext-0.14.1/getline.m4.patch
deleted file mode 100644
index f71d0e1d82..0000000000
--- a/meta/packages/gettext/gettext-0.14.1/getline.m4.patch
+++ /dev/null
@@ -1,36 +0,0 @@
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/packages/gettext/gettext-0.14.1/gettext-error_print_progname.patch b/meta/packages/gettext/gettext-0.14.1/gettext-error_print_progname.patch
deleted file mode 100644
index 96a2196a68..0000000000
--- a/meta/packages/gettext/gettext-0.14.1/gettext-error_print_progname.patch
+++ /dev/null
@@ -1,16 +0,0 @@
1# Pulled from OpenEmbedded
2#
3# Commented by: Saul Wold <saul.wold@intel.com>
4
5diff -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/packages/gettext/gettext-0.14.1/gettext-vpath.patch b/meta/packages/gettext/gettext-0.14.1/gettext-vpath.patch
deleted file mode 100644
index e31243b066..0000000000
--- a/meta/packages/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/packages/gettext/gettext-0.14.1/linklib_from_0.17.patch b/meta/packages/gettext/gettext-0.14.1/linklib_from_0.17.patch
deleted file mode 100644
index f4ae8467d7..0000000000
--- a/meta/packages/gettext/gettext-0.14.1/linklib_from_0.17.patch
+++ /dev/null
@@ -1,1135 +0,0 @@
1# Pulled from OpenEmbedded
2#
3# Commented by: Saul Wold <saul.wold@intel.com>
4
5Index: gettext-0.14.1/autoconf-lib-link/m4/lib-ld.m4
6===================================================================
7--- gettext-0.14.1.orig/autoconf-lib-link/m4/lib-ld.m4 2008-04-15 14:32:45.000000000 +0100
8+++ gettext-0.14.1/autoconf-lib-link/m4/lib-ld.m4 2008-04-15 14:32:47.000000000 +0100
9@@ -1,10 +1,8 @@
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
41 dnl From Bruno Haible.
42
43+AC_PREREQ(2.54)
44+
45 dnl AC_LIB_LINKFLAGS(name [, dependencies]) searches for libname and
46 dnl the libraries corresponding to explicit and implicit dependencies.
47 dnl Sets and AC_SUBSTs the LIB${NAME} and LTLIB${NAME} variables and
48 dnl augments the CPPFLAGS variable.
49+dnl Sets and AC_SUBSTs the LIB${NAME}_PREFIX variable to nonempty if libname
50+dnl was found in ${LIB${NAME}_PREFIX}/$acl_libdirstem.
51 AC_DEFUN([AC_LIB_LINKFLAGS],
52 [
53 AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
54@@ -24,13 +26,16 @@
55 ac_cv_lib[]Name[]_libs="$LIB[]NAME"
56 ac_cv_lib[]Name[]_ltlibs="$LTLIB[]NAME"
57 ac_cv_lib[]Name[]_cppflags="$INC[]NAME"
58+ ac_cv_lib[]Name[]_prefix="$LIB[]NAME[]_PREFIX"
59 ])
60 LIB[]NAME="$ac_cv_lib[]Name[]_libs"
61 LTLIB[]NAME="$ac_cv_lib[]Name[]_ltlibs"
62 INC[]NAME="$ac_cv_lib[]Name[]_cppflags"
63+ LIB[]NAME[]_PREFIX="$ac_cv_lib[]Name[]_prefix"
64 AC_LIB_APPENDTOVAR([CPPFLAGS], [$INC]NAME)
65 AC_SUBST([LIB]NAME)
66 AC_SUBST([LTLIB]NAME)
67+ AC_SUBST([LIB]NAME[_PREFIX])
68 dnl Also set HAVE_LIB[]NAME so that AC_LIB_HAVE_LINKFLAGS can reuse the
69 dnl results of this search when this library appears as a dependency.
70 HAVE_LIB[]NAME=yes
71@@ -46,6 +51,8 @@
72 dnl LTLIB${NAME} variables and augments the CPPFLAGS variable, and
73 dnl #defines HAVE_LIB${NAME} to 1. Otherwise, it sets and AC_SUBSTs
74 dnl HAVE_LIB${NAME}=no and LIB${NAME} and LTLIB${NAME} to empty.
75+dnl Sets and AC_SUBSTs the LIB${NAME}_PREFIX variable to nonempty if libname
76+dnl was found in ${LIB${NAME}_PREFIX}/$acl_libdirstem.
77 AC_DEFUN([AC_LIB_HAVE_LINKFLAGS],
78 [
79 AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
80@@ -82,19 +89,27 @@
81 CPPFLAGS="$ac_save_CPPFLAGS"
82 LIB[]NAME=
83 LTLIB[]NAME=
84+ LIB[]NAME[]_PREFIX=
85 fi
86 AC_SUBST([HAVE_LIB]NAME)
87 AC_SUBST([LIB]NAME)
88 AC_SUBST([LTLIB]NAME)
89+ AC_SUBST([LIB]NAME[_PREFIX])
90 undefine([Name])
91 undefine([NAME])
92 ])
93
94 dnl Determine the platform dependent parameters needed to use rpath:
95-dnl libext, shlibext, hardcode_libdir_flag_spec, hardcode_libdir_separator,
96-dnl hardcode_direct, hardcode_minus_L.
97+dnl acl_libext,
98+dnl acl_shlibext,
99+dnl acl_hardcode_libdir_flag_spec,
100+dnl acl_hardcode_libdir_separator,
101+dnl acl_hardcode_direct,
102+dnl acl_hardcode_minus_L.
103 AC_DEFUN([AC_LIB_RPATH],
104 [
105+ 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])])
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
112 ])
113 wl="$acl_cv_wl"
114- libext="$acl_cv_libext"
115- shlibext="$acl_cv_shlibext"
116- hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec"
117- hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator"
118- hardcode_direct="$acl_cv_hardcode_direct"
119- hardcode_minus_L="$acl_cv_hardcode_minus_L"
120+ acl_libext="$acl_cv_libext"
121+ acl_shlibext="$acl_cv_shlibext"
122+ acl_libname_spec="$acl_cv_libname_spec"
123+ acl_library_names_spec="$acl_cv_library_names_spec"
124+ acl_hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec"
125+ acl_hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator"
126+ acl_hardcode_direct="$acl_cv_hardcode_direct"
127+ acl_hardcode_minus_L="$acl_cv_hardcode_minus_L"
128 dnl Determine whether the user wants rpath handling at all.
129 AC_ARG_ENABLE(rpath,
130 [ --disable-rpath do not hardcode runtime library paths],
131@@ -122,19 +139,24 @@
132 dnl AC_LIB_LINKFLAGS_BODY(name [, dependencies]) searches for libname and
133 dnl the libraries corresponding to explicit and implicit dependencies.
134 dnl Sets the LIB${NAME}, LTLIB${NAME} and INC${NAME} variables.
135+dnl Also, sets the LIB${NAME}_PREFIX variable to nonempty if libname was found
136+dnl in ${LIB${NAME}_PREFIX}/$acl_libdirstem.
137 AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
138 [
139+ AC_REQUIRE([AC_LIB_PREPARE_MULTILIB])
140 define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
141 [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
142+ dnl Autoconf >= 2.61 supports dots in --with options.
143+ define([N_A_M_E],[m4_if(m4_version_compare(m4_defn([m4_PACKAGE_VERSION]),[2.61]),[-1],[translit([$1],[.],[_])],[$1])])
144 dnl By default, look in $includedir and $libdir.
145 use_additional=yes
146 AC_LIB_WITH_FINAL_PREFIX([
147 eval additional_includedir=\"$includedir\"
148 eval additional_libdir=\"$libdir\"
149 ])
150- AC_LIB_ARG_WITH([lib$1-prefix],
151-[ --with-lib$1-prefix[=DIR] search for lib$1 in DIR/include and DIR/lib
152- --without-lib$1-prefix don't search for lib$1 in includedir and libdir],
153+ AC_LIB_ARG_WITH([lib]N_A_M_E[-prefix],
154+[ --with-lib]N_A_M_E[-prefix[=DIR] search for lib$1 in DIR/include and DIR/lib
155+ --without-lib]N_A_M_E[-prefix don't search for lib$1 in includedir and libdir],
156 [
157 if test "X$withval" = "Xno"; then
158 use_additional=no
159@@ -146,7 +168,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=
170 LTLIB[]NAME=
171 INC[]NAME=
172+ LIB[]NAME[]_PREFIX=
173 rpathdirs=
174 ltrpathdirs=
175 names_already_handled=
176@@ -194,22 +217,55 @@
177 found_la=
178 found_so=
179 found_a=
180+ eval libname=\"$acl_libname_spec\" # typically: libname=lib$name
181+ if test -n "$acl_shlibext"; then
182+ shrext=".$acl_shlibext" # typically: shrext=.so
183+ else
184+ shrext=
185+ fi
186 if test $use_additional = yes; then
187- if test -n "$shlibext" && test -f "$additional_libdir/lib$name.$shlibext"; then
188- found_dir="$additional_libdir"
189- found_so="$additional_libdir/lib$name.$shlibext"
190- if test -f "$additional_libdir/lib$name.la"; then
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"
200+ dnl The same code as in the loop below:
201+ dnl First look for a shared library.
202+ if test -n "$acl_shlibext"; then
203+ if test -f "$dir/$libname$shrext"; then
204+ found_dir="$dir"
205+ found_so="$dir/$libname$shrext"
206+ else
207+ if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then
208+ ver=`(cd "$dir" && \
209+ for f in "$libname$shrext".*; do echo "$f"; done \
210+ | sed -e "s,^$libname$shrext\\\\.,," \
211+ | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \
212+ | sed 1q ) 2>/dev/null`
213+ if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then
214+ found_dir="$dir"
215+ found_so="$dir/$libname$shrext.$ver"
216+ fi
217+ else
218+ eval library_names=\"$acl_library_names_spec\"
219+ for f in $library_names; do
220+ if test -f "$dir/$f"; then
221+ found_dir="$dir"
222+ found_so="$dir/$f"
223+ break
224+ fi
225+ done
226 fi
227 fi
228 fi
229+ dnl Then look for a static library.
230+ if test "X$found_dir" = "X"; then
231+ if test -f "$dir/$libname.$acl_libext"; then
232+ found_dir="$dir"
233+ found_a="$dir/$libname.$acl_libext"
234+ fi
235+ fi
236+ if test "X$found_dir" != "X"; then
237+ if test -f "$dir/$libname.la"; then
238+ found_la="$dir/$libname.la"
239+ fi
240+ fi
241 fi
242 if test "X$found_dir" = "X"; then
243 for x in $LDFLAGS $LTLIB[]NAME; do
244@@ -217,21 +273,46 @@
245 case "$x" in
246 -L*)
247 dir=`echo "X$x" | sed -e 's/^X-L//'`
248- if test -n "$shlibext" && test -f "$dir/lib$name.$shlibext"; then
249- found_dir="$dir"
250- found_so="$dir/lib$name.$shlibext"
251- if test -f "$dir/lib$name.la"; then
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.
257+ if test -n "$acl_shlibext"; then
258+ if test -f "$dir/$libname$shrext"; then
259 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"
264+ else
265+ if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then
266+ ver=`(cd "$dir" && \
267+ for f in "$libname$shrext".*; do echo "$f"; done \
268+ | sed -e "s,^$libname$shrext\\\\.,," \
269+ | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \
270+ | sed 1q ) 2>/dev/null`
271+ if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then
272+ found_dir="$dir"
273+ found_so="$dir/$libname$shrext.$ver"
274+ fi
275+ else
276+ eval library_names=\"$acl_library_names_spec\"
277+ for f in $library_names; do
278+ if test -f "$dir/$f"; then
279+ found_dir="$dir"
280+ found_so="$dir/$f"
281+ break
282+ fi
283+ done
284 fi
285 fi
286 fi
287+ dnl Then look for a static library.
288+ if test "X$found_dir" = "X"; then
289+ if test -f "$dir/$libname.$acl_libext"; then
290+ found_dir="$dir"
291+ found_a="$dir/$libname.$acl_libext"
292+ fi
293+ fi
294+ if test "X$found_dir" != "X"; then
295+ if test -f "$dir/$libname.la"; then
296+ found_la="$dir/$libname.la"
297+ fi
298+ fi
299 ;;
300 esac
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"
313 fi
314 dnl The hardcoding into $LIBNAME is system dependent.
315- if test "$hardcode_direct" = yes; then
316+ if test "$acl_hardcode_direct" = yes; then
317 dnl Using DIR/libNAME.so during linking hardcodes DIR into the
318 dnl resulting binary.
319 LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
320 else
321- if test -n "$hardcode_libdir_flag_spec" && test "$hardcode_minus_L" = no; then
322+ if test -n "$acl_hardcode_libdir_flag_spec" && test "$acl_hardcode_minus_L" = no; then
323 dnl Use an explicit option to hardcode DIR into the resulting
324 dnl binary.
325 LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
326@@ -301,13 +382,13 @@
327 if test -z "$haveit"; then
328 LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir"
329 fi
330- if test "$hardcode_minus_L" != no; then
331+ if test "$acl_hardcode_minus_L" != no; then
332 dnl FIXME: Not sure whether we should use
333 dnl "-L$found_dir -l$name" or "-L$found_dir $found_so"
334 dnl here.
335 LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
336 else
337- dnl We cannot use $hardcode_runpath_var and LD_RUN_PATH
338+ dnl We cannot use $acl_hardcode_runpath_var and LD_RUN_PATH
339 dnl here, because this doesn't fit in flags passed to the
340 dnl compiler. So give up. No hardcoding. This affects only
341 dnl very old systems.
342@@ -332,8 +413,9 @@
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
381 done
382 if test "X$rpathdirs" != "X"; then
383- if test -n "$hardcode_libdir_separator"; then
384+ if test -n "$acl_hardcode_libdir_separator"; then
385 dnl Weird platform: only the last -rpath option counts, the user must
386 dnl pass all path elements in one option. We can arrange that for a
387 dnl single library, but not when more than one $LIBNAMEs are used.
388 alldirs=
389 for found_dir in $rpathdirs; do
390- alldirs="${alldirs}${alldirs:+$hardcode_libdir_separator}$found_dir"
391+ alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$found_dir"
392 done
393- dnl Note: hardcode_libdir_flag_spec uses $libdir and $wl.
394+ dnl Note: acl_hardcode_libdir_flag_spec uses $libdir and $wl.
395 acl_save_libdir="$libdir"
396 libdir="$alldirs"
397- eval flag=\"$hardcode_libdir_flag_spec\"
398+ eval flag=\"$acl_hardcode_libdir_flag_spec\"
399 libdir="$acl_save_libdir"
400 LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag"
401 else
402@@ -514,7 +596,7 @@
403 for found_dir in $rpathdirs; do
404 acl_save_libdir="$libdir"
405 libdir="$found_dir"
406- eval flag=\"$hardcode_libdir_flag_spec\"
407+ eval flag=\"$acl_hardcode_libdir_flag_spec\"
408 libdir="$acl_save_libdir"
409 LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag"
410 done
411@@ -549,3 +631,79 @@
412 fi
413 done
414 ])
415+
416+dnl For those cases where a variable contains several -L and -l options
417+dnl referring to unknown libraries and directories, this macro determines the
418+dnl necessary additional linker options for the runtime path.
419+dnl AC_LIB_LINKFLAGS_FROM_LIBS([LDADDVAR], [LIBSVALUE], [USE-LIBTOOL])
420+dnl sets LDADDVAR to linker options needed together with LIBSVALUE.
421+dnl If USE-LIBTOOL evaluates to non-empty, linking with libtool is assumed,
422+dnl otherwise linking without libtool is assumed.
423+AC_DEFUN([AC_LIB_LINKFLAGS_FROM_LIBS],
424+[
425+ AC_REQUIRE([AC_LIB_RPATH])
426+ AC_REQUIRE([AC_LIB_PREPARE_MULTILIB])
427+ $1=
428+ if test "$enable_rpath" != no; then
429+ if test -n "$acl_hardcode_libdir_flag_spec" && test "$acl_hardcode_minus_L" = no; then
430+ dnl Use an explicit option to hardcode directories into the resulting
431+ dnl binary.
432+ rpathdirs=
433+ next=
434+ for opt in $2; do
435+ if test -n "$next"; then
436+ dir="$next"
437+ dnl No need to hardcode the standard /usr/lib.
438+ if test "X$dir" != "X/usr/$acl_libdirstem"; then
439+ rpathdirs="$rpathdirs $dir"
440+ fi
441+ next=
442+ else
443+ case $opt in
444+ -L) next=yes ;;
445+ -L*) dir=`echo "X$opt" | sed -e 's,^X-L,,'`
446+ dnl No need to hardcode the standard /usr/lib.
447+ if test "X$dir" != "X/usr/$acl_libdirstem"; then
448+ rpathdirs="$rpathdirs $dir"
449+ fi
450+ next= ;;
451+ *) next= ;;
452+ esac
453+ fi
454+ done
455+ if test "X$rpathdirs" != "X"; then
456+ if test -n ""$3""; then
457+ dnl libtool is used for linking. Use -R options.
458+ for dir in $rpathdirs; do
459+ $1="${$1}${$1:+ }-R$dir"
460+ done
461+ else
462+ dnl The linker is used for linking directly.
463+ if test -n "$acl_hardcode_libdir_separator"; then
464+ dnl Weird platform: only the last -rpath option counts, the user
465+ dnl must pass all path elements in one option.
466+ alldirs=
467+ for dir in $rpathdirs; do
468+ alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$dir"
469+ done
470+ acl_save_libdir="$libdir"
471+ libdir="$alldirs"
472+ eval flag=\"$acl_hardcode_libdir_flag_spec\"
473+ libdir="$acl_save_libdir"
474+ $1="$flag"
475+ else
476+ dnl The -rpath options are cumulative.
477+ for dir in $rpathdirs; do
478+ acl_save_libdir="$libdir"
479+ libdir="$dir"
480+ eval flag=\"$acl_hardcode_libdir_flag_spec\"
481+ libdir="$acl_save_libdir"
482+ $1="${$1}${$1:+ }$flag"
483+ done
484+ fi
485+ fi
486+ fi
487+ fi
488+ fi
489+ AC_SUBST([$1])
490+])
491Index: gettext-0.14.1/autoconf-lib-link/m4/lib-prefix.m4
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===================================================================
592--- gettext-0.14.1.orig/autoconf-lib-link/config.rpath 2008-04-15 14:32:51.000000000 +0100
593+++ gettext-0.14.1/autoconf-lib-link/config.rpath 2007-06-28 00:01:49.000000000 +0100
594@@ -2,28 +2,13 @@
595 # Output a system dependent set of variables, describing how to set the
596 # run time search path of shared libraries in an executable.
597 #
598-# Copyright 1996-2003 Free Software Foundation, Inc.
599+# Copyright 1996-2007 Free Software Foundation, Inc.
600 # Taken from GNU libtool, 2001
601 # Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
602 #
603-# This program is free software; you can redistribute it and/or modify
604-# it under the terms of the GNU General Public License as published by
605-# the Free Software Foundation; either version 2 of the License, or
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
640+# Code taken from libtool.m4's _LT_CC_BASENAME.
641+
642+for cc_temp in $CC""; do
643+ case $cc_temp in
644+ compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
645+ distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
646+ \-*) ;;
647+ *) break;;
648+ esac
649+done
650+cc_basename=`echo "$cc_temp" | sed -e 's%^.*/%%'`
651+
652 # Code taken from libtool.m4's AC_LIBTOOL_PROG_COMPILER_PIC.
653
654 wl=
655@@ -60,7 +57,14 @@
656 aix*)
657 wl='-Wl,'
658 ;;
659- mingw* | pw32* | os2*)
660+ darwin*)
661+ case $cc_basename in
662+ xlc*)
663+ wl='-Wl,'
664+ ;;
665+ esac
666+ ;;
667+ mingw* | cygwin* | pw32* | os2*)
668 ;;
669 hpux9* | hpux10* | hpux11*)
670 wl='-Wl,'
671@@ -70,20 +74,33 @@
672 ;;
673 newsos6)
674 ;;
675- linux*)
676- case $CC in
677- icc|ecc)
678+ linux* | k*bsd*-gnu)
679+ case $cc_basename in
680+ icc* | ecc*)
681+ wl='-Wl,'
682+ ;;
683+ pgcc | pgf77 | pgf90)
684 wl='-Wl,'
685 ;;
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*)
703 wl='-Wl,'
704 ;;
705- sco3.2v5*)
706+ rdos*)
707 ;;
708 solaris*)
709 wl='-Wl,'
710@@ -91,11 +108,17 @@
711 sunos4*)
712 wl='-Qoption ld '
713 ;;
714- sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
715+ sysv4 | sysv4.2uw2* | sysv4.3*)
716 wl='-Wl,'
717 ;;
718 sysv4*MP*)
719 ;;
720+ sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
721+ wl='-Wl,'
722+ ;;
723+ unicos*)
724+ wl='-Wl,'
725+ ;;
726 uts4*)
727 ;;
728 esac
729@@ -117,6 +140,10 @@
730 with_gnu_ld=no
731 fi
732 ;;
733+ interix*)
734+ # we just hope/assume this is gcc and not c89 (= MSVC++)
735+ with_gnu_ld=yes
736+ ;;
737 openbsd*)
738 with_gnu_ld=no
739 ;;
740@@ -124,6 +151,12 @@
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
764 fi
765 ;;
766+ interix[3-9]*)
767+ hardcode_direct=no
768+ 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 ;;
808 esac
809- if test "$ld_shlibs" = yes; then
810- # Unlike libtool, we use -rpath here, not --rpath, since the documented
811- # option of GNU ld is called -rpath, not --rpath.
812- hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
813+ if test "$ld_shlibs" = no; then
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
828 then
829 # We have reworked collect2
830- hardcode_direct=yes
831+ :
832 else
833 # We have old collect2
834 hardcode_direct=unsupported
835@@ -234,6 +291,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
874 hardcode_minus_L=yes
875 ;;
876- freebsd*)
877+ freebsd* | dragonfly*)
878 hardcode_libdir_flag_spec='-R$libdir'
879 hardcode_direct=yes
880 ;;
881@@ -307,24 +374,25 @@
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=:
923 ;;
924 openbsd*)
925- hardcode_direct=yes
926- if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
927- hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
928+ if test -f /usr/libexec/ld.so; then
929+ hardcode_direct=yes
930+ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
931+ hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
932+ else
933+ case "$host_os" in
934+ openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
935+ hardcode_libdir_flag_spec='-R$libdir'
936+ ;;
937+ *)
938+ hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
939+ ;;
940+ esac
941+ fi
942 else
943- case "$host_os" in
944- openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
945- hardcode_libdir_flag_spec='-R$libdir'
946- ;;
947- *)
948- hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
949- ;;
950- esac
951+ ld_shlibs=no
952 fi
953 ;;
954 os2*)
955@@ -378,8 +450,6 @@
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
966 fi
967 ;;
968- sysv4.2uw2*)
969- hardcode_direct=yes
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 ;;
975- sysv5*)
976- hardcode_libdir_flag_spec=
977+ sysv5* | sco3.2v5* | sco5v6*)
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
985 # Check dynamic linker characteristics
986 # Code taken from libtool.m4's AC_LIBTOOL_SYS_DYNAMIC_LINKER.
987+# Unlike libtool.m4, here we don't care about _all_ names of the library, but
988+# only about the one the linker finds when passed -lNAME. This is the last
989+# element of library_names_spec in libtool.m4, or possibly two of them if the
990+# linker has special search rules.
991+library_names_spec= # the last element of library_names_spec in libtool.m4
992 libname_spec='lib$name'
993 case "$host_os" in
994 aix3*)
995+ library_names_spec='$libname.a'
996 ;;
997 aix4* | aix5*)
998+ library_names_spec='$libname$shrext'
999 ;;
1000 amigaos*)
1001+ library_names_spec='$libname.a'
1002 ;;
1003 beos*)
1004+ library_names_spec='$libname$shrext'
1005 ;;
1006- bsdi4*)
1007+ bsdi[45]*)
1008+ library_names_spec='$libname$shrext'
1009 ;;
1010 cygwin* | mingw* | pw32*)
1011 shrext=.dll
1012+ library_names_spec='$libname.dll.a $libname.lib'
1013 ;;
1014 darwin* | rhapsody*)
1015 shrext=.dylib
1016+ library_names_spec='$libname$shrext'
1017 ;;
1018 dgux*)
1019+ library_names_spec='$libname$shrext'
1020 ;;
1021 freebsd1*)
1022 ;;
1023- freebsd*)
1024+ freebsd* | dragonfly*)
1025+ case "$host_os" in
1026+ freebsd[123]*)
1027+ library_names_spec='$libname$shrext$versuffix' ;;
1028+ *)
1029+ library_names_spec='$libname$shrext' ;;
1030+ esac
1031 ;;
1032 gnu*)
1033+ library_names_spec='$libname$shrext'
1034 ;;
1035 hpux9* | hpux10* | hpux11*)
1036- case "$host_cpu" in
1037+ case $host_cpu in
1038 ia64*)
1039 shrext=.so
1040 ;;
1041@@ -466,8 +553,13 @@
1042 shrext=.sl
1043 ;;
1044 esac
1045+ library_names_spec='$libname$shrext'
1046+ ;;
1047+ interix[3-9]*)
1048+ library_names_spec='$libname$shrext'
1049 ;;
1050 irix5* | irix6* | nonstopux*)
1051+ library_names_spec='$libname$shrext'
1052 case "$host_os" in
1053 irix5* | nonstopux*)
1054 libsuff= shlibsuff=
1055@@ -484,42 +576,62 @@
1056 ;;
1057 linux*oldld* | linux*aout* | linux*coff*)
1058 ;;
1059- linux*)
1060+ linux* | k*bsd*-gnu)
1061+ library_names_spec='$libname$shrext'
1062+ ;;
1063+ knetbsd*-gnu)
1064+ library_names_spec='$libname$shrext'
1065 ;;
1066 netbsd*)
1067+ library_names_spec='$libname$shrext'
1068 ;;
1069 newsos6)
1070+ library_names_spec='$libname$shrext'
1071 ;;
1072- nto-qnx)
1073+ nto-qnx*)
1074+ library_names_spec='$libname$shrext'
1075 ;;
1076 openbsd*)
1077+ library_names_spec='$libname$shrext$versuffix'
1078 ;;
1079 os2*)
1080 libname_spec='$name'
1081 shrext=.dll
1082+ library_names_spec='$libname.a'
1083 ;;
1084 osf3* | osf4* | osf5*)
1085+ library_names_spec='$libname$shrext'
1086 ;;
1087- sco3.2v5*)
1088+ rdos*)
1089 ;;
1090 solaris*)
1091+ library_names_spec='$libname$shrext'
1092 ;;
1093 sunos4*)
1094+ library_names_spec='$libname$shrext$versuffix'
1095 ;;
1096- sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
1097+ sysv4 | sysv4.3*)
1098+ library_names_spec='$libname$shrext'
1099 ;;
1100 sysv4*MP*)
1101+ library_names_spec='$libname$shrext'
1102+ ;;
1103+ sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
1104+ library_names_spec='$libname$shrext'
1105 ;;
1106 uts4*)
1107+ library_names_spec='$libname$shrext'
1108 ;;
1109 esac
1110
1111 sed_quote_subst='s/\(["`$\\]\)/\\\1/g'
1112 escaped_wl=`echo "X$wl" | sed -e 's/^X//' -e "$sed_quote_subst"`
1113 shlibext=`echo "$shrext" | sed -e 's,^\.,,'`
1114+escaped_libname_spec=`echo "X$libname_spec" | sed -e 's/^X//' -e "$sed_quote_subst"`
1115+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"`
1117
1118-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
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").
1125 shlibext="$shlibext"
1126
1127+# Format of library name prefix.
1128+libname_spec="$escaped_libname_spec"
1129+
1130+# Library names that the linker finds when passed -lNAME.
1131+library_names_spec="$escaped_library_names_spec"
1132+
1133 # Flag to hardcode \$libdir into a binary during linking.
1134 # This must work even if \$libdir does not exist.
1135 hardcode_libdir_flag_spec="$escaped_hardcode_libdir_flag_spec"
diff --git a/meta/packages/gettext/gettext_0.14.1.bb b/meta/packages/gettext/gettext_0.14.1.bb
deleted file mode 100644
index a2de018281..0000000000
--- a/meta/packages/gettext/gettext_0.14.1.bb
+++ /dev/null
@@ -1,52 +0,0 @@
1DESCRIPTION = "The GNU internationalization library."
2HOMEPAGE = "http://www.gnu.org/software/gettext/gettext.html"
3SECTION = "libs"
4LICENSE = "GPLv2"
5PR = "r11"
6DEPENDS = "virtual/libiconv"
7DEPENDS_virtclass-native = ""
8PROVIDES = "virtual/libintl"
9PROVIDES_virtclass-native = ""
10
11SRC_URI = "${GNU_MIRROR}/gettext/gettext-${PV}.tar.gz \
12 file://gettext-vpath.patch \
13 file://fixchicken.patch \
14 file://linklib_from_0.17.patch \
15 file://getline.m4.patch \
16 file://disable_java.patch"
17
18# file://gettext-autoconf-lib-link-no-L.patch \
19
20SRC_URI_append_linux-uclibc = " file://gettext-error_print_progname.patch"
21SRC_URI_append_linux-uclibceabi = " file://gettext-error_print_progname.patch"
22
23PARALLEL_MAKE = ""
24
25inherit autotools
26
27EXTRA_OECONF += "--without-lisp --disable-csharp"
28acpaths = '-I ${S}/autoconf-lib-link/m4/ \
29 -I ${S}/gettext-runtime/m4 \
30 -I ${S}/gettext-tools/m4'
31
32do_configure_prepend() {
33 rm -f ${S}/config/m4/libtool.m4
34}
35
36# these lack the .x behind the .so, but shouldn't be in the -dev package
37# Otherwise you get the following results:
38# 7.4M glibc/images/ep93xx/Angstrom-console-image-glibc-ipk-2008.1-test-20080104-ep93xx.rootfs.tar.gz
39# 25M uclibc/images/ep93xx/Angstrom-console-image-uclibc-ipk-2008.1-test-20080104-ep93xx.rootfs.tar.gz
40# because gettext depends on gettext-dev, which pulls in more -dev packages:
41# 15228 KiB /ep93xx/libstdc++-dev_4.2.2-r2_ep93xx.ipk
42# 1300 KiB /ep93xx/uclibc-dev_0.9.29-r8_ep93xx.ipk
43# 140 KiB /armv4t/gettext-dev_0.14.1-r6_armv4t.ipk
44# 4 KiB /ep93xx/libgcc-s-dev_4.2.2-r2_ep93xx.ipk
45
46PACKAGES =+ "libgettextlib libgettextsrc"
47FILES_libgettextlib = "${libdir}/libgettextlib-*.so*"
48FILES_libgettextsrc = "${libdir}/libgettextsrc-*.so*"
49
50
51SRC_URI[md5sum] = "78f4b862510beb2e5d43223dd610e77d"
52SRC_URI[sha256sum] = "41f20c469c7759acb34cfa7e0b3cac9096d59a58ad800e471f07424a8e7adbb7"
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-14 05:52:19 +0000