* [PATCH 00/16] Upgrade gettext, GNU utilities, fix general build issues with uclibc distros.
@ 2010-06-02 20:34 Khem Raj
2010-06-02 20:34 ` [PATCH 01/16] classes/autotools.bbclass: Dont bail out if gettext/config.rpath does not exist Khem Raj
` (17 more replies)
0 siblings, 18 replies; 45+ messages in thread
From: Khem Raj @ 2010-06-02 20:34 UTC (permalink / raw)
To: openembedded-devel
Hi
These patches are for three things mainly.
1. Upgrade to gettext 0.18
3. General gnu utilities updates
4. uclibc based distro builds
I have tested several images for qemu based machines
mainly qemuarm and qemux86
Please provide feedback
Thanks
-Khem
^ permalink raw reply [flat|nested] 45+ messages in thread
* [PATCH 01/16] classes/autotools.bbclass: Dont bail out if gettext/config.rpath does not exist.
2010-06-02 20:34 [PATCH 00/16] Upgrade gettext, GNU utilities, fix general build issues with uclibc distros Khem Raj
@ 2010-06-02 20:34 ` Khem Raj
2010-06-04 7:35 ` Martin Jansa
2010-06-02 20:34 ` [PATCH 02/16] classes/gettext.bbclass: Account for libiconv and libintl too Khem Raj
` (16 subsequent siblings)
17 siblings, 1 reply; 45+ messages in thread
From: Khem Raj @ 2010-06-02 20:34 UTC (permalink / raw)
To: openembedded-devel
* Add a note if this file does not exist. The reason is that gettext can
needs libiconv and libiconv needs gettext so we need to solve this
catch 22
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
classes/autotools.bbclass | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/classes/autotools.bbclass b/classes/autotools.bbclass
index df2c114..8a5b982 100644
--- a/classes/autotools.bbclass
+++ b/classes/autotools.bbclass
@@ -125,7 +125,11 @@ autotools_do_configure() {
echo "no" | glib-gettextize --force --copy
fi
else if grep "^[[:space:]]*AM_GNU_GETTEXT" $CONFIGURE_AC >/dev/null; then
- cp ${STAGING_DATADIR}/gettext/config.rpath ${S}/
+ if [ -e ${STAGING_DATADIR}/gettext/config.rpath ]; then
+ cp ${STAGING_DATADIR}/gettext/config.rpath ${S}/
+ else
+ oenote ${STAGING_DATADIR}/gettext/config.rpath not found. gettext is not installed.
+ fi
fi
fi
--
1.7.0.4
^ permalink raw reply related [flat|nested] 45+ messages in thread
* [PATCH 02/16] classes/gettext.bbclass: Account for libiconv and libintl too.
2010-06-02 20:34 [PATCH 00/16] Upgrade gettext, GNU utilities, fix general build issues with uclibc distros Khem Raj
2010-06-02 20:34 ` [PATCH 01/16] classes/autotools.bbclass: Dont bail out if gettext/config.rpath does not exist Khem Raj
@ 2010-06-02 20:34 ` Khem Raj
2010-06-04 7:36 ` Martin Jansa
2010-06-02 20:34 ` [PATCH 03/16] gettext-0.18: Add recipe for 0.18 Khem Raj
` (15 subsequent siblings)
17 siblings, 1 reply; 45+ messages in thread
From: Khem Raj @ 2010-06-02 20:34 UTC (permalink / raw)
To: openembedded-devel
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
classes/gettext.bbclass | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/classes/gettext.bbclass b/classes/gettext.bbclass
index a40e74f..d0578b0 100644
--- a/classes/gettext.bbclass
+++ b/classes/gettext.bbclass
@@ -4,14 +4,14 @@ def gettext_after_parse(d):
cfg = oe_filter_out('^--(dis|en)able-nls$', bb.data.getVar('EXTRA_OECONF', d, 1) or "", d)
cfg += " --disable-nls"
depends = bb.data.getVar('DEPENDS', d, 1) or ""
- bb.data.setVar('DEPENDS', oe_filter_out('^(virtual/libiconv|virtual/libintl)$', depends, d), d)
+ bb.data.setVar('DEPENDS', oe_filter_out('^(virtual/libiconv|virtual/libintl|gettext|gettext-native)$', depends, d), d)
bb.data.setVar('EXTRA_OECONF', cfg, d)
python () {
gettext_after_parse(d)
}
-DEPENDS_GETTEXT = "gettext gettext-native"
+DEPENDS_GETTEXT = "gettext gettext-native virtual/libiconv virtual/libintl"
DEPENDS =+ "${DEPENDS_GETTEXT}"
EXTRA_OECONF += "--enable-nls"
--
1.7.0.4
^ permalink raw reply related [flat|nested] 45+ messages in thread
* [PATCH 03/16] gettext-0.18: Add recipe for 0.18
2010-06-02 20:34 [PATCH 00/16] Upgrade gettext, GNU utilities, fix general build issues with uclibc distros Khem Raj
2010-06-02 20:34 ` [PATCH 01/16] classes/autotools.bbclass: Dont bail out if gettext/config.rpath does not exist Khem Raj
2010-06-02 20:34 ` [PATCH 02/16] classes/gettext.bbclass: Account for libiconv and libintl too Khem Raj
@ 2010-06-02 20:34 ` Khem Raj
2010-06-04 7:37 ` Martin Jansa
2010-06-02 20:34 ` [PATCH 04/16] coreutils-8.5: Add recipes for version 8.5 Khem Raj
` (14 subsequent siblings)
17 siblings, 1 reply; 45+ messages in thread
From: Khem Raj @ 2010-06-02 20:34 UTC (permalink / raw)
To: openembedded-devel
* gl_cv_func_unsetenv_works is not computed correctly in cross
environment so cache it.
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
recipes/gettext/gettext-0.18/autotools.patch | 28 ++++++++++
.../gettext-autoconf-lib-link-no-L.patch | 28 ++++++++++
.../gettext-error_print_progname.patch | 13 +++++
.../gnulib-uclibc-sched_param-def.patch | 19 +++++++
recipes/gettext/gettext_0.18.bb | 57 ++++++++++++++++++++
site/common-glibc | 3 +
6 files changed, 148 insertions(+), 0 deletions(-)
create mode 100644 recipes/gettext/gettext-0.18/autotools.patch
create mode 100644 recipes/gettext/gettext-0.18/gettext-autoconf-lib-link-no-L.patch
create mode 100644 recipes/gettext/gettext-0.18/gettext-error_print_progname.patch
create mode 100644 recipes/gettext/gettext-0.18/gnulib-uclibc-sched_param-def.patch
create mode 100644 recipes/gettext/gettext_0.18.bb
diff --git a/recipes/gettext/gettext-0.18/autotools.patch b/recipes/gettext/gettext-0.18/autotools.patch
new file mode 100644
index 0000000..8302b34
--- /dev/null
+++ b/recipes/gettext/gettext-0.18/autotools.patch
@@ -0,0 +1,28 @@
+Index: gettext-0.18/gettext-runtime/man/Makefile.am
+===================================================================
+--- gettext-0.18.orig/gettext-runtime/man/Makefile.am 2009-06-28 12:44:04.000000000 -0700
++++ gettext-0.18/gettext-runtime/man/Makefile.am 2010-05-18 16:58:51.130518057 -0700
+@@ -159,8 +159,7 @@ bind_textdomain_codeset.3.html: bind_tex
+ $(MAN2HTML) $(srcdir)/bind_textdomain_codeset.3.in | sed -e '/CreationDate:/d' > t-$@
+ mv t-$@ $@
+
+-install-html-local:
+- $(mkdir_p) $(DESTDIR)$(htmldir)
++install-html: installdirs-html
+ for file in $(man_HTML); do \
+ if test -f $$file; then dir=.; else dir=$(srcdir); fi; \
+ $(INSTALL_DATA) $$dir/$$file $(DESTDIR)$(htmldir)/$$file; \
+Index: gettext-0.18/gettext-tools/man/Makefile.am
+===================================================================
+--- gettext-0.18.orig/gettext-tools/man/Makefile.am 2009-06-28 12:44:04.000000000 -0700
++++ gettext-0.18/gettext-tools/man/Makefile.am 2010-05-18 16:58:51.130518057 -0700
+@@ -186,8 +186,7 @@ autopoint.1.html: autopoint.1
+ $(MAN2HTML) `if test -f autopoint.1; then echo .; else echo $(srcdir); fi`/autopoint.1 | sed -e '/CreationDate:/d' > t-$@
+ mv t-$@ $@
+
+-install-html-local:
+- $(mkdir_p) $(DESTDIR)$(htmldir)
++install-html: installdirs-html
+ for file in $(man_HTML); do \
+ if test -f $$file; then dir=.; else dir=$(srcdir); fi; \
+ $(INSTALL_DATA) $$dir/$$file $(DESTDIR)$(htmldir)/$$file; \
diff --git a/recipes/gettext/gettext-0.18/gettext-autoconf-lib-link-no-L.patch b/recipes/gettext/gettext-0.18/gettext-autoconf-lib-link-no-L.patch
new file mode 100644
index 0000000..d2063b0
--- /dev/null
+++ b/recipes/gettext/gettext-0.18/gettext-autoconf-lib-link-no-L.patch
@@ -0,0 +1,28 @@
+Index: gettext-0.18/gettext-runtime/gnulib-m4/lib-link.m4
+===================================================================
+--- gettext-0.18.orig/gettext-runtime/gnulib-m4/lib-link.m4 2010-05-18 17:12:12.593014616 -0700
++++ gettext-0.18/gettext-runtime/gnulib-m4/lib-link.m4 2010-05-18 17:12:58.631176939 -0700
+@@ -312,6 +312,9 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
+ fi
+ fi
+ fi
++ dnl Just let the compiler find the library, the compiler and user are smarter then this script
++ dnl when cross compiling and working with a relocated install.
++ found_dir=""
+ if test "X$found_dir" = "X"; then
+ for x in $LDFLAGS $LTLIB[]NAME; do
+ AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
+Index: gettext-0.18/gettext-tools/gnulib-m4/lib-link.m4
+===================================================================
+--- gettext-0.18.orig/gettext-tools/gnulib-m4/lib-link.m4 2010-05-18 17:12:12.633052946 -0700
++++ gettext-0.18/gettext-tools/gnulib-m4/lib-link.m4 2010-05-18 17:13:35.020559106 -0700
+@@ -312,6 +312,9 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
+ fi
+ fi
+ fi
++ dnl Just let the compiler find the library, the compiler and user are smarter then this script
++ dnl when cross compiling and working with a relocated install.
++ found_dir=""
+ if test "X$found_dir" = "X"; then
+ for x in $LDFLAGS $LTLIB[]NAME; do
+ AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
diff --git a/recipes/gettext/gettext-0.18/gettext-error_print_progname.patch b/recipes/gettext/gettext-0.18/gettext-error_print_progname.patch
new file mode 100644
index 0000000..0f67cd0
--- /dev/null
+++ b/recipes/gettext/gettext-0.18/gettext-error_print_progname.patch
@@ -0,0 +1,13 @@
+Index: gettext-0.17/gettext-tools/libgettextpo/error.h
+===================================================================
+--- gettext-0.17.orig/gettext-tools/libgettextpo/error.h 2008-07-27 21:16:25.561115527 +0200
++++ gettext-0.17/gettext-tools/libgettextpo/error.h 2008-07-27 21:16:52.454440505 +0200
+@@ -49,7 +49,7 @@
+ /* If NULL, error will flush stdout, then print on stderr the program
+ name, a colon and a space. Otherwise, error will call this
+ function without parameters instead. */
+-extern DLL_VARIABLE void (*error_print_progname) (void);
++void (*error_print_progname) (void);
+
+ /* This variable is incremented each time `error' is called. */
+ extern DLL_VARIABLE unsigned int error_message_count;
diff --git a/recipes/gettext/gettext-0.18/gnulib-uclibc-sched_param-def.patch b/recipes/gettext/gettext-0.18/gnulib-uclibc-sched_param-def.patch
new file mode 100644
index 0000000..074723a
--- /dev/null
+++ b/recipes/gettext/gettext-0.18/gnulib-uclibc-sched_param-def.patch
@@ -0,0 +1,19 @@
+uclibc defines __GLIBC__ but it does not expose struct shed_param as much as glibc
+and is not needed too per standard. gnulib attempts to use it but we have to account
+for it because in this case uclibc does not behave like glibc.
+
+-Khem
+
+Index: gettext-0.18/gettext-tools/gnulib-lib/spawn.in.h
+===================================================================
+--- gettext-0.18.orig/gettext-tools/gnulib-lib/spawn.in.h 2010-06-01 17:20:09.036427575 -0700
++++ gettext-0.18/gettext-tools/gnulib-lib/spawn.in.h 2010-06-01 17:20:38.856613943 -0700
+@@ -31,7 +31,7 @@
+
+ /* Get definitions of 'struct sched_param' and 'sigset_t'.
+ But avoid namespace pollution on glibc systems. */
+-#ifndef __GLIBC__
++#if !defined __GLIBC__ || defined __UCLIBC__
+ # include <sched.h>
+ # include <signal.h>
+ #endif
diff --git a/recipes/gettext/gettext_0.18.bb b/recipes/gettext/gettext_0.18.bb
new file mode 100644
index 0000000..5e22b5a
--- /dev/null
+++ b/recipes/gettext/gettext_0.18.bb
@@ -0,0 +1,57 @@
+DESCRIPTION = "The GNU internationalization library."
+HOMEPAGE = "http://www.gnu.org/software/gettext/gettext.html"
+SECTION = "libs"
+LICENSE = "GPLv3"
+PR = "r0"
+DEPENDS = "gettext-native virtual/libiconv ncurses expat"
+DEPENDS_virtclass-native = "libxml2-native"
+PROVIDES = "virtual/libintl"
+PROVIDES_virtclass-native = ""
+RCONFLICTS_gettext-libintl = "proxy-libintl"
+
+BBCLASSEXTEND = "native nativesdk"
+
+SRC_URI = "${GNU_MIRROR}/gettext/gettext-${PV}.tar.gz \
+ file://autotools.patch \
+ file://gettext-autoconf-lib-link-no-L.patch \
+ file://gnulib-uclibc-sched_param-def.patch \
+ "
+
+SRC_URI_append_libc-uclibc = " file://gettext-error_print_progname.patch"
+
+PARALLEL_MAKE = ""
+
+inherit autotools
+
+EXTRA_OECONF += "--without-lispdir \
+ --disable-csharp \
+ --disable-libasprintf \
+ --disable-java \
+ --disable-native-java \
+ --disable-openmp \
+ --with-included-glib \
+ --without-emacs \
+ "
+acpaths = '-I ${S}/gnulib-local/m4/ \
+ -I ${S}/gettext-runtime/m4 \
+ -I ${S}/gettext-tools/m4'
+
+
+# these lack the .x behind the .so, but shouldn't be in the -dev package
+# Otherwise you get the following results:
+# 7.4M glibc/images/ep93xx/Angstrom-console-image-glibc-ipk-2008.1-test-20080104-ep93xx.rootfs.tar.gz
+# 25M uclibc/images/ep93xx/Angstrom-console-image-uclibc-ipk-2008.1-test-20080104-ep93xx.rootfs.tar.gz
+# because gettext depends on gettext-dev, which pulls in more -dev packages:
+# 15228 KiB /ep93xx/libstdc++-dev_4.2.2-r2_ep93xx.ipk
+# 1300 KiB /ep93xx/uclibc-dev_0.9.29-r8_ep93xx.ipk
+# 140 KiB /armv4t/gettext-dev_0.14.1-r6_armv4t.ipk
+# 4 KiB /ep93xx/libgcc-s-dev_4.2.2-r2_ep93xx.ipk
+
+PACKAGES =+ "gettext-libintl libgettextlib libgettextsrc"
+
+FILES_gettext-libintl = "${libdir}/libintl*.so.*"
+FILES_libgettextlib = "${libdir}/libgettextlib-*.so*"
+FILES_libgettextsrc = "${libdir}/libgettextsrc-*.so*"
+
+SRC_URI[md5sum] = "d52a3e061032a1ed13856d42fc86f0fd"
+SRC_URI[sha256sum] = "02342c1de18c03c601f8b91cbd896b70486a4b945bd816f34541e0d7b5a96fe5"
diff --git a/site/common-glibc b/site/common-glibc
index b298e46..6dc2363 100644
--- a/site/common-glibc
+++ b/site/common-glibc
@@ -22,6 +22,9 @@ ac_cv_func_vsnprintf_c99=${ac_cv_func_vsnprintf_c99=yes}
glib_cv_compliant_posix_memalign=${glib_cv_compliant_posix_memalign=1}
glib_cv_long_long_format=${glib_cv_long_long_format=ll}
+# gettext
+gl_cv_func_unsetenv_works=${gl_cv_func_unsetenv_works=yes}
+
#dbus-glib
ac_cv_have_abstract_sockets=${ac_cv_have_abstract_sockets=yes}
--
1.7.0.4
^ permalink raw reply related [flat|nested] 45+ messages in thread
* [PATCH 04/16] coreutils-8.5: Add recipes for version 8.5
2010-06-02 20:34 [PATCH 00/16] Upgrade gettext, GNU utilities, fix general build issues with uclibc distros Khem Raj
` (2 preceding siblings ...)
2010-06-02 20:34 ` [PATCH 03/16] gettext-0.18: Add recipe for 0.18 Khem Raj
@ 2010-06-02 20:34 ` Khem Raj
2010-06-04 7:37 ` Martin Jansa
2010-06-02 20:34 ` [PATCH 05/16] libiconv-1.13.1: Add recipes Khem Raj
` (13 subsequent siblings)
17 siblings, 1 reply; 45+ messages in thread
From: Khem Raj @ 2010-06-02 20:34 UTC (permalink / raw)
To: openembedded-devel
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
recipes/coreutils/coreutils-8.5.inc | 7 +++
recipes/coreutils/coreutils-8.5/onceonly.m4 | 63 +++++++++++++++++++++++++++
recipes/coreutils/coreutils-native_8.5.bb | 4 ++
recipes/coreutils/coreutils_8.5.bb | 4 ++
4 files changed, 78 insertions(+), 0 deletions(-)
create mode 100644 recipes/coreutils/coreutils-8.5.inc
create mode 100644 recipes/coreutils/coreutils-8.5/onceonly.m4
create mode 100644 recipes/coreutils/coreutils-native_8.5.bb
create mode 100644 recipes/coreutils/coreutils_8.5.bb
diff --git a/recipes/coreutils/coreutils-8.5.inc b/recipes/coreutils/coreutils-8.5.inc
new file mode 100644
index 0000000..da57745
--- /dev/null
+++ b/recipes/coreutils/coreutils-8.5.inc
@@ -0,0 +1,7 @@
+require coreutils.inc
+
+SRC_URI = "ftp://ftp.gnu.org/gnu/coreutils/coreutils-${PV}.tar.gz \
+ "
+SRC_URI[md5sum] = "c1ffe586d001e87d66cd80c4536ee823"
+SRC_URI[sha256sum] = "dd243e2ac7d0ed203b170ecfb8299643779e7501fec2b45ae1cea8a450fa8ca0"
+
diff --git a/recipes/coreutils/coreutils-8.5/onceonly.m4 b/recipes/coreutils/coreutils-8.5/onceonly.m4
new file mode 100644
index 0000000..f6fec37
--- /dev/null
+++ b/recipes/coreutils/coreutils-8.5/onceonly.m4
@@ -0,0 +1,63 @@
+# onceonly.m4 serial 3
+dnl Copyright (C) 2002, 2003 Free Software Foundation, Inc.
+dnl This file is free software, distributed under the terms of the GNU
+dnl General Public License. As a special exception to the GNU General
+dnl Public License, this file may be distributed as part of a program
+dnl that contains a configuration script generated by Autoconf, under
+dnl the same distribution terms as the rest of that program.
+
+dnl This file defines some "once only" variants of standard autoconf macros.
+dnl AC_CHECK_HEADERS_ONCE like AC_CHECK_HEADERS
+dnl AC_CHECK_FUNCS_ONCE like AC_CHECK_FUNCS
+dnl AC_CHECK_DECLS_ONCE like AC_CHECK_DECLS
+dnl AC_REQUIRE([AC_HEADER_STDC]) like AC_HEADER_STDC
+dnl The advantage is that the check for each of the headers/functions/decls
+dnl will be put only once into the 'configure' file. It keeps the size of
+dnl the 'configure' file down, and avoids redundant output when 'configure'
+dnl is run.
+dnl The drawback is that the checks cannot be conditionalized. If you write
+dnl if some_condition; then gl_CHECK_HEADERS(stdlib.h); fi
+dnl inside an AC_DEFUNed function, the gl_CHECK_HEADERS macro call expands to
+dnl empty, and the check will be inserted before the body of the AC_DEFUNed
+dnl function.
+
+dnl Autoconf version 2.57 or newer is recommended.
+AC_PREREQ(2.54)
+
+# AC_CHECK_HEADERS_ONCE(HEADER1 HEADER2 ...) is a once-only variant of
+# AC_CHECK_HEADERS(HEADER1 HEADER2 ...).
+AC_DEFUN([AC_CHECK_HEADERS_ONCE], [
+ :
+ AC_FOREACH([gl_HEADER_NAME], [$1], [
+ AC_DEFUN([gl_CHECK_HEADER_]m4_quote(translit(defn([gl_HEADER_NAME]),
+ [-./], [___])), [
+ AC_CHECK_HEADERS(gl_HEADER_NAME)
+ ])
+ AC_REQUIRE([gl_CHECK_HEADER_]m4_quote(translit(gl_HEADER_NAME,
+ [-./], [___])))
+ ])
+])
+
+# AC_CHECK_FUNCS_ONCE(FUNC1 FUNC2 ...) is a once-only variant of
+# AC_CHECK_FUNCS(FUNC1 FUNC2 ...).
+AC_DEFUN([AC_CHECK_FUNCS_ONCE], [
+ :
+ AC_FOREACH([gl_FUNC_NAME], [$1], [
+ AC_DEFUN([gl_CHECK_FUNC_]defn([gl_FUNC_NAME]), [
+ AC_CHECK_FUNCS(defn([gl_FUNC_NAME]))
+ ])
+ AC_REQUIRE([gl_CHECK_FUNC_]defn([gl_FUNC_NAME]))
+ ])
+])
+
+# AC_CHECK_DECLS_ONCE(DECL1 DECL2 ...) is a once-only variant of
+# AC_CHECK_DECLS(DECL1, DECL2, ...).
+AC_DEFUN([AC_CHECK_DECLS_ONCE], [
+ :
+ AC_FOREACH([gl_DECL_NAME], [$1], [
+ AC_DEFUN([gl_CHECK_DECL_]defn([gl_DECL_NAME]), [
+ AC_CHECK_DECLS(defn([gl_DECL_NAME]))
+ ])
+ AC_REQUIRE([gl_CHECK_DECL_]defn([gl_DECL_NAME]))
+ ])
+])
diff --git a/recipes/coreutils/coreutils-native_8.5.bb b/recipes/coreutils/coreutils-native_8.5.bb
new file mode 100644
index 0000000..fbf416e
--- /dev/null
+++ b/recipes/coreutils/coreutils-native_8.5.bb
@@ -0,0 +1,4 @@
+require coreutils-${PV}.inc
+require coreutils-native.inc
+
+PR = "r0"
diff --git a/recipes/coreutils/coreutils_8.5.bb b/recipes/coreutils/coreutils_8.5.bb
new file mode 100644
index 0000000..b4025c2
--- /dev/null
+++ b/recipes/coreutils/coreutils_8.5.bb
@@ -0,0 +1,4 @@
+require coreutils-${PV}.inc
+require coreutils-target.inc
+
+PR = "r0"
--
1.7.0.4
^ permalink raw reply related [flat|nested] 45+ messages in thread
* [PATCH 05/16] libiconv-1.13.1: Add recipes
2010-06-02 20:34 [PATCH 00/16] Upgrade gettext, GNU utilities, fix general build issues with uclibc distros Khem Raj
` (3 preceding siblings ...)
2010-06-02 20:34 ` [PATCH 04/16] coreutils-8.5: Add recipes for version 8.5 Khem Raj
@ 2010-06-02 20:34 ` Khem Raj
2010-06-04 7:38 ` Martin Jansa
2010-06-02 20:34 ` [PATCH 06/16] db_5.0.21: Add recipes for target and native packages Khem Raj
` (12 subsequent siblings)
17 siblings, 1 reply; 45+ messages in thread
From: Khem Raj @ 2010-06-02 20:34 UTC (permalink / raw)
To: openembedded-devel
* Get rid of old style staging.
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
recipes/libiconv/libiconv-1.13.1/autoconf.patch | 834 +++++++++++++++++++++++
recipes/libiconv/libiconv.inc | 15 +-
recipes/libiconv/libiconv_1.12.bb | 10 +
recipes/libiconv/libiconv_1.13.1.bb | 24 +
4 files changed, 870 insertions(+), 13 deletions(-)
create mode 100644 recipes/libiconv/libiconv-1.13.1/autoconf.patch
create mode 100644 recipes/libiconv/libiconv_1.13.1.bb
diff --git a/recipes/libiconv/libiconv-1.13.1/autoconf.patch b/recipes/libiconv/libiconv-1.13.1/autoconf.patch
new file mode 100644
index 0000000..1c0efbf
--- /dev/null
+++ b/recipes/libiconv/libiconv-1.13.1/autoconf.patch
@@ -0,0 +1,834 @@
+Index: libiconv-1.13.1/configure.ac
+===================================================================
+--- libiconv-1.13.1.orig/configure.ac 2009-06-30 13:48:03.000000000 -0700
++++ libiconv-1.13.1/configure.ac 2010-06-01 02:57:31.301726190 -0700
+@@ -23,7 +23,7 @@ AC_CONFIG_AUX_DIR([build-aux])
+ AM_INIT_AUTOMAKE([libiconv], [1.13.1])
+ AC_CONFIG_HEADERS([config.h lib/config.h])
+ AC_PROG_MAKE_SET
+-
++AC_CONFIG_MACRO_DIR([m4])
+ dnl checks for basic programs
+
+ AC_PROG_CC
+Index: libiconv-1.13.1/libcharset/configure.ac
+===================================================================
+--- libiconv-1.13.1.orig/libcharset/configure.ac 2009-06-21 04:17:33.000000000 -0700
++++ libiconv-1.13.1/libcharset/configure.ac 2010-06-01 02:57:31.301726190 -0700
+@@ -16,17 +16,17 @@ dnl along with the GNU CHARSET Library;
+ dnl write to the Free Software Foundation, Inc., 51 Franklin Street,
+ dnl Fifth Floor, Boston, MA 02110-1301, USA.
+
+-AC_PREREQ([2.13])
++AC_PREREQ(2.61)
++AC_INIT([libcharset],[1.4] )
++AC_CONFIG_SRCDIR([lib/localcharset.c])
+
+-PACKAGE=libcharset
+-VERSION=1.4
+-
+-AC_INIT([lib/localcharset.c])
+ AC_CONFIG_AUX_DIR([build-aux])
+ AC_CONFIG_HEADER([config.h])
+ AC_PROG_MAKE_SET
+-AC_SUBST([PACKAGE])
+-AC_SUBST([VERSION])
++dnl AC_SUBST(PACKAGE)
++dnl AC_SUBST(VERSION)
++
++AC_CONFIG_MACRO_DIR([m4])
+
+ dnl checks for basic programs
+
+Index: libiconv-1.13.1/libcharset/m4/libtool.m4
+===================================================================
+--- libiconv-1.13.1.orig/libcharset/m4/libtool.m4 2009-06-21 04:17:33.000000000 -0700
++++ libiconv-1.13.1/libcharset/m4/libtool.m4 2010-06-01 02:57:31.301726190 -0700
+@@ -89,7 +89,8 @@ _LT_SET_OPTIONS([$0], [$1])
+ LIBTOOL_DEPS="$ltmain"
+
+ # Always use our own libtool.
+-LIBTOOL="${CONFIG_SHELL-$SHELL} "'$(top_builddir)/libtool'
++LIBTOOL='$(SHELL) $(top_builddir)'
++LIBTOOL="$LIBTOOL/$host_alias-libtool"
+ AC_SUBST(LIBTOOL)dnl
+
+ _LT_SETUP
+@@ -211,7 +212,7 @@ delay_single_quote_subst='s/'\''/'\'\\\\
+ no_glob_subst='s/\*/\\\*/g'
+
+ # Global variables:
+-ofile=libtool
++ofile=${host_alias}-libtool
+ can_build_shared=yes
+
+ # All known linkers require a `.a' archive for static linking (except MSVC,
+@@ -380,12 +381,12 @@ m4_define([lt_decl_dquote_varnames],
+ # lt_decl_varnames_tagged([SEPARATOR], [VARNAME1...])
+ # ---------------------------------------------------
+ m4_define([lt_decl_varnames_tagged],
+-[m4_assert([$# <= 2])dnl
+-_$0(m4_quote(m4_default([$1], [[, ]])),
+- m4_ifval([$2], [[$2]], [m4_dquote(lt_decl_tag_varnames)]),
+- m4_split(m4_normalize(m4_quote(_LT_TAGS)), [ ]))])
+-m4_define([_lt_decl_varnames_tagged],
+-[m4_ifval([$3], [lt_combine([$1], [$2], [_], $3)])])
++[_$0(m4_quote(m4_default([$1], [[, ]])),
++ m4_quote(m4_if([$2], [],
++ m4_quote(lt_decl_tag_varnames),
++ m4_quote(m4_shift($@)))),
++ m4_split(m4_normalize(m4_quote(_LT_TAGS))))])
++m4_define([_lt_decl_varnames_tagged], [lt_combine([$1], [$2], [_], $3)])
+
+
+ # lt_decl_all_varnames([SEPARATOR], [VARNAME1...])
+@@ -990,11 +991,7 @@ m4_defun([_LT_DARWIN_LINKER_FEATURES],
+ _LT_TAGVAR(whole_archive_flag_spec, $1)=''
+ _LT_TAGVAR(link_all_deplibs, $1)=yes
+ _LT_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined"
+- case $cc_basename in
+- ifort*) _lt_dar_can_shared=yes ;;
+- *) _lt_dar_can_shared=$GCC ;;
+- esac
+- if test "$_lt_dar_can_shared" = "yes"; then
++ if test "$GCC" = "yes"; then
+ output_verbose_link_cmd=echo
+ _LT_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
+ _LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
+@@ -1516,7 +1513,7 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [d
+ lt_cv_sys_max_cmd_len=-1;
+ ;;
+
+- cygwin* | mingw* | cegcc*)
++ cygwin* | mingw*)
+ # On Win9x/ME, this test blows up -- it succeeds, but takes
+ # about 5 minutes as the teststring grows exponentially.
+ # Worse, since 9x/ME are not pre-emptively multitasking,
+@@ -1684,6 +1681,10 @@ else
+ # endif
+ #endif
+
++#ifdef __cplusplus
++extern "C" void exit (int);
++#endif
++
+ void fnord() { int i=42;}
+ int main ()
+ {
+@@ -1699,7 +1700,7 @@ int main ()
+ else
+ puts (dlerror ());
+
+- return status;
++ exit (status);
+ }]
+ _LT_EOF
+ if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then
+@@ -1738,7 +1739,7 @@ else
+ lt_cv_dlopen_self=yes
+ ;;
+
+- mingw* | pw32* | cegcc*)
++ mingw* | pw32*)
+ lt_cv_dlopen="LoadLibrary"
+ lt_cv_dlopen_libs=
+ ;;
+@@ -2035,7 +2036,6 @@ m4_defun([_LT_SYS_DYNAMIC_LINKER],
+ [AC_REQUIRE([AC_CANONICAL_HOST])dnl
+ m4_require([_LT_DECL_EGREP])dnl
+ m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+-m4_require([_LT_DECL_OBJDUMP])dnl
+ m4_require([_LT_DECL_SED])dnl
+ AC_MSG_CHECKING([dynamic linker characteristics])
+ m4_if([$1],
+@@ -2200,14 +2200,14 @@ bsdi[[45]]*)
+ # libtool to hard-code these into programs
+ ;;
+
+-cygwin* | mingw* | pw32* | cegcc*)
++cygwin* | mingw* | pw32*)
+ version_type=windows
+ shrext_cmds=".dll"
+ need_version=no
+ need_lib_prefix=no
+
+ case $GCC,$host_os in
+- yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
++ yes,cygwin* | yes,mingw* | yes,pw32*)
+ library_names_spec='$libname.dll.a'
+ # DLL is installed to $(libdir)/../bin by postinstall_cmds
+ postinstall_cmds='base_file=`basename \${file}`~
+@@ -2230,7 +2230,7 @@ cygwin* | mingw* | pw32* | cegcc*)
+ soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
+ sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
+ ;;
+- mingw* | cegcc*)
++ mingw*)
+ # MinGW DLLs use traditional 'lib' prefix
+ soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
+ sys_lib_search_path_spec=`$CC -print-search-dirs | $GREP "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
+@@ -2656,7 +2656,7 @@ tpf*)
+ version_type=linux
+ need_lib_prefix=no
+ need_version=no
+- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++ library_name_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=no
+ hardcode_into_libs=yes
+@@ -2957,7 +2957,6 @@ _LT_DECL([], [reload_cmds], [2])dnl
+ # -- PORTME fill in with the dynamic library characteristics
+ m4_defun([_LT_CHECK_MAGIC_METHOD],
+ [m4_require([_LT_DECL_EGREP])
+-m4_require([_LT_DECL_OBJDUMP])
+ AC_CACHE_CHECK([how to recognize dependent libraries],
+ lt_cv_deplibs_check_method,
+ [lt_cv_file_magic_cmd='$MAGIC_CMD'
+@@ -3008,12 +3007,6 @@ mingw* | pw32*)
+ fi
+ ;;
+
+-cegcc)
+- # use the weaker test based on 'objdump'. See mingw*.
+- lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?'
+- lt_cv_file_magic_cmd='$OBJDUMP -f'
+- ;;
+-
+ darwin* | rhapsody*)
+ lt_cv_deplibs_check_method=pass_all
+ ;;
+@@ -3325,7 +3318,7 @@ case $host_os in
+ aix*)
+ symcode='[[BCDT]]'
+ ;;
+-cygwin* | mingw* | pw32* | cegcc*)
++cygwin* | mingw* | pw32*)
+ symcode='[[ABCDGISTW]]'
+ ;;
+ hpux*)
+@@ -3571,7 +3564,7 @@ m4_if([$1], [CXX], [
+ beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+ # PIC is the default for these OSes.
+ ;;
+- mingw* | cygwin* | os2* | pw32* | cegcc*)
++ mingw* | cygwin* | os2* | pw32*)
+ # This hack is so that the source file can tell whether it is being
+ # built for inclusion in a dll (and should export symbols for example).
+ # Although the cygwin gcc ignores -fPIC, still need this for old-style
+@@ -3598,11 +3591,10 @@ m4_if([$1], [CXX], [
+ fi
+ ;;
+ hpux*)
+- # PIC is the default for 64-bit PA HP-UX, but not for 32-bit
+- # PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag
+- # sets the default TLS model and affects inlining.
++ # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
++ # not for PA HP-UX.
+ case $host_cpu in
+- hppa*64*)
++ hppa*64*|ia64*)
+ ;;
+ *)
+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+@@ -3700,19 +3692,12 @@ m4_if([$1], [CXX], [
+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+ ;;
+- ecpc* )
+- # old Intel C++ for x86_64 which still supported -KPIC.
++ icpc* | ecpc* )
++ # Intel C++
+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
+ ;;
+- icpc* )
+- # Intel C++, used to be incompatible with GCC.
+- # ICC 10 doesn't accept -KPIC any more.
+- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+- _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
+- ;;
+ pgCC* | pgcpp*)
+ # Portland Group C++ compiler
+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+@@ -3878,7 +3863,7 @@ m4_if([$1], [CXX], [
+ # PIC is the default for these OSes.
+ ;;
+
+- mingw* | cygwin* | pw32* | os2* | cegcc*)
++ mingw* | cygwin* | pw32* | os2*)
+ # This hack is so that the source file can tell whether it is being
+ # built for inclusion in a dll (and should export symbols for example).
+ # Although the cygwin gcc ignores -fPIC, still need this for old-style
+@@ -3894,11 +3879,10 @@ m4_if([$1], [CXX], [
+ ;;
+
+ hpux*)
+- # PIC is the default for 64-bit PA HP-UX, but not for 32-bit
+- # PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag
+- # sets the default TLS model and affects inlining.
++ # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
++ # not for PA HP-UX.
+ case $host_cpu in
+- hppa*64*)
++ hppa*64*|ia64*)
+ # +Z the default
+ ;;
+ *)
+@@ -3948,7 +3932,7 @@ m4_if([$1], [CXX], [
+ fi
+ ;;
+
+- mingw* | cygwin* | pw32* | os2* | cegcc*)
++ mingw* | cygwin* | pw32* | os2*)
+ # This hack is so that the source file can tell whether it is being
+ # built for inclusion in a dll (and should export symbols for example).
+ m4_if([$1], [GCJ], [],
+@@ -3979,25 +3963,11 @@ m4_if([$1], [CXX], [
+
+ linux* | k*bsd*-gnu)
+ case $cc_basename in
+- # old Intel for x86_64 which still supported -KPIC.
+- ecc*)
++ icc* | ecc* | ifort*)
+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
+ ;;
+- # icc used to be incompatible with GCC.
+- # ICC 10 doesn't accept -KPIC any more.
+- icc* | ifort*)
+- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+- _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
+- ;;
+- # Lahey Fortran 8.1.
+- lf95*)
+- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+- _LT_TAGVAR(lt_prog_compiler_pic, $1)='--shared'
+- _LT_TAGVAR(lt_prog_compiler_static, $1)='--static'
+- ;;
+ pgcc* | pgf77* | pgf90* | pgf95*)
+ # Portland Group compilers (*not* the Pentium gcc compiler,
+ # which looks to be a dead project)
+@@ -4179,7 +4149,7 @@ m4_if([$1], [CXX], [
+ pw32*)
+ _LT_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
+ ;;
+- cygwin* | mingw* | cegcc*)
++ cygwin* | mingw*)
+ _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
+ ;;
+ *)
+@@ -4231,7 +4201,7 @@ dnl Note also adjust exclude_expsyms for
+ extract_expsyms_cmds=
+
+ case $host_os in
+- cygwin* | mingw* | pw32* | cegcc*)
++ cygwin* | mingw* | pw32*)
+ # FIXME: the MSVC++ port hasn't been tested in a loooong time
+ # When not using gcc, we currently assume that we are using
+ # Microsoft Visual C++.
+@@ -4318,7 +4288,7 @@ _LT_EOF
+ fi
+ ;;
+
+- cygwin* | mingw* | pw32* | cegcc*)
++ cygwin* | mingw* | pw32*)
+ # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
+ # as there is no search path for DLLs.
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+@@ -4384,9 +4354,6 @@ _LT_EOF
+ tmp_addflag=' -i_dynamic -nofor_main' ;;
+ ifc* | ifort*) # Intel Fortran compiler
+ tmp_addflag=' -nofor_main' ;;
+- lf95*) # Lahey Fortran 8.1
+- _LT_TAGVAR(whole_archive_flag_spec, $1)=
+- tmp_sharedflag='--shared' ;;
+ xl[[cC]]*) # IBM XL C 8.0 on PPC (deal with xlf below)
+ tmp_sharedflag='-qmkshrobj'
+ tmp_addflag= ;;
+@@ -4618,7 +4585,6 @@ _LT_EOF
+ fi
+ fi
+
+- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-bexpall'
+ # It seems that -bexpall does not export symbols beginning with
+ # underscore (_), so it is better to generate a list of symbols to export.
+ _LT_TAGVAR(always_export_symbols, $1)=yes
+@@ -4673,7 +4639,7 @@ _LT_EOF
+ _LT_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic
+ ;;
+
+- cygwin* | mingw* | pw32* | cegcc*)
++ cygwin* | mingw* | pw32*)
+ # When not using gcc, we currently assume that we are using
+ # Microsoft Visual C++.
+ # hardcode_libdir_flag_spec is actually meaningless, as there is
+@@ -4777,7 +4743,7 @@ _LT_EOF
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+ ;;
+ ia64*)
+- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+ ;;
+ *)
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+@@ -5562,7 +5528,6 @@ if test "$_lt_caught_CXX_error" != yes;
+ fi
+ fi
+
+- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-bexpall'
+ # It seems that -bexpall does not export symbols beginning with
+ # underscore (_), so it is better to generate a list of symbols to
+ # export.
+@@ -5621,7 +5586,7 @@ if test "$_lt_caught_CXX_error" != yes;
+ esac
+ ;;
+
+- cygwin* | mingw* | pw32* | cegcc*)
++ cygwin* | mingw* | pw32*)
+ # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
+ # as there is no search path for DLLs.
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+@@ -7006,18 +6971,6 @@ AC_SUBST([GREP])
+ ])
+
+
+-# _LT_DECL_OBJDUMP
+-# --------------
+-# If we don't have a new enough Autoconf to choose the best objdump
+-# available, choose the one first in the user's PATH.
+-m4_defun([_LT_DECL_OBJDUMP],
+-[AC_CHECK_TOOL(OBJDUMP, objdump, false)
+-test -z "$OBJDUMP" && OBJDUMP=objdump
+-_LT_DECL([], [OBJDUMP], [1], [An object symbol dumper])
+-AC_SUBST([OBJDUMP])
+-])
+-
+-
+ # _LT_DECL_SED
+ # ------------
+ # Check for a fully-functional sed program, that truncates
+Index: libiconv-1.13.1/m4/libtool.m4
+===================================================================
+--- libiconv-1.13.1.orig/m4/libtool.m4 2009-06-21 04:17:33.000000000 -0700
++++ libiconv-1.13.1/m4/libtool.m4 2010-06-01 02:57:31.301726190 -0700
+@@ -89,7 +89,8 @@ _LT_SET_OPTIONS([$0], [$1])
+ LIBTOOL_DEPS="$ltmain"
+
+ # Always use our own libtool.
+-LIBTOOL="${CONFIG_SHELL-$SHELL} "'$(top_builddir)/libtool'
++LIBTOOL='$(SHELL) $(top_builddir)'
++LIBTOOL="$LIBTOOL/$host_alias-libtool"
+ AC_SUBST(LIBTOOL)dnl
+
+ _LT_SETUP
+@@ -211,7 +212,7 @@ delay_single_quote_subst='s/'\''/'\'\\\\
+ no_glob_subst='s/\*/\\\*/g'
+
+ # Global variables:
+-ofile=libtool
++ofile=${host_alias}-libtool
+ can_build_shared=yes
+
+ # All known linkers require a `.a' archive for static linking (except MSVC,
+@@ -380,12 +381,12 @@ m4_define([lt_decl_dquote_varnames],
+ # lt_decl_varnames_tagged([SEPARATOR], [VARNAME1...])
+ # ---------------------------------------------------
+ m4_define([lt_decl_varnames_tagged],
+-[m4_assert([$# <= 2])dnl
+-_$0(m4_quote(m4_default([$1], [[, ]])),
+- m4_ifval([$2], [[$2]], [m4_dquote(lt_decl_tag_varnames)]),
+- m4_split(m4_normalize(m4_quote(_LT_TAGS)), [ ]))])
+-m4_define([_lt_decl_varnames_tagged],
+-[m4_ifval([$3], [lt_combine([$1], [$2], [_], $3)])])
++[_$0(m4_quote(m4_default([$1], [[, ]])),
++ m4_quote(m4_if([$2], [],
++ m4_quote(lt_decl_tag_varnames),
++ m4_quote(m4_shift($@)))),
++ m4_split(m4_normalize(m4_quote(_LT_TAGS))))])
++m4_define([_lt_decl_varnames_tagged], [lt_combine([$1], [$2], [_], $3)])
+
+
+ # lt_decl_all_varnames([SEPARATOR], [VARNAME1...])
+@@ -990,11 +991,7 @@ m4_defun([_LT_DARWIN_LINKER_FEATURES],
+ _LT_TAGVAR(whole_archive_flag_spec, $1)=''
+ _LT_TAGVAR(link_all_deplibs, $1)=yes
+ _LT_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined"
+- case $cc_basename in
+- ifort*) _lt_dar_can_shared=yes ;;
+- *) _lt_dar_can_shared=$GCC ;;
+- esac
+- if test "$_lt_dar_can_shared" = "yes"; then
++ if test "$GCC" = "yes"; then
+ output_verbose_link_cmd=echo
+ _LT_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
+ _LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
+@@ -1516,7 +1513,7 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [d
+ lt_cv_sys_max_cmd_len=-1;
+ ;;
+
+- cygwin* | mingw* | cegcc*)
++ cygwin* | mingw*)
+ # On Win9x/ME, this test blows up -- it succeeds, but takes
+ # about 5 minutes as the teststring grows exponentially.
+ # Worse, since 9x/ME are not pre-emptively multitasking,
+@@ -1684,6 +1681,10 @@ else
+ # endif
+ #endif
+
++#ifdef __cplusplus
++extern "C" void exit (int);
++#endif
++
+ void fnord() { int i=42;}
+ int main ()
+ {
+@@ -1699,7 +1700,7 @@ int main ()
+ else
+ puts (dlerror ());
+
+- return status;
++ exit (status);
+ }]
+ _LT_EOF
+ if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then
+@@ -1738,7 +1739,7 @@ else
+ lt_cv_dlopen_self=yes
+ ;;
+
+- mingw* | pw32* | cegcc*)
++ mingw* | pw32*)
+ lt_cv_dlopen="LoadLibrary"
+ lt_cv_dlopen_libs=
+ ;;
+@@ -2035,7 +2036,6 @@ m4_defun([_LT_SYS_DYNAMIC_LINKER],
+ [AC_REQUIRE([AC_CANONICAL_HOST])dnl
+ m4_require([_LT_DECL_EGREP])dnl
+ m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+-m4_require([_LT_DECL_OBJDUMP])dnl
+ m4_require([_LT_DECL_SED])dnl
+ AC_MSG_CHECKING([dynamic linker characteristics])
+ m4_if([$1],
+@@ -2200,14 +2200,14 @@ bsdi[[45]]*)
+ # libtool to hard-code these into programs
+ ;;
+
+-cygwin* | mingw* | pw32* | cegcc*)
++cygwin* | mingw* | pw32*)
+ version_type=windows
+ shrext_cmds=".dll"
+ need_version=no
+ need_lib_prefix=no
+
+ case $GCC,$host_os in
+- yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
++ yes,cygwin* | yes,mingw* | yes,pw32*)
+ library_names_spec='$libname.dll.a'
+ # DLL is installed to $(libdir)/../bin by postinstall_cmds
+ postinstall_cmds='base_file=`basename \${file}`~
+@@ -2230,7 +2230,7 @@ cygwin* | mingw* | pw32* | cegcc*)
+ soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
+ sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
+ ;;
+- mingw* | cegcc*)
++ mingw*)
+ # MinGW DLLs use traditional 'lib' prefix
+ soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
+ sys_lib_search_path_spec=`$CC -print-search-dirs | $GREP "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
+@@ -2656,7 +2656,7 @@ tpf*)
+ version_type=linux
+ need_lib_prefix=no
+ need_version=no
+- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++ library_name_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=no
+ hardcode_into_libs=yes
+@@ -2957,7 +2957,6 @@ _LT_DECL([], [reload_cmds], [2])dnl
+ # -- PORTME fill in with the dynamic library characteristics
+ m4_defun([_LT_CHECK_MAGIC_METHOD],
+ [m4_require([_LT_DECL_EGREP])
+-m4_require([_LT_DECL_OBJDUMP])
+ AC_CACHE_CHECK([how to recognize dependent libraries],
+ lt_cv_deplibs_check_method,
+ [lt_cv_file_magic_cmd='$MAGIC_CMD'
+@@ -3008,12 +3007,6 @@ mingw* | pw32*)
+ fi
+ ;;
+
+-cegcc)
+- # use the weaker test based on 'objdump'. See mingw*.
+- lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?'
+- lt_cv_file_magic_cmd='$OBJDUMP -f'
+- ;;
+-
+ darwin* | rhapsody*)
+ lt_cv_deplibs_check_method=pass_all
+ ;;
+@@ -3325,7 +3318,7 @@ case $host_os in
+ aix*)
+ symcode='[[BCDT]]'
+ ;;
+-cygwin* | mingw* | pw32* | cegcc*)
++cygwin* | mingw* | pw32*)
+ symcode='[[ABCDGISTW]]'
+ ;;
+ hpux*)
+@@ -3571,7 +3564,7 @@ m4_if([$1], [CXX], [
+ beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+ # PIC is the default for these OSes.
+ ;;
+- mingw* | cygwin* | os2* | pw32* | cegcc*)
++ mingw* | cygwin* | os2* | pw32*)
+ # This hack is so that the source file can tell whether it is being
+ # built for inclusion in a dll (and should export symbols for example).
+ # Although the cygwin gcc ignores -fPIC, still need this for old-style
+@@ -3598,11 +3591,10 @@ m4_if([$1], [CXX], [
+ fi
+ ;;
+ hpux*)
+- # PIC is the default for 64-bit PA HP-UX, but not for 32-bit
+- # PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag
+- # sets the default TLS model and affects inlining.
++ # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
++ # not for PA HP-UX.
+ case $host_cpu in
+- hppa*64*)
++ hppa*64*|ia64*)
+ ;;
+ *)
+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+@@ -3700,19 +3692,12 @@ m4_if([$1], [CXX], [
+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+ ;;
+- ecpc* )
+- # old Intel C++ for x86_64 which still supported -KPIC.
++ icpc* | ecpc* )
++ # Intel C++
+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
+ ;;
+- icpc* )
+- # Intel C++, used to be incompatible with GCC.
+- # ICC 10 doesn't accept -KPIC any more.
+- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+- _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
+- ;;
+ pgCC* | pgcpp*)
+ # Portland Group C++ compiler
+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+@@ -3878,7 +3863,7 @@ m4_if([$1], [CXX], [
+ # PIC is the default for these OSes.
+ ;;
+
+- mingw* | cygwin* | pw32* | os2* | cegcc*)
++ mingw* | cygwin* | pw32* | os2*)
+ # This hack is so that the source file can tell whether it is being
+ # built for inclusion in a dll (and should export symbols for example).
+ # Although the cygwin gcc ignores -fPIC, still need this for old-style
+@@ -3894,11 +3879,10 @@ m4_if([$1], [CXX], [
+ ;;
+
+ hpux*)
+- # PIC is the default for 64-bit PA HP-UX, but not for 32-bit
+- # PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag
+- # sets the default TLS model and affects inlining.
++ # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
++ # not for PA HP-UX.
+ case $host_cpu in
+- hppa*64*)
++ hppa*64*|ia64*)
+ # +Z the default
+ ;;
+ *)
+@@ -3948,7 +3932,7 @@ m4_if([$1], [CXX], [
+ fi
+ ;;
+
+- mingw* | cygwin* | pw32* | os2* | cegcc*)
++ mingw* | cygwin* | pw32* | os2*)
+ # This hack is so that the source file can tell whether it is being
+ # built for inclusion in a dll (and should export symbols for example).
+ m4_if([$1], [GCJ], [],
+@@ -3979,25 +3963,11 @@ m4_if([$1], [CXX], [
+
+ linux* | k*bsd*-gnu)
+ case $cc_basename in
+- # old Intel for x86_64 which still supported -KPIC.
+- ecc*)
++ icc* | ecc* | ifort*)
+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
+ ;;
+- # icc used to be incompatible with GCC.
+- # ICC 10 doesn't accept -KPIC any more.
+- icc* | ifort*)
+- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+- _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
+- ;;
+- # Lahey Fortran 8.1.
+- lf95*)
+- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+- _LT_TAGVAR(lt_prog_compiler_pic, $1)='--shared'
+- _LT_TAGVAR(lt_prog_compiler_static, $1)='--static'
+- ;;
+ pgcc* | pgf77* | pgf90* | pgf95*)
+ # Portland Group compilers (*not* the Pentium gcc compiler,
+ # which looks to be a dead project)
+@@ -4179,7 +4149,7 @@ m4_if([$1], [CXX], [
+ pw32*)
+ _LT_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
+ ;;
+- cygwin* | mingw* | cegcc*)
++ cygwin* | mingw*)
+ _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
+ ;;
+ *)
+@@ -4231,7 +4201,7 @@ dnl Note also adjust exclude_expsyms for
+ extract_expsyms_cmds=
+
+ case $host_os in
+- cygwin* | mingw* | pw32* | cegcc*)
++ cygwin* | mingw* | pw32*)
+ # FIXME: the MSVC++ port hasn't been tested in a loooong time
+ # When not using gcc, we currently assume that we are using
+ # Microsoft Visual C++.
+@@ -4318,7 +4288,7 @@ _LT_EOF
+ fi
+ ;;
+
+- cygwin* | mingw* | pw32* | cegcc*)
++ cygwin* | mingw* | pw32*)
+ # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
+ # as there is no search path for DLLs.
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+@@ -4384,9 +4354,6 @@ _LT_EOF
+ tmp_addflag=' -i_dynamic -nofor_main' ;;
+ ifc* | ifort*) # Intel Fortran compiler
+ tmp_addflag=' -nofor_main' ;;
+- lf95*) # Lahey Fortran 8.1
+- _LT_TAGVAR(whole_archive_flag_spec, $1)=
+- tmp_sharedflag='--shared' ;;
+ xl[[cC]]*) # IBM XL C 8.0 on PPC (deal with xlf below)
+ tmp_sharedflag='-qmkshrobj'
+ tmp_addflag= ;;
+@@ -4618,7 +4585,6 @@ _LT_EOF
+ fi
+ fi
+
+- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-bexpall'
+ # It seems that -bexpall does not export symbols beginning with
+ # underscore (_), so it is better to generate a list of symbols to export.
+ _LT_TAGVAR(always_export_symbols, $1)=yes
+@@ -4673,7 +4639,7 @@ _LT_EOF
+ _LT_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic
+ ;;
+
+- cygwin* | mingw* | pw32* | cegcc*)
++ cygwin* | mingw* | pw32*)
+ # When not using gcc, we currently assume that we are using
+ # Microsoft Visual C++.
+ # hardcode_libdir_flag_spec is actually meaningless, as there is
+@@ -4777,7 +4743,7 @@ _LT_EOF
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+ ;;
+ ia64*)
+- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+ ;;
+ *)
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+@@ -5562,7 +5528,6 @@ if test "$_lt_caught_CXX_error" != yes;
+ fi
+ fi
+
+- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-bexpall'
+ # It seems that -bexpall does not export symbols beginning with
+ # underscore (_), so it is better to generate a list of symbols to
+ # export.
+@@ -5621,7 +5586,7 @@ if test "$_lt_caught_CXX_error" != yes;
+ esac
+ ;;
+
+- cygwin* | mingw* | pw32* | cegcc*)
++ cygwin* | mingw* | pw32*)
+ # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
+ # as there is no search path for DLLs.
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+@@ -7006,18 +6971,6 @@ AC_SUBST([GREP])
+ ])
+
+
+-# _LT_DECL_OBJDUMP
+-# --------------
+-# If we don't have a new enough Autoconf to choose the best objdump
+-# available, choose the one first in the user's PATH.
+-m4_defun([_LT_DECL_OBJDUMP],
+-[AC_CHECK_TOOL(OBJDUMP, objdump, false)
+-test -z "$OBJDUMP" && OBJDUMP=objdump
+-_LT_DECL([], [OBJDUMP], [1], [An object symbol dumper])
+-AC_SUBST([OBJDUMP])
+-])
+-
+-
+ # _LT_DECL_SED
+ # ------------
+ # Check for a fully-functional sed program, that truncates
+Index: libiconv-1.13.1/libcharset/m4/ltversion.m4
+===================================================================
+--- libiconv-1.13.1.orig/libcharset/m4/ltversion.m4 2009-06-21 04:17:33.000000000 -0700
++++ libiconv-1.13.1/libcharset/m4/ltversion.m4 2010-06-01 02:57:31.301726190 -0700
+@@ -9,15 +9,15 @@
+
+ # Generated from ltversion.in.
+
+-# serial 3012 ltversion.m4
++# serial 3017 ltversion.m4
+ # This file is part of GNU Libtool
+
+-m4_define([LT_PACKAGE_VERSION], [2.2.6])
+-m4_define([LT_PACKAGE_REVISION], [1.3012])
++m4_define([LT_PACKAGE_VERSION], [2.2.6b])
++m4_define([LT_PACKAGE_REVISION], [1.3017])
+
+ AC_DEFUN([LTVERSION_VERSION],
+-[macro_version='2.2.6'
+-macro_revision='1.3012'
++[macro_version='2.2.6b'
++macro_revision='1.3017'
+ _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
+ _LT_DECL(, macro_revision, 0)
+ ])
+Index: libiconv-1.13.1/m4/ltversion.m4
+===================================================================
+--- libiconv-1.13.1.orig/m4/ltversion.m4 2009-06-21 04:17:33.000000000 -0700
++++ libiconv-1.13.1/m4/ltversion.m4 2010-06-01 02:57:31.301726190 -0700
+@@ -9,15 +9,15 @@
+
+ # Generated from ltversion.in.
+
+-# serial 3012 ltversion.m4
++# serial 3017 ltversion.m4
+ # This file is part of GNU Libtool
+
+-m4_define([LT_PACKAGE_VERSION], [2.2.6])
+-m4_define([LT_PACKAGE_REVISION], [1.3012])
++m4_define([LT_PACKAGE_VERSION], [2.2.6b])
++m4_define([LT_PACKAGE_REVISION], [1.3017])
+
+ AC_DEFUN([LTVERSION_VERSION],
+-[macro_version='2.2.6'
+-macro_revision='1.3012'
++[macro_version='2.2.6b'
++macro_revision='1.3017'
+ _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
+ _LT_DECL(, macro_revision, 0)
+ ])
diff --git a/recipes/libiconv/libiconv.inc b/recipes/libiconv/libiconv.inc
index 6bb85ef..11dfaf2 100644
--- a/recipes/libiconv/libiconv.inc
+++ b/recipes/libiconv/libiconv.inc
@@ -6,21 +6,10 @@ PRIORITY = "optional"
NOTES = "Needs to be stripped down to: ascii iso8859-1 eucjp iso-2022jp gb utf8"
SRC_URI = "ftp://ftp.gnu.org/pub/gnu/libiconv/libiconv-${PV}.tar.gz \
- file://autotools.patch \
- file://preload.patch"
+ "
S = "${WORKDIR}/libiconv-${PV}"
inherit autotools gettext
-EXTRA_OECONF += "--enable-shared --enable-static --enable-relocatable --disable-rpath"
-
-do_configure_append () {
- # Fix stupid libtool... handling. rpath handling can't be disabled and the Makefile's can't be regenerated..
- # (GNU sed required)
- sed -i s/^hardcode_libdir_flag_spec/#hardcode_libdir_flag_spec/ ${S}/*-libtool
-}
-
-do_stage () {
- autotools_stage_all
-}
+EXTRA_OECONF += "--enable-shared --enable-static --enable-relocatable"
diff --git a/recipes/libiconv/libiconv_1.12.bb b/recipes/libiconv/libiconv_1.12.bb
index a38248e..83774d6 100644
--- a/recipes/libiconv/libiconv_1.12.bb
+++ b/recipes/libiconv/libiconv_1.12.bb
@@ -11,5 +11,15 @@ EXTRA_OECONF += "${@['--disable-nls','--enable-nls'][bb.data.getVar('USE_NLS',
LEAD_SONAME = "libiconv.so"
+SRC_URI += "file://autotools.patch \
+ file://preload.patch \
+ "
+do_configure_append () {
+ # Fix stupid libtool... handling.
+ # rpath handling can't be disabled and the Makefile's can't be regenerated..
+ # (GNU sed required)
+ sed -i s/^hardcode_libdir_flag_spec/#hardcode_libdir_flag_spec/ ${S}/*-libtool
+}
+
SRC_URI[md5sum] = "c2be282595751535a618ae0edeb8f648"
SRC_URI[sha256sum] = "a99e244fd78babb95ea3c9a5c88b964994edaa1d15fd8dde5b4067801e23f0cd"
diff --git a/recipes/libiconv/libiconv_1.13.1.bb b/recipes/libiconv/libiconv_1.13.1.bb
new file mode 100644
index 0000000..3cd836f
--- /dev/null
+++ b/recipes/libiconv/libiconv_1.13.1.bb
@@ -0,0 +1,24 @@
+require libiconv.inc
+LICENSE = "GPLv3 LGPLv2"
+
+PROVIDES = "virtual/libiconv"
+PR = "r0"
+
+#gettext.class cant be inherit here so use this hack
+DEPENDS = "${@['','gettext-native'][bb.data.getVar('USE_NLS', d, 1) == 'yes']}"
+
+EXTRA_OECONF += "${@['--disable-nls','--enable-nls'][bb.data.getVar('USE_NLS', d, 1) == 'yes']}"
+
+SRC_URI += "file://autoconf.patch"
+
+do_configure_append () {
+ # Fix stupid libtool... handling.
+ # rpath handling can't be disabled and the Makefile's can't be regenerated..
+ # (GNU sed required)
+ sed -i s/^hardcode_libdir_flag_spec/#hardcode_libdir_flag_spec/ ${S}/*-libtool
+}
+
+LEAD_SONAME = "libiconv.so"
+SRC_URI[md5sum] = "7ab33ebd26687c744a37264a330bbe9a"
+SRC_URI[sha256sum] = "55a36168306089009d054ccdd9d013041bfc3ab26be7033d107821f1c4949a49"
+
--
1.7.0.4
^ permalink raw reply related [flat|nested] 45+ messages in thread
* [PATCH 06/16] db_5.0.21: Add recipes for target and native packages.
2010-06-02 20:34 [PATCH 00/16] Upgrade gettext, GNU utilities, fix general build issues with uclibc distros Khem Raj
` (4 preceding siblings ...)
2010-06-02 20:34 ` [PATCH 05/16] libiconv-1.13.1: Add recipes Khem Raj
@ 2010-06-02 20:34 ` Khem Raj
2010-06-02 20:41 ` Koen Kooi
2010-06-02 20:34 ` [PATCH 07/16] grep-2.6.3: Add recipe Khem Raj
` (11 subsequent siblings)
17 siblings, 1 reply; 45+ messages in thread
From: Khem Raj @ 2010-06-02 20:34 UTC (permalink / raw)
To: openembedded-devel
* Get rid of old style staging.
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
recipes/db/db-native_4.2.52.bb | 1 -
recipes/db/db-native_5.0.21.bb | 2 +
recipes/db/db4-native.inc | 13 ----
recipes/db/db4.inc | 13 ----
recipes/db/db5.inc | 83 ++++++++++++++++++++++++++++
recipes/db/db_4.2.52.bb | 2 +-
recipes/db/db_4.3.29.bb | 2 +-
recipes/db/db_5.0.21.bb | 15 +++++
recipes/db/files/db5-arm-thumb-mutex.patch | 38 +++++++++++++
9 files changed, 140 insertions(+), 29 deletions(-)
create mode 100644 recipes/db/db-native_5.0.21.bb
create mode 100644 recipes/db/db5.inc
create mode 100644 recipes/db/db_5.0.21.bb
create mode 100644 recipes/db/files/db5-arm-thumb-mutex.patch
diff --git a/recipes/db/db-native_4.2.52.bb b/recipes/db/db-native_4.2.52.bb
index 9f307d6..4ff80fd 100644
--- a/recipes/db/db-native_4.2.52.bb
+++ b/recipes/db/db-native_4.2.52.bb
@@ -1,5 +1,4 @@
require db_${PV}.bb
require db4-native.inc
-
SRC_URI[md5sum] = "8b5cff6eb83972afdd8e0b821703c33c"
SRC_URI[sha256sum] = "f4bddd8d1b4cde0daf5e13e3493ed62a25b736b0bf258e1d929e47bc6a82a28c"
diff --git a/recipes/db/db-native_5.0.21.bb b/recipes/db/db-native_5.0.21.bb
new file mode 100644
index 0000000..0e6381b
--- /dev/null
+++ b/recipes/db/db-native_5.0.21.bb
@@ -0,0 +1,2 @@
+require db_${PV}.bb
+require db4-native.inc
diff --git a/recipes/db/db4-native.inc b/recipes/db/db4-native.inc
index cc83d86..7fd753d 100644
--- a/recipes/db/db4-native.inc
+++ b/recipes/db/db4-native.inc
@@ -13,16 +13,3 @@ do_package() {
}
PACKAGES = ""
-
-do_stage() {
- # The .h files get installed read-only, the autostage
- # function just uses cp -pPR, so do this by hand
- rm -rf ${STAGE_TEMP}
- mkdir -p ${STAGE_TEMP}
- oe_runmake DESTDIR="${STAGE_TEMP}" install_include
- cp -pPRf ${STAGE_TEMP}/${includedir}/* ${STAGING_INCDIR}/.
- rm -rf ${STAGE_TEMP}
- oe_libinstall -so -C .libs libdb-${PVM} ${STAGING_LIBDIR}
- ln -sf libdb-${PVM}.so ${STAGING_LIBDIR}/libdb.so
- ln -sf libdb-${PVM}.a ${STAGING_LIBDIR}/libdb.a
-}
diff --git a/recipes/db/db4.inc b/recipes/db/db4.inc
index 12d4ad2..73d339d 100644
--- a/recipes/db/db4.inc
+++ b/recipes/db/db4.inc
@@ -81,16 +81,3 @@ do_install_append() {
mv "${D}/${prefix}/docs" "${D}/${docdir}"
fi
}
-
-do_stage() {
- # The .h files get installed read-only, the autostage
- # function just uses cp -pPR, so do this by hand
- rm -rf ${STAGE_TEMP}
- mkdir -p ${STAGE_TEMP}
- oe_runmake DESTDIR="${STAGE_TEMP}" install_include
- cp -pPRf ${STAGE_TEMP}/${includedir}/* ${STAGING_INCDIR}/.
- rm -rf ${STAGE_TEMP}
- oe_libinstall -so -C .libs libdb-${PVM} ${STAGING_LIBDIR}
- ln -sf libdb-${PVM}.so ${STAGING_LIBDIR}/libdb.so
- ln -sf libdb-${PVM}.a ${STAGING_LIBDIR}/libdb.a
-}
diff --git a/recipes/db/db5.inc b/recipes/db/db5.inc
new file mode 100644
index 0000000..599093e
--- /dev/null
+++ b/recipes/db/db5.inc
@@ -0,0 +1,83 @@
+# Version 5 of the Berkeley DB from Oracle
+#
+# At present this package only installs the DB code
+# itself (shared libraries, .a in the dev package),
+# documentation and headers.
+#
+# The headers have the same names as those as v3
+# of the DB, only one version can be used *for dev*
+# at once - DB3 and DB5 both be installed on the
+# same system at the same time if really necessary.
+
+
+DESCRIPTION = "Berkeley DB v5."
+HOMEPAGE = "http://www.oracle.com/technology/products/berkeley-db/db/index.html"
+SECTION = "libs"
+LICENSE = "BSD"
+VIRTUAL_NAME ?= "virtual/db"
+CONFLICTS = "db3 db4"
+
+SRC_URI = "http://download.oracle.com/berkeley-db/db-${PV}.tar.gz"
+
+inherit autotools
+
+# Put virtual/db in any appropriate provider of a
+# relational database, use it as a dependency in
+# place of a specific db and use:
+#
+# PREFERRED_PROVIDER_virtual/db
+#
+# to select the correct db in the build (distro) .conf
+PROVIDES += "${VIRTUAL_NAME}"
+
+# bitbake isn't quite clever enough to deal with db,
+# the distribution sits in the expected directory, but all
+# the builds must occur from a sub-directory. The following
+# persuades bitbake to go to the right place
+S = "${WORKDIR}/db-${PV}/dist"
+B = "${WORKDIR}/db-${PV}/build_unix"
+
+# The executables go in a separate package - typically there
+# is no need to install these unless doing real database
+# management on the system.
+PACKAGES += " ${PN}-bin"
+
+# Package contents
+FILES_${PN} = "${libdir}/libdb-5*so*"
+FILES_${PN}-bin = "${bindir}/*"
+# The dev package has the .so link (as in db3) and the .a's -
+# it is therefore incompatible (cannot be installed at the
+# same time) as the db3 package
+FILES_${PN}-dev = "${includedir} ${libdir}/*"
+
+EXTRA_OECONF = "${DB5_CONFIG}"
+
+# Override the MUTEX setting here, the POSIX library is
+# the default - "POSIX/pthreads/library".
+# Don't ignore the nice SWP instruction on the ARM:
+# These enable the ARM assembler mutex code, this won't
+# work with thumb compilation...
+ARM_MUTEX = "--with-mutex=ARM/gcc-assembly"
+MUTEX = ""
+MUTEX_arm = "${ARM_MUTEX}"
+MUTEX_armeb = "${ARM_MUTEX}"
+EXTRA_OECONF += "${MUTEX}"
+
+# Cancel the site stuff - it's set for db3 and destroys the
+# configure.
+CONFIG_SITE = ""
+do_configure() {
+ ( cd ${WORKDIR}/db-${PV}/dist ; gnu-configize )
+ oe_runconf
+}
+
+
+do_install_append() {
+ # The docs end up in /usr/docs - not right.
+ if test -d "${D}/${prefix}/docs"
+ then
+ mkdir -p "${D}/${datadir}"
+ test ! -d "${D}/${docdir}" || rm -rf "${D}/${docdir}"
+ mv "${D}/${prefix}/docs" "${D}/${docdir}"
+ fi
+}
diff --git a/recipes/db/db_4.2.52.bb b/recipes/db/db_4.2.52.bb
index 3b9bab8..5f135ed 100644
--- a/recipes/db/db_4.2.52.bb
+++ b/recipes/db/db_4.2.52.bb
@@ -1,4 +1,4 @@
-PR = "r8"
+PR = "r9"
#major version number
PVM = "4.2"
diff --git a/recipes/db/db_4.3.29.bb b/recipes/db/db_4.3.29.bb
index c5ecfde..1e54203 100644
--- a/recipes/db/db_4.3.29.bb
+++ b/recipes/db/db_4.3.29.bb
@@ -1,4 +1,4 @@
-PR = "r10"
+PR = "r11"
# major version number
PVM = "4.3"
diff --git a/recipes/db/db_5.0.21.bb b/recipes/db/db_5.0.21.bb
new file mode 100644
index 0000000..cfa0154
--- /dev/null
+++ b/recipes/db/db_5.0.21.bb
@@ -0,0 +1,15 @@
+PR = "r0"
+
+# major version number
+PVM = "5.0"
+
+#configuration - set in local.conf to override
+# All the --disable-* options replace --enable-smallbuild, which breaks a bunch of stuff (eg. postfix)
+DB5_CONFIG ?= "--enable-o_direct --disable-cryptography --disable-queue --disable-replication --disable-statistics --disable-verify --enable-compat185"
+
+require db5.inc
+
+SRC_URI += "file://db5-arm-thumb-mutex.patch"
+
+SRC_URI[md5sum] = "9a749fd2e98fe15840493ddc34cc66d8"
+SRC_URI[sha256sum] = "061a31a962e992dd1eae5f1e3193241d497a18968e750707526d104b53ab3cc4"
diff --git a/recipes/db/files/db5-arm-thumb-mutex.patch b/recipes/db/files/db5-arm-thumb-mutex.patch
new file mode 100644
index 0000000..51b8882
--- /dev/null
+++ b/recipes/db/files/db5-arm-thumb-mutex.patch
@@ -0,0 +1,38 @@
+Index: db-5.0.21/../dbinc/mutex_int.h
+===================================================================
+--- db-5.0.21.orig/../dbinc/mutex_int.h 2010-03-30 10:36:09.000000000 -0700
++++ db-5.0.21/../dbinc/mutex_int.h 2010-05-22 12:07:38.281286337 -0700
+@@ -474,6 +474,25 @@ typedef unsigned char tsl_t;
+
+ #ifdef LOAD_ACTUAL_MUTEX_CODE
+ /* gcc/arm: 0 is clear, 1 is set. */
++#if defined __thumb__
++#define MUTEX_SET(tsl) ({ \
++ int __r, __p; \
++ asm volatile( \
++ ".align 2\n\t" \
++ "bx pc\n\t" \
++ "nop\n\t" \
++ ".arm\n\t" \
++ "swpb %0, %2, [%3]\n\t" \
++ "eor %0, %0, #1\n\t" \
++ "orr %1, pc, #1\n\t" \
++ "bx %1\n\t" \
++ ".force_thumb" \
++ : "=&r" (__r), "=r" (__p) \
++ : "r" (1), "r" (tsl) \
++ ); \
++ __r & 1; \
++})
++#else
+ #define MUTEX_SET(tsl) ({ \
+ int __r; \
+ __asm__ volatile( \
+@@ -484,6 +503,7 @@ typedef unsigned char tsl_t;
+ ); \
+ __r & 1; \
+ })
++#endif
+
+ #define MUTEX_UNSET(tsl) (*(volatile tsl_t *)(tsl) = 0)
+ #define MUTEX_INIT(tsl) (MUTEX_UNSET(tsl), 0)
--
1.7.0.4
^ permalink raw reply related [flat|nested] 45+ messages in thread
* [PATCH 07/16] grep-2.6.3: Add recipe.
2010-06-02 20:34 [PATCH 00/16] Upgrade gettext, GNU utilities, fix general build issues with uclibc distros Khem Raj
` (5 preceding siblings ...)
2010-06-02 20:34 ` [PATCH 06/16] db_5.0.21: Add recipes for target and native packages Khem Raj
@ 2010-06-02 20:34 ` Khem Raj
2010-06-04 7:39 ` Martin Jansa
2010-06-02 20:34 ` [PATCH 08/16] glib-2.0_2.24.0.bb: Remove virtual/libiconv virtual/libintl from DEPENDS Khem Raj
` (10 subsequent siblings)
17 siblings, 1 reply; 45+ messages in thread
From: Khem Raj @ 2010-06-02 20:34 UTC (permalink / raw)
To: openembedded-devel
* Fix build for uclibc as well.
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
recipes/grep/grep-2.6.3/uclibc-fix.patch | 50 ++++++++++++++++++++++++++++++
recipes/grep/grep_2.6.3.bb | 47 ++++++++++++++++++++++++++++
2 files changed, 97 insertions(+), 0 deletions(-)
create mode 100644 recipes/grep/grep-2.6.3/uclibc-fix.patch
create mode 100644 recipes/grep/grep_2.6.3.bb
diff --git a/recipes/grep/grep-2.6.3/uclibc-fix.patch b/recipes/grep/grep-2.6.3/uclibc-fix.patch
new file mode 100644
index 0000000..2e1c584
--- /dev/null
+++ b/recipes/grep/grep-2.6.3/uclibc-fix.patch
@@ -0,0 +1,50 @@
+Fix to use mempcpy instead of __mempcpy. This is needed for uclibc which
+doesn't define __mempcpy only mempcpy. Since both uclibc and glibc have
+mempcpy we'll just use that instead.
+
+Index: grep-2.6.3/lib/getopt.c
+===================================================================
+--- grep-2.6.3.orig/lib/getopt.c 2010-03-21 00:34:02.000000000 -0700
++++ grep-2.6.3/lib/getopt.c 2010-05-22 21:37:11.352740539 -0700
+@@ -41,6 +41,10 @@
+ # include <wchar.h>
+ #endif
+
++#ifdef __UCLIBC__
++#define __mempcpy mempcpy
++#endif
++
+ /* This version of `getopt' appears to the caller like standard Unix `getopt'
+ but it behaves differently for the user, since it allows the user
+ to intersperse the options with the other arguments.
+Index: grep-2.6.3/gnulib-tests/setenv.c
+===================================================================
+--- grep-2.6.3.orig/gnulib-tests/setenv.c 2010-05-22 21:37:53.655168151 -0700
++++ grep-2.6.3/gnulib-tests/setenv.c 2010-05-22 21:38:42.792745476 -0700
+@@ -68,6 +68,10 @@ __libc_lock_define_initialized (static,
+ # define tsearch __tsearch
+ #endif
+
++#ifdef __UCLIBC__
++#define __mempcpy mempcpy
++#endif
++
+ /* In the GNU C library implementation we try to be more clever and
+ allow arbitrarily many changes of the environment given that the used
+ values are from a small set. Outside glibc this will eat up all
+Index: grep-2.6.3/lib/regexec.c
+===================================================================
+--- grep-2.6.3.orig/lib/regexec.c 2010-05-22 21:36:02.655154671 -0700
++++ grep-2.6.3/lib/regexec.c 2010-05-22 21:37:26.212743273 -0700
+@@ -22,6 +22,11 @@
+
+ #include "verify.h"
+ #include "intprops.h"
++
++#ifdef __UCLIBC__
++#define __mempcpy mempcpy
++#endif
++
+ static reg_errcode_t match_ctx_init (re_match_context_t *cache, int eflags,
+ Idx n) internal_function;
+ static void match_ctx_clean (re_match_context_t *mctx) internal_function;
diff --git a/recipes/grep/grep_2.6.3.bb b/recipes/grep/grep_2.6.3.bb
new file mode 100644
index 0000000..c887ca0
--- /dev/null
+++ b/recipes/grep/grep_2.6.3.bb
@@ -0,0 +1,47 @@
+LICENSE = "GPL"
+SECTION = "console/utils"
+DESCRIPTION = "grep GNU utility"
+PR = "r0"
+
+SRC_URI = "${GNU_MIRROR}/grep/grep-${PV}.tar.xz \
+ file://uclibc-fix.patch"
+
+inherit autotools
+
+EXTRA_OECONF = "--disable-perl-regexp --disable-ncurses"
+EXTRA_OECONF_virtclass-native = "--with-included-regex --disable-ncurses"
+
+do_configure () {
+ rm -f ${S}/m4/init.m4
+ autotools_do_configure
+}
+
+do_install () {
+ autotools_do_install
+ install -d ${D}${base_bindir}
+ mv ${D}${bindir}/grep ${D}${base_bindir}/grep.${PN}
+ mv ${D}${bindir}/egrep ${D}${base_bindir}/egrep.${PN}
+ mv ${D}${bindir}/fgrep ${D}${base_bindir}/fgrep.${PN}
+}
+
+do_install_virtclass-native () {
+ autotools_do_install
+}
+
+pkg_postinst_${PN} () {
+ update-alternatives --install ${base_bindir}/grep grep grep.${PN} 100
+ update-alternatives --install ${base_bindir}/egrep egrep egrep.${PN} 100
+ update-alternatives --install ${base_bindir}/fgrep fgrep fgrep.${PN} 100
+}
+
+pkg_prerm_${PN} () {
+ update-alternatives --remove grep grep.${PN}
+ update-alternatives --remove egrep egrep.${PN}
+ update-alternatives --remove fgrep fgrep.${PN}
+}
+
+BBCLASSEXTEND = "native"
+
+SRC_URI[md5sum] = "69a3bf508a3f14d12369e0e1c7a92763"
+SRC_URI[sha256sum] = "ba745e2ff297ab225bf870740d35593d402a1d92999cf0d7e56840f10218db7c"
+
--
1.7.0.4
^ permalink raw reply related [flat|nested] 45+ messages in thread
* [PATCH 08/16] glib-2.0_2.24.0.bb: Remove virtual/libiconv virtual/libintl from DEPENDS
2010-06-02 20:34 [PATCH 00/16] Upgrade gettext, GNU utilities, fix general build issues with uclibc distros Khem Raj
` (6 preceding siblings ...)
2010-06-02 20:34 ` [PATCH 07/16] grep-2.6.3: Add recipe Khem Raj
@ 2010-06-02 20:34 ` Khem Raj
2010-06-04 7:39 ` Martin Jansa
2010-06-02 20:34 ` [PATCH 09/16] gnutls_2.8.6.bb: Add recipe for version 2.8.6 Khem Raj
` (9 subsequent siblings)
17 siblings, 1 reply; 45+ messages in thread
From: Khem Raj @ 2010-06-02 20:34 UTC (permalink / raw)
To: openembedded-devel
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
recipes/glib-2.0/glib-2.0_2.24.0.bb | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/recipes/glib-2.0/glib-2.0_2.24.0.bb b/recipes/glib-2.0/glib-2.0_2.24.0.bb
index 56fe567..3a90dc6 100644
--- a/recipes/glib-2.0/glib-2.0_2.24.0.bb
+++ b/recipes/glib-2.0/glib-2.0_2.24.0.bb
@@ -6,9 +6,9 @@ UNIX-like platforms, Windows, OS/2 and BeOS."
LICENSE = "LGPL"
SECTION = "libs"
PRIORITY = "optional"
-DEPENDS = "glib-2.0-native gtk-doc virtual/libiconv virtual/libintl zlib"
+DEPENDS = "glib-2.0-native gtk-doc zlib"
-PR = "r4"
+PR = "r5"
SRC_URI = "\
http://ftp.gnome.org/pub/GNOME/sources/glib/2.24/glib-${PV}.tar.bz2;name=archive \
--
1.7.0.4
^ permalink raw reply related [flat|nested] 45+ messages in thread
* [PATCH 09/16] gnutls_2.8.6.bb: Add recipe for version 2.8.6
2010-06-02 20:34 [PATCH 00/16] Upgrade gettext, GNU utilities, fix general build issues with uclibc distros Khem Raj
` (7 preceding siblings ...)
2010-06-02 20:34 ` [PATCH 08/16] glib-2.0_2.24.0.bb: Remove virtual/libiconv virtual/libintl from DEPENDS Khem Raj
@ 2010-06-02 20:34 ` Khem Raj
2010-06-04 7:40 ` Martin Jansa
2010-06-02 20:34 ` [PATCH 10/16] inetutils_1.8.bb: Add recipe Khem Raj
` (8 subsequent siblings)
17 siblings, 1 reply; 45+ messages in thread
From: Khem Raj @ 2010-06-02 20:34 UTC (permalink / raw)
To: openembedded-devel
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
.../gettextize-with-gettext-0.18.patch | 1042 ++++++++++++++++++++
recipes/gnutls/gnutls-2.8.6/gnutls-openssl.patch | 129 +++
.../gnutls-2.8.6/gnutls-replace-siginterrupt.patch | 41 +
recipes/gnutls/gnutls_2.8.5.bb | 3 +
recipes/gnutls/gnutls_2.8.6.bb | 16 +
5 files changed, 1231 insertions(+), 0 deletions(-)
create mode 100644 recipes/gnutls/gnutls-2.8.6/gettextize-with-gettext-0.18.patch
create mode 100644 recipes/gnutls/gnutls-2.8.6/gnutls-openssl.patch
create mode 100644 recipes/gnutls/gnutls-2.8.6/gnutls-replace-siginterrupt.patch
create mode 100644 recipes/gnutls/gnutls_2.8.6.bb
diff --git a/recipes/gnutls/gnutls-2.8.6/gettextize-with-gettext-0.18.patch b/recipes/gnutls/gnutls-2.8.6/gettextize-with-gettext-0.18.patch
new file mode 100644
index 0000000..5984f98
--- /dev/null
+++ b/recipes/gnutls/gnutls-2.8.6/gettextize-with-gettext-0.18.patch
@@ -0,0 +1,1042 @@
+Index: gnutls-2.8.6/lib/build-aux/config.rpath
+===================================================================
+--- gnutls-2.8.6.orig/lib/build-aux/config.rpath 2009-06-02 11:59:32.000000000 -0700
++++ gnutls-2.8.6/lib/build-aux/config.rpath 2010-05-19 22:15:18.491309044 -0700
+@@ -2,7 +2,7 @@
+ # Output a system dependent set of variables, describing how to set the
+ # run time search path of shared libraries in an executable.
+ #
+-# Copyright 1996-2008 Free Software Foundation, Inc.
++# Copyright 1996-2010 Free Software Foundation, Inc.
+ # Taken from GNU libtool, 2001
+ # Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
+ #
+Index: gnutls-2.8.6/lib/ChangeLog
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ gnutls-2.8.6/lib/ChangeLog 2010-05-19 22:15:18.491309044 -0700
+@@ -0,0 +1,12 @@
++2010-05-19 gettextize <bug-gnu-gettext@gnu.org>
++
++ * m4/gettext.m4: Upgrade to gettext-0.18.
++ * m4/iconv.m4: Upgrade to gettext-0.18.
++ * m4/lib-ld.m4: Upgrade to gettext-0.18.
++ * m4/lib-link.m4: Upgrade to gettext-0.18.
++ * m4/lib-prefix.m4: Upgrade to gettext-0.18.
++ * m4/nls.m4: Upgrade to gettext-0.18.
++ * m4/po.m4: Upgrade to gettext-0.18.
++ * m4/progtest.m4: Upgrade to gettext-0.18.
++ * configure.ac (AM_GNU_GETTEXT_VERSION): Bump to 0.18.
++
+Index: gnutls-2.8.6/lib/configure.ac
+===================================================================
+--- gnutls-2.8.6.orig/lib/configure.ac 2009-11-02 04:08:07.000000000 -0800
++++ gnutls-2.8.6/lib/configure.ac 2010-05-19 22:15:18.491309044 -0700
+@@ -38,7 +38,7 @@ AC_PROG_LIBTOOL
+ LIBGNUTLS_HOOKS
+
+ AM_GNU_GETTEXT([external])
+-AM_GNU_GETTEXT_VERSION([0.17])
++AM_GNU_GETTEXT_VERSION([0.18])
+
+ AC_C_BIGENDIAN
+
+Index: gnutls-2.8.6/lib/m4/gettext.m4
+===================================================================
+--- gnutls-2.8.6.orig/lib/m4/gettext.m4 2010-03-15 03:28:11.000000000 -0700
++++ gnutls-2.8.6/lib/m4/gettext.m4 2010-05-19 22:15:18.491309044 -0700
+@@ -1,5 +1,5 @@
+-# gettext.m4 serial 60 (gettext-0.17)
+-dnl Copyright (C) 1995-2007 Free Software Foundation, Inc.
++# gettext.m4 serial 63 (gettext-0.18)
++dnl Copyright (C) 1995-2010 Free Software Foundation, Inc.
+ dnl This file is free software; the Free Software Foundation
+ dnl gives unlimited permission to copy and/or distribute it,
+ dnl with or without modifications, as long as this notice is preserved.
+@@ -15,7 +15,7 @@ dnl They are *not* in the public domain.
+
+ dnl Authors:
+ dnl Ulrich Drepper <drepper@cygnus.com>, 1995-2000.
+-dnl Bruno Haible <haible@clisp.cons.org>, 2000-2006.
++dnl Bruno Haible <haible@clisp.cons.org>, 2000-2006, 2008-2010.
+
+ dnl Macro to add for using GNU gettext.
+
+@@ -60,6 +60,8 @@ AC_DEFUN([AM_GNU_GETTEXT],
+ ifelse([$1], [], , [ifelse([$1], [external], , [ifelse([$1], [no-libtool], , [ifelse([$1], [use-libtool], ,
+ [errprint([ERROR: invalid first argument to AM_GNU_GETTEXT
+ ])])])])])
++ ifelse(ifelse([$1], [], [old])[]ifelse([$1], [no-libtool], [old]), [old],
++ [AC_DIAGNOSE([obsolete], [Use of AM_GNU_GETTEXT without [external] argument is deprecated.])])
+ ifelse([$2], [], , [ifelse([$2], [need-ngettext], , [ifelse([$2], [need-formatstring-macros], ,
+ [errprint([ERROR: invalid second argument to AM_GNU_GETTEXT
+ ])])])])
+@@ -123,11 +125,11 @@ AC_DEFUN([AM_GNU_GETTEXT],
+ gt_use_preinstalled_gnugettext=no
+ ifelse(gt_included_intl, yes, [
+ AC_MSG_CHECKING([whether included gettext is requested])
+- AC_ARG_WITH(included-gettext,
++ AC_ARG_WITH([included-gettext],
+ [ --with-included-gettext use the GNU gettext library included here],
+ nls_cv_force_use_gnu_gettext=$withval,
+ nls_cv_force_use_gnu_gettext=no)
+- AC_MSG_RESULT($nls_cv_force_use_gnu_gettext)
++ AC_MSG_RESULT([$nls_cv_force_use_gnu_gettext])
+
+ nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext"
+ if test "$nls_cv_force_use_gnu_gettext" != "yes"; then
+@@ -267,7 +269,7 @@ return * gettext ("")$gt_expression_test
+
+ if test "$gt_use_preinstalled_gnugettext" = "yes" \
+ || test "$nls_cv_use_gnu_gettext" = "yes"; then
+- AC_DEFINE(ENABLE_NLS, 1,
++ AC_DEFINE([ENABLE_NLS], [1],
+ [Define to 1 if translation of program messages to the user's native language
+ is requested.])
+ else
+@@ -301,9 +303,9 @@ return * gettext ("")$gt_expression_test
+ fi
+
+ dnl For backward compatibility. Some packages may be using this.
+- AC_DEFINE(HAVE_GETTEXT, 1,
++ AC_DEFINE([HAVE_GETTEXT], [1],
+ [Define if the GNU gettext() function is already present or preinstalled.])
+- AC_DEFINE(HAVE_DCGETTEXT, 1,
++ AC_DEFINE([HAVE_DCGETTEXT], [1],
+ [Define if the GNU dcgettext() function is already present or preinstalled.])
+ fi
+
+@@ -319,9 +321,9 @@ return * gettext ("")$gt_expression_test
+ fi
+
+ dnl Make all variables we use known to autoconf.
+- AC_SUBST(BUILD_INCLUDED_LIBINTL)
+- AC_SUBST(USE_INCLUDED_LIBINTL)
+- AC_SUBST(CATOBJEXT)
++ AC_SUBST([BUILD_INCLUDED_LIBINTL])
++ AC_SUBST([USE_INCLUDED_LIBINTL])
++ AC_SUBST([CATOBJEXT])
+
+ dnl For backward compatibility. Some configure.ins may be using this.
+ nls_cv_header_intl=
+@@ -329,36 +331,36 @@ return * gettext ("")$gt_expression_test
+
+ dnl For backward compatibility. Some Makefiles may be using this.
+ DATADIRNAME=share
+- AC_SUBST(DATADIRNAME)
++ AC_SUBST([DATADIRNAME])
+
+ dnl For backward compatibility. Some Makefiles may be using this.
+ INSTOBJEXT=.mo
+- AC_SUBST(INSTOBJEXT)
++ AC_SUBST([INSTOBJEXT])
+
+ dnl For backward compatibility. Some Makefiles may be using this.
+ GENCAT=gencat
+- AC_SUBST(GENCAT)
++ AC_SUBST([GENCAT])
+
+ dnl For backward compatibility. Some Makefiles may be using this.
+ INTLOBJS=
+ if test "$USE_INCLUDED_LIBINTL" = yes; then
+ INTLOBJS="\$(GETTOBJS)"
+ fi
+- AC_SUBST(INTLOBJS)
++ AC_SUBST([INTLOBJS])
+
+ dnl Enable libtool support if the surrounding package wishes it.
+ INTL_LIBTOOL_SUFFIX_PREFIX=gt_libtool_suffix_prefix
+- AC_SUBST(INTL_LIBTOOL_SUFFIX_PREFIX)
++ AC_SUBST([INTL_LIBTOOL_SUFFIX_PREFIX])
+ ])
+
+ dnl For backward compatibility. Some Makefiles may be using this.
+ INTLLIBS="$LIBINTL"
+- AC_SUBST(INTLLIBS)
++ AC_SUBST([INTLLIBS])
+
+ dnl Make all documented variables known to autoconf.
+- AC_SUBST(LIBINTL)
+- AC_SUBST(LTLIBINTL)
+- AC_SUBST(POSUB)
++ AC_SUBST([LIBINTL])
++ AC_SUBST([LTLIBINTL])
++ AC_SUBST([POSUB])
+ ])
+
+
+Index: gnutls-2.8.6/lib/m4/iconv.m4
+===================================================================
+--- gnutls-2.8.6.orig/lib/m4/iconv.m4 2010-03-15 03:28:11.000000000 -0700
++++ gnutls-2.8.6/lib/m4/iconv.m4 2010-05-19 22:15:18.491309044 -0700
+@@ -1,5 +1,5 @@
+-# iconv.m4 serial AM6 (gettext-0.17)
+-dnl Copyright (C) 2000-2002, 2007 Free Software Foundation, Inc.
++# iconv.m4 serial 9 (gettext-0.18)
++dnl Copyright (C) 2000-2002, 2007-2010 Free Software Foundation, Inc.
+ dnl This file is free software; the Free Software Foundation
+ dnl gives unlimited permission to copy and/or distribute it,
+ dnl with or without modifications, as long as this notice is preserved.
+@@ -34,7 +34,7 @@ AC_DEFUN([AM_ICONV_LINK],
+ am_save_CPPFLAGS="$CPPFLAGS"
+ AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCICONV])
+
+- AC_CACHE_CHECK([for iconv], am_cv_func_iconv, [
++ AC_CACHE_CHECK([for iconv], [am_cv_func_iconv], [
+ am_cv_func_iconv="no, consider installing GNU libiconv"
+ am_cv_lib_iconv=no
+ AC_TRY_LINK([#include <stdlib.h>
+@@ -42,7 +42,7 @@ AC_DEFUN([AM_ICONV_LINK],
+ [iconv_t cd = iconv_open("","");
+ iconv(cd,NULL,NULL,NULL,NULL);
+ iconv_close(cd);],
+- am_cv_func_iconv=yes)
++ [am_cv_func_iconv=yes])
+ if test "$am_cv_func_iconv" != yes; then
+ am_save_LIBS="$LIBS"
+ LIBS="$LIBS $LIBICONV"
+@@ -51,14 +51,14 @@ AC_DEFUN([AM_ICONV_LINK],
+ [iconv_t cd = iconv_open("","");
+ iconv(cd,NULL,NULL,NULL,NULL);
+ iconv_close(cd);],
+- am_cv_lib_iconv=yes
+- am_cv_func_iconv=yes)
++ [am_cv_lib_iconv=yes]
++ [am_cv_func_iconv=yes])
+ LIBS="$am_save_LIBS"
+ fi
+ ])
+ if test "$am_cv_func_iconv" = yes; then
+- AC_CACHE_CHECK([for working iconv], am_cv_func_iconv_works, [
+- dnl This tests against bugs in AIX 5.1 and HP-UX 11.11.
++ AC_CACHE_CHECK([for working iconv], [am_cv_func_iconv_works], [
++ dnl This tests against bugs in AIX 5.1, HP-UX 11.11, Solaris 10.
+ am_save_LIBS="$LIBS"
+ if test $am_cv_lib_iconv = yes; then
+ LIBS="$LIBS $LIBICONV"
+@@ -87,6 +87,25 @@ int main ()
+ return 1;
+ }
+ }
++ /* Test against Solaris 10 bug: Failures are not distinguishable from
++ successful returns. */
++ {
++ iconv_t cd_ascii_to_88591 = iconv_open ("ISO8859-1", "646");
++ if (cd_ascii_to_88591 != (iconv_t)(-1))
++ {
++ static const char input[] = "\263";
++ char buf[10];
++ const char *inptr = input;
++ size_t inbytesleft = strlen (input);
++ char *outptr = buf;
++ size_t outbytesleft = sizeof (buf);
++ size_t res = iconv (cd_ascii_to_88591,
++ (char **) &inptr, &inbytesleft,
++ &outptr, &outbytesleft);
++ if (res == 0)
++ return 1;
++ }
++ }
+ #if 0 /* This bug could be worked around by the caller. */
+ /* Test against HP-UX 11.11 bug: Positive return value instead of 0. */
+ {
+@@ -134,7 +153,7 @@ int main ()
+ am_func_iconv=no am_cv_lib_iconv=no
+ fi
+ if test "$am_func_iconv" = yes; then
+- AC_DEFINE(HAVE_ICONV, 1,
++ AC_DEFINE([HAVE_ICONV], [1],
+ [Define if you have the iconv() function and it works.])
+ fi
+ if test "$am_cv_lib_iconv" = yes; then
+@@ -147,8 +166,8 @@ int main ()
+ LIBICONV=
+ LTLIBICONV=
+ fi
+- AC_SUBST(LIBICONV)
+- AC_SUBST(LTLIBICONV)
++ AC_SUBST([LIBICONV])
++ AC_SUBST([LTLIBICONV])
+ ])
+
+ AC_DEFUN([AM_ICONV],
+@@ -156,7 +175,7 @@ AC_DEFUN([AM_ICONV],
+ AM_ICONV_LINK
+ if test "$am_cv_func_iconv" = yes; then
+ AC_MSG_CHECKING([for iconv declaration])
+- AC_CACHE_VAL(am_cv_proto_iconv, [
++ AC_CACHE_VAL([am_cv_proto_iconv], [
+ AC_TRY_COMPILE([
+ #include <stdlib.h>
+ #include <iconv.h>
+@@ -169,12 +188,12 @@ size_t iconv (iconv_t cd, char * *inbuf,
+ #else
+ size_t iconv();
+ #endif
+-], [], am_cv_proto_iconv_arg1="", am_cv_proto_iconv_arg1="const")
++], [], [am_cv_proto_iconv_arg1=""], [am_cv_proto_iconv_arg1="const"])
+ am_cv_proto_iconv="extern size_t iconv (iconv_t cd, $am_cv_proto_iconv_arg1 char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);"])
+ am_cv_proto_iconv=`echo "[$]am_cv_proto_iconv" | tr -s ' ' | sed -e 's/( /(/'`
+- AC_MSG_RESULT([$]{ac_t:-
+- }[$]am_cv_proto_iconv)
+- AC_DEFINE_UNQUOTED(ICONV_CONST, $am_cv_proto_iconv_arg1,
++ AC_MSG_RESULT([
++ $am_cv_proto_iconv])
++ AC_DEFINE_UNQUOTED([ICONV_CONST], [$am_cv_proto_iconv_arg1],
+ [Define as const if the declaration of iconv() needs const.])
+ fi
+ ])
+Index: gnutls-2.8.6/lib/m4/lib-ld.m4
+===================================================================
+--- gnutls-2.8.6.orig/lib/m4/lib-ld.m4 2010-03-15 03:28:11.000000000 -0700
++++ gnutls-2.8.6/lib/m4/lib-ld.m4 2010-05-19 22:15:18.511309002 -0700
+@@ -1,5 +1,5 @@
+-# lib-ld.m4 serial 3 (gettext-0.13)
+-dnl Copyright (C) 1996-2003 Free Software Foundation, Inc.
++# lib-ld.m4 serial 4 (gettext-0.18)
++dnl Copyright (C) 1996-2003, 2009-2010 Free Software Foundation, Inc.
+ dnl This file is free software; the Free Software Foundation
+ dnl gives unlimited permission to copy and/or distribute it,
+ dnl with or without modifications, as long as this notice is preserved.
+@@ -10,7 +10,7 @@ dnl with libtool.m4.
+
+ dnl From libtool-1.4. Sets the variable with_gnu_ld to yes or no.
+ AC_DEFUN([AC_LIB_PROG_LD_GNU],
+-[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], acl_cv_prog_gnu_ld,
++[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], [acl_cv_prog_gnu_ld],
+ [# I'd rather use --version here, but apparently some GNU ld's only accept -v.
+ case `$LD -v 2>&1 </dev/null` in
+ *GNU* | *'with BFD'*)
+@@ -23,7 +23,7 @@ with_gnu_ld=$acl_cv_prog_gnu_ld
+
+ dnl From libtool-1.4. Sets the variable LD.
+ AC_DEFUN([AC_LIB_PROG_LD],
+-[AC_ARG_WITH(gnu-ld,
++[AC_ARG_WITH([gnu-ld],
+ [ --with-gnu-ld assume the C compiler uses GNU ld [default=no]],
+ test "$withval" = no || with_gnu_ld=yes, with_gnu_ld=no)
+ AC_REQUIRE([AC_PROG_CC])dnl
+@@ -59,7 +59,7 @@ if test "$GCC" = yes; then
+ # Canonicalize the path of ld
+ ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'`
+ while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
+- ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`
++ ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`
+ done
+ test -z "$LD" && LD="$ac_prog"
+ ;;
+@@ -77,7 +77,7 @@ elif test "$with_gnu_ld" = yes; then
+ else
+ AC_MSG_CHECKING([for non-GNU ld])
+ fi
+-AC_CACHE_VAL(acl_cv_path_LD,
++AC_CACHE_VAL([acl_cv_path_LD],
+ [if test -z "$LD"; then
+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
+ for ac_dir in $PATH; do
+@@ -89,9 +89,9 @@ AC_CACHE_VAL(acl_cv_path_LD,
+ # Break only if it was the GNU/non-GNU ld that we prefer.
+ case `"$acl_cv_path_LD" -v 2>&1 < /dev/null` in
+ *GNU* | *'with BFD'*)
+- test "$with_gnu_ld" != no && break ;;
++ test "$with_gnu_ld" != no && break ;;
+ *)
+- test "$with_gnu_ld" != yes && break ;;
++ test "$with_gnu_ld" != yes && break ;;
+ esac
+ fi
+ done
+@@ -101,9 +101,9 @@ else
+ fi])
+ LD="$acl_cv_path_LD"
+ if test -n "$LD"; then
+- AC_MSG_RESULT($LD)
++ AC_MSG_RESULT([$LD])
+ else
+- AC_MSG_RESULT(no)
++ AC_MSG_RESULT([no])
+ fi
+ test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
+ AC_LIB_PROG_LD_GNU
+Index: gnutls-2.8.6/lib/m4/lib-link.m4
+===================================================================
+--- gnutls-2.8.6.orig/lib/m4/lib-link.m4 2010-03-15 03:28:11.000000000 -0700
++++ gnutls-2.8.6/lib/m4/lib-link.m4 2010-05-19 22:15:18.521282615 -0700
+@@ -1,12 +1,12 @@
+-# lib-link.m4 serial 13 (gettext-0.17)
+-dnl Copyright (C) 2001-2007 Free Software Foundation, Inc.
++# lib-link.m4 serial 21 (gettext-0.18)
++dnl Copyright (C) 2001-2010 Free Software Foundation, Inc.
+ dnl This file is free software; the Free Software Foundation
+ dnl gives unlimited permission to copy and/or distribute it,
+ dnl with or without modifications, as long as this notice is preserved.
+
+ dnl From Bruno Haible.
+
+-AC_PREREQ(2.54)
++AC_PREREQ([2.54])
+
+ dnl AC_LIB_LINKFLAGS(name [, dependencies]) searches for libname and
+ dnl the libraries corresponding to explicit and implicit dependencies.
+@@ -18,9 +18,9 @@ AC_DEFUN([AC_LIB_LINKFLAGS],
+ [
+ AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
+ AC_REQUIRE([AC_LIB_RPATH])
+- define([Name],[translit([$1],[./-], [___])])
+- define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
+- [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
++ pushdef([Name],[translit([$1],[./-], [___])])
++ pushdef([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
++ [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
+ AC_CACHE_CHECK([how to link with lib[]$1], [ac_cv_lib[]Name[]_libs], [
+ AC_LIB_LINKFLAGS_BODY([$1], [$2])
+ ac_cv_lib[]Name[]_libs="$LIB[]NAME"
+@@ -39,16 +39,17 @@ AC_DEFUN([AC_LIB_LINKFLAGS],
+ dnl Also set HAVE_LIB[]NAME so that AC_LIB_HAVE_LINKFLAGS can reuse the
+ dnl results of this search when this library appears as a dependency.
+ HAVE_LIB[]NAME=yes
+- undefine([Name])
+- undefine([NAME])
++ popdef([NAME])
++ popdef([Name])
+ ])
+
+-dnl AC_LIB_HAVE_LINKFLAGS(name, dependencies, includes, testcode)
++dnl AC_LIB_HAVE_LINKFLAGS(name, dependencies, includes, testcode, [missing-message])
+ dnl searches for libname and the libraries corresponding to explicit and
+ dnl implicit dependencies, together with the specified include files and
+-dnl the ability to compile and link the specified testcode. If found, it
+-dnl sets and AC_SUBSTs HAVE_LIB${NAME}=yes and the LIB${NAME} and
+-dnl LTLIB${NAME} variables and augments the CPPFLAGS variable, and
++dnl the ability to compile and link the specified testcode. The missing-message
++dnl defaults to 'no' and may contain additional hints for the user.
++dnl If found, it sets and AC_SUBSTs HAVE_LIB${NAME}=yes and the LIB${NAME}
++dnl and LTLIB${NAME} variables and augments the CPPFLAGS variable, and
+ dnl #defines HAVE_LIB${NAME} to 1. Otherwise, it sets and AC_SUBSTs
+ dnl HAVE_LIB${NAME}=no and LIB${NAME} and LTLIB${NAME} to empty.
+ dnl Sets and AC_SUBSTs the LIB${NAME}_PREFIX variable to nonempty if libname
+@@ -57,9 +58,9 @@ AC_DEFUN([AC_LIB_HAVE_LINKFLAGS],
+ [
+ AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
+ AC_REQUIRE([AC_LIB_RPATH])
+- define([Name],[translit([$1],[./-], [___])])
+- define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
+- [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
++ pushdef([Name],[translit([$1],[./-], [___])])
++ pushdef([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
++ [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
+
+ dnl Search for lib[]Name and define LIB[]NAME, LTLIB[]NAME and INC[]NAME
+ dnl accordingly.
+@@ -73,13 +74,25 @@ AC_DEFUN([AC_LIB_HAVE_LINKFLAGS],
+
+ AC_CACHE_CHECK([for lib[]$1], [ac_cv_lib[]Name], [
+ ac_save_LIBS="$LIBS"
+- LIBS="$LIBS $LIB[]NAME"
+- AC_TRY_LINK([$3], [$4], [ac_cv_lib[]Name=yes], [ac_cv_lib[]Name=no])
++ dnl If $LIB[]NAME contains some -l options, add it to the end of LIBS,
++ dnl because these -l options might require -L options that are present in
++ dnl LIBS. -l options benefit only from the -L options listed before it.
++ dnl Otherwise, add it to the front of LIBS, because it may be a static
++ dnl library that depends on another static library that is present in LIBS.
++ dnl Static libraries benefit only from the static libraries listed after
++ dnl it.
++ case " $LIB[]NAME" in
++ *" -l"*) LIBS="$LIBS $LIB[]NAME" ;;
++ *) LIBS="$LIB[]NAME $LIBS" ;;
++ esac
++ AC_TRY_LINK([$3], [$4],
++ [ac_cv_lib[]Name=yes],
++ [ac_cv_lib[]Name='m4_if([$5], [], [no], [[$5]])'])
+ LIBS="$ac_save_LIBS"
+ ])
+ if test "$ac_cv_lib[]Name" = yes; then
+ HAVE_LIB[]NAME=yes
+- AC_DEFINE([HAVE_LIB]NAME, 1, [Define if you have the $1 library.])
++ AC_DEFINE([HAVE_LIB]NAME, 1, [Define if you have the lib][$1 library.])
+ AC_MSG_CHECKING([how to link with lib[]$1])
+ AC_MSG_RESULT([$LIB[]NAME])
+ else
+@@ -95,8 +108,8 @@ AC_DEFUN([AC_LIB_HAVE_LINKFLAGS],
+ AC_SUBST([LIB]NAME)
+ AC_SUBST([LTLIB]NAME)
+ AC_SUBST([LIB]NAME[_PREFIX])
+- undefine([Name])
+- undefine([NAME])
++ popdef([NAME])
++ popdef([Name])
+ ])
+
+ dnl Determine the platform dependent parameters needed to use rpath:
+@@ -114,7 +127,7 @@ AC_DEFUN([AC_LIB_RPATH],
+ AC_REQUIRE([AC_LIB_PROG_LD]) dnl we use $LD, $with_gnu_ld
+ AC_REQUIRE([AC_CANONICAL_HOST]) dnl we use $host
+ AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT]) dnl we use $ac_aux_dir
+- AC_CACHE_CHECK([for shared library run path origin], acl_cv_rpath, [
++ AC_CACHE_CHECK([for shared library run path origin], [acl_cv_rpath], [
+ CC="$CC" GCC="$GCC" LDFLAGS="$LDFLAGS" LD="$LD" with_gnu_ld="$with_gnu_ld" \
+ ${CONFIG_SHELL-/bin/sh} "$ac_aux_dir/config.rpath" "$host" > conftest.sh
+ . ./conftest.sh
+@@ -131,11 +144,32 @@ AC_DEFUN([AC_LIB_RPATH],
+ acl_hardcode_direct="$acl_cv_hardcode_direct"
+ acl_hardcode_minus_L="$acl_cv_hardcode_minus_L"
+ dnl Determine whether the user wants rpath handling at all.
+- AC_ARG_ENABLE(rpath,
++ AC_ARG_ENABLE([rpath],
+ [ --disable-rpath do not hardcode runtime library paths],
+ :, enable_rpath=yes)
+ ])
+
++dnl AC_LIB_FROMPACKAGE(name, package)
++dnl declares that libname comes from the given package. The configure file
++dnl will then not have a --with-libname-prefix option but a
++dnl --with-package-prefix option. Several libraries can come from the same
++dnl package. This declaration must occur before an AC_LIB_LINKFLAGS or similar
++dnl macro call that searches for libname.
++AC_DEFUN([AC_LIB_FROMPACKAGE],
++[
++ pushdef([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
++ [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
++ define([acl_frompackage_]NAME, [$2])
++ popdef([NAME])
++ pushdef([PACK],[$2])
++ pushdef([PACKUP],[translit(PACK,[abcdefghijklmnopqrstuvwxyz./-],
++ [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
++ define([acl_libsinpackage_]PACKUP,
++ m4_ifdef([acl_libsinpackage_]PACKUP, [acl_libsinpackage_]PACKUP[[, ]],)[lib$1])
++ popdef([PACKUP])
++ popdef([PACK])
++])
++
+ dnl AC_LIB_LINKFLAGS_BODY(name [, dependencies]) searches for libname and
+ dnl the libraries corresponding to explicit and implicit dependencies.
+ dnl Sets the LIB${NAME}, LTLIB${NAME} and INC${NAME} variables.
+@@ -144,19 +178,23 @@ dnl in ${LIB${NAME}_PREFIX}/$acl_libdirs
+ AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
+ [
+ AC_REQUIRE([AC_LIB_PREPARE_MULTILIB])
+- define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
+- [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
++ pushdef([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
++ [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
++ pushdef([PACK],[m4_ifdef([acl_frompackage_]NAME, [acl_frompackage_]NAME, lib[$1])])
++ pushdef([PACKUP],[translit(PACK,[abcdefghijklmnopqrstuvwxyz./-],
++ [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
++ pushdef([PACKLIBS],[m4_ifdef([acl_frompackage_]NAME, [acl_libsinpackage_]PACKUP, lib[$1])])
+ dnl Autoconf >= 2.61 supports dots in --with options.
+- define([N_A_M_E],[m4_if(m4_version_compare(m4_defn([m4_PACKAGE_VERSION]),[2.61]),[-1],[translit([$1],[.],[_])],[$1])])
++ pushdef([P_A_C_K],[m4_if(m4_version_compare(m4_defn([m4_PACKAGE_VERSION]),[2.61]),[-1],[translit(PACK,[.],[_])],PACK)])
+ dnl By default, look in $includedir and $libdir.
+ use_additional=yes
+ AC_LIB_WITH_FINAL_PREFIX([
+ eval additional_includedir=\"$includedir\"
+ eval additional_libdir=\"$libdir\"
+ ])
+- AC_LIB_ARG_WITH([lib]N_A_M_E[-prefix],
+-[ --with-lib]N_A_M_E[-prefix[=DIR] search for lib$1 in DIR/include and DIR/lib
+- --without-lib]N_A_M_E[-prefix don't search for lib$1 in includedir and libdir],
++ AC_ARG_WITH(P_A_C_K[-prefix],
++[[ --with-]]P_A_C_K[[-prefix[=DIR] search for ]PACKLIBS[ in DIR/include and DIR/lib
++ --without-]]P_A_C_K[[-prefix don't search for ]PACKLIBS[ in includedir and libdir]],
+ [
+ if test "X$withval" = "Xno"; then
+ use_additional=no
+@@ -169,6 +207,10 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
+ else
+ additional_includedir="$withval/include"
+ additional_libdir="$withval/$acl_libdirstem"
++ if test "$acl_libdirstem2" != "$acl_libdirstem" \
++ && ! test -d "$withval/$acl_libdirstem"; then
++ additional_libdir="$withval/$acl_libdirstem2"
++ fi
+ fi
+ fi
+ ])
+@@ -178,6 +220,9 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
+ LTLIB[]NAME=
+ INC[]NAME=
+ LIB[]NAME[]_PREFIX=
++ dnl HAVE_LIB${NAME} is an indicator that LIB${NAME}, LTLIB${NAME} have been
++ dnl computed. So it has to be reset here.
++ HAVE_LIB[]NAME=
+ rpathdirs=
+ ltrpathdirs=
+ names_already_handled=
+@@ -267,6 +312,9 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
+ fi
+ fi
+ fi
++ dnl Just let the compiler find the library, the compiler and user are smarter then this script
++ dnl when cross compiling and working with a relocated install.
++ found_dir=""
+ if test "X$found_dir" = "X"; then
+ for x in $LDFLAGS $LTLIB[]NAME; do
+ AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
+@@ -327,7 +375,9 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
+ dnl Linking with a shared library. We attempt to hardcode its
+ dnl directory into the executable's runpath, unless it's the
+ dnl standard /usr/lib.
+- if test "$enable_rpath" = no || test "X$found_dir" = "X/usr/$acl_libdirstem"; then
++ if test "$enable_rpath" = no \
++ || test "X$found_dir" = "X/usr/$acl_libdirstem" \
++ || test "X$found_dir" = "X/usr/$acl_libdirstem2"; then
+ dnl No hardcoding is needed.
+ LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
+ else
+@@ -415,7 +465,16 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
+ case "$found_dir" in
+ */$acl_libdirstem | */$acl_libdirstem/)
+ basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem/"'*$,,'`
+- LIB[]NAME[]_PREFIX="$basedir"
++ if test "$name" = '$1'; then
++ LIB[]NAME[]_PREFIX="$basedir"
++ fi
++ additional_includedir="$basedir/include"
++ ;;
++ */$acl_libdirstem2 | */$acl_libdirstem2/)
++ basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem2/"'*$,,'`
++ if test "$name" = '$1'; then
++ LIB[]NAME[]_PREFIX="$basedir"
++ fi
+ additional_includedir="$basedir/include"
+ ;;
+ esac
+@@ -476,9 +535,11 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
+ dnl 3. if it's already present in $LDFLAGS or the already
+ dnl constructed $LIBNAME,
+ dnl 4. if it doesn't exist as a directory.
+- if test "X$additional_libdir" != "X/usr/$acl_libdirstem"; then
++ if test "X$additional_libdir" != "X/usr/$acl_libdirstem" \
++ && test "X$additional_libdir" != "X/usr/$acl_libdirstem2"; then
+ haveit=
+- if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem"; then
++ if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem" \
++ || test "X$additional_libdir" = "X/usr/local/$acl_libdirstem2"; then
+ if test -n "$GCC"; then
+ case $host_os in
+ linux* | gnu* | k*bsd*-gnu) haveit=yes;;
+@@ -609,6 +670,11 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
+ LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-R$found_dir"
+ done
+ fi
++ popdef([P_A_C_K])
++ popdef([PACKLIBS])
++ popdef([PACKUP])
++ popdef([PACK])
++ popdef([NAME])
+ ])
+
+ dnl AC_LIB_APPENDTOVAR(VAR, CONTENTS) appends the elements of CONTENTS to VAR,
+@@ -654,7 +720,8 @@ AC_DEFUN([AC_LIB_LINKFLAGS_FROM_LIBS],
+ if test -n "$next"; then
+ dir="$next"
+ dnl No need to hardcode the standard /usr/lib.
+- if test "X$dir" != "X/usr/$acl_libdirstem"; then
++ if test "X$dir" != "X/usr/$acl_libdirstem" \
++ && test "X$dir" != "X/usr/$acl_libdirstem2"; then
+ rpathdirs="$rpathdirs $dir"
+ fi
+ next=
+@@ -663,7 +730,8 @@ AC_DEFUN([AC_LIB_LINKFLAGS_FROM_LIBS],
+ -L) next=yes ;;
+ -L*) dir=`echo "X$opt" | sed -e 's,^X-L,,'`
+ dnl No need to hardcode the standard /usr/lib.
+- if test "X$dir" != "X/usr/$acl_libdirstem"; then
++ if test "X$dir" != "X/usr/$acl_libdirstem" \
++ && test "X$dir" != "X/usr/$acl_libdirstem2"; then
+ rpathdirs="$rpathdirs $dir"
+ fi
+ next= ;;
+Index: gnutls-2.8.6/lib/m4/lib-prefix.m4
+===================================================================
+--- gnutls-2.8.6.orig/lib/m4/lib-prefix.m4 2010-03-15 03:28:11.000000000 -0700
++++ gnutls-2.8.6/lib/m4/lib-prefix.m4 2010-05-19 22:15:18.521282615 -0700
+@@ -1,5 +1,5 @@
+-# lib-prefix.m4 serial 5 (gettext-0.15)
+-dnl Copyright (C) 2001-2005 Free Software Foundation, Inc.
++# lib-prefix.m4 serial 7 (gettext-0.18)
++dnl Copyright (C) 2001-2005, 2008-2010 Free Software Foundation, Inc.
+ dnl This file is free software; the Free Software Foundation
+ dnl gives unlimited permission to copy and/or distribute it,
+ dnl with or without modifications, as long as this notice is preserved.
+@@ -153,33 +153,72 @@ AC_DEFUN([AC_LIB_WITH_FINAL_PREFIX],
+ prefix="$acl_save_prefix"
+ ])
+
+-dnl AC_LIB_PREPARE_MULTILIB creates a variable acl_libdirstem, containing
+-dnl the basename of the libdir, either "lib" or "lib64".
++dnl AC_LIB_PREPARE_MULTILIB creates
++dnl - a variable acl_libdirstem, containing the basename of the libdir, either
++dnl "lib" or "lib64" or "lib/64",
++dnl - a variable acl_libdirstem2, as a secondary possible value for
++dnl acl_libdirstem, either the same as acl_libdirstem or "lib/sparcv9" or
++dnl "lib/amd64".
+ AC_DEFUN([AC_LIB_PREPARE_MULTILIB],
+ [
+- dnl There is no formal standard regarding lib and lib64. The current
+- dnl practice is that on a system supporting 32-bit and 64-bit instruction
+- dnl sets or ABIs, 64-bit libraries go under $prefix/lib64 and 32-bit
+- dnl libraries go under $prefix/lib. We determine the compiler's default
+- dnl mode by looking at the compiler's library search path. If at least
+- dnl of its elements ends in /lib64 or points to a directory whose absolute
+- dnl pathname ends in /lib64, we assume a 64-bit ABI. Otherwise we use the
+- dnl default, namely "lib".
++ dnl There is no formal standard regarding lib and lib64.
++ dnl On glibc systems, the current practice is that on a system supporting
++ dnl 32-bit and 64-bit instruction sets or ABIs, 64-bit libraries go under
++ dnl $prefix/lib64 and 32-bit libraries go under $prefix/lib. We determine
++ dnl the compiler's default mode by looking at the compiler's library search
++ dnl path. If at least one of its elements ends in /lib64 or points to a
++ dnl directory whose absolute pathname ends in /lib64, we assume a 64-bit ABI.
++ dnl Otherwise we use the default, namely "lib".
++ dnl On Solaris systems, the current practice is that on a system supporting
++ dnl 32-bit and 64-bit instruction sets or ABIs, 64-bit libraries go under
++ dnl $prefix/lib/64 (which is a symlink to either $prefix/lib/sparcv9 or
++ dnl $prefix/lib/amd64) and 32-bit libraries go under $prefix/lib.
++ AC_REQUIRE([AC_CANONICAL_HOST])
+ acl_libdirstem=lib
+- searchpath=`(LC_ALL=C $CC -print-search-dirs) 2>/dev/null | sed -n -e 's,^libraries: ,,p' | sed -e 's,^=,,'`
+- if test -n "$searchpath"; then
+- acl_save_IFS="${IFS= }"; IFS=":"
+- for searchdir in $searchpath; do
+- if test -d "$searchdir"; then
+- case "$searchdir" in
+- */lib64/ | */lib64 ) acl_libdirstem=lib64 ;;
+- *) searchdir=`cd "$searchdir" && pwd`
+- case "$searchdir" in
+- */lib64 ) acl_libdirstem=lib64 ;;
+- esac ;;
++ acl_libdirstem2=
++ case "$host_os" in
++ solaris*)
++ dnl See Solaris 10 Software Developer Collection > Solaris 64-bit Developer's Guide > The Development Environment
++ dnl <http://docs.sun.com/app/docs/doc/816-5138/dev-env?l=en&a=view>.
++ dnl "Portable Makefiles should refer to any library directories using the 64 symbolic link."
++ dnl But we want to recognize the sparcv9 or amd64 subdirectory also if the
++ dnl symlink is missing, so we set acl_libdirstem2 too.
++ AC_CACHE_CHECK([for 64-bit host], [gl_cv_solaris_64bit],
++ [AC_EGREP_CPP([sixtyfour bits], [
++#ifdef _LP64
++sixtyfour bits
++#endif
++ ], [gl_cv_solaris_64bit=yes], [gl_cv_solaris_64bit=no])
++ ])
++ if test $gl_cv_solaris_64bit = yes; then
++ acl_libdirstem=lib/64
++ case "$host_cpu" in
++ sparc*) acl_libdirstem2=lib/sparcv9 ;;
++ i*86 | x86_64) acl_libdirstem2=lib/amd64 ;;
+ esac
+ fi
+- done
+- IFS="$acl_save_IFS"
+- fi
++ ;;
++ *)
++ searchpath=`(LC_ALL=C $CC -print-search-dirs) 2>/dev/null | sed -n -e 's,^libraries: ,,p' | sed -e 's,^=,,'`
++ if test -n "$searchpath"; then
++ acl_save_IFS="${IFS= }"; IFS=":"
++ for searchdir in $searchpath; do
++ if test -d "$searchdir"; then
++ case "$searchdir" in
++ */lib64/ | */lib64 ) acl_libdirstem=lib64 ;;
++ */../ | */.. )
++ # Better ignore directories of this form. They are misleading.
++ ;;
++ *) searchdir=`cd "$searchdir" && pwd`
++ case "$searchdir" in
++ */lib64 ) acl_libdirstem=lib64 ;;
++ esac ;;
++ esac
++ fi
++ done
++ IFS="$acl_save_IFS"
++ fi
++ ;;
++ esac
++ test -n "$acl_libdirstem2" || acl_libdirstem2="$acl_libdirstem"
+ ])
+Index: gnutls-2.8.6/lib/m4/nls.m4
+===================================================================
+--- gnutls-2.8.6.orig/lib/m4/nls.m4 2010-03-15 03:28:11.000000000 -0700
++++ gnutls-2.8.6/lib/m4/nls.m4 2010-05-19 22:15:18.521282615 -0700
+@@ -1,5 +1,6 @@
+-# nls.m4 serial 3 (gettext-0.15)
+-dnl Copyright (C) 1995-2003, 2005-2006 Free Software Foundation, Inc.
++# nls.m4 serial 5 (gettext-0.18)
++dnl Copyright (C) 1995-2003, 2005-2006, 2008-2010 Free Software Foundation,
++dnl Inc.
+ dnl This file is free software; the Free Software Foundation
+ dnl gives unlimited permission to copy and/or distribute it,
+ dnl with or without modifications, as long as this notice is preserved.
+@@ -17,15 +18,15 @@ dnl Authors:
+ dnl Ulrich Drepper <drepper@cygnus.com>, 1995-2000.
+ dnl Bruno Haible <haible@clisp.cons.org>, 2000-2003.
+
+-AC_PREREQ(2.50)
++AC_PREREQ([2.50])
+
+ AC_DEFUN([AM_NLS],
+ [
+ AC_MSG_CHECKING([whether NLS is requested])
+ dnl Default is enabled NLS
+- AC_ARG_ENABLE(nls,
++ AC_ARG_ENABLE([nls],
+ [ --disable-nls do not use Native Language Support],
+ USE_NLS=$enableval, USE_NLS=yes)
+- AC_MSG_RESULT($USE_NLS)
+- AC_SUBST(USE_NLS)
++ AC_MSG_RESULT([$USE_NLS])
++ AC_SUBST([USE_NLS])
+ ])
+Index: gnutls-2.8.6/lib/m4/po.m4
+===================================================================
+--- gnutls-2.8.6.orig/lib/m4/po.m4 2010-03-15 03:28:11.000000000 -0700
++++ gnutls-2.8.6/lib/m4/po.m4 2010-05-19 22:15:18.521282615 -0700
+@@ -1,5 +1,5 @@
+-# po.m4 serial 15 (gettext-0.17)
+-dnl Copyright (C) 1995-2007 Free Software Foundation, Inc.
++# po.m4 serial 17 (gettext-0.18)
++dnl Copyright (C) 1995-2010 Free Software Foundation, Inc.
+ dnl This file is free software; the Free Software Foundation
+ dnl gives unlimited permission to copy and/or distribute it,
+ dnl with or without modifications, as long as this notice is preserved.
+@@ -17,7 +17,7 @@ dnl Authors:
+ dnl Ulrich Drepper <drepper@cygnus.com>, 1995-2000.
+ dnl Bruno Haible <haible@clisp.cons.org>, 2000-2003.
+
+-AC_PREREQ(2.50)
++AC_PREREQ([2.50])
+
+ dnl Checks for all prerequisites of the po subdirectory.
+ AC_DEFUN([AM_PO_SUBDIRS],
+@@ -29,7 +29,7 @@ AC_DEFUN([AM_PO_SUBDIRS],
+
+ dnl Release version of the gettext macros. This is used to ensure that
+ dnl the gettext macros and po/Makefile.in.in are in sync.
+- AC_SUBST([GETTEXT_MACRO_VERSION], [0.17])
++ AC_SUBST([GETTEXT_MACRO_VERSION], [0.18])
+
+ dnl Perform the following tests also if --disable-nls has been given,
+ dnl because they are needed for "make dist" to work.
+@@ -41,7 +41,7 @@ AC_DEFUN([AM_PO_SUBDIRS],
+ [$ac_dir/$ac_word --statistics /dev/null >&]AS_MESSAGE_LOG_FD[ 2>&1 &&
+ (if $ac_dir/$ac_word --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi)],
+ :)
+- AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
++ AC_PATH_PROG([GMSGFMT], [gmsgfmt], [$MSGFMT])
+
+ dnl Test whether it is GNU msgfmt >= 0.15.
+ changequote(,)dnl
+Index: gnutls-2.8.6/lib/m4/progtest.m4
+===================================================================
+--- gnutls-2.8.6.orig/lib/m4/progtest.m4 2010-03-15 03:28:11.000000000 -0700
++++ gnutls-2.8.6/lib/m4/progtest.m4 2010-05-19 22:15:18.521282615 -0700
+@@ -1,5 +1,5 @@
+-# progtest.m4 serial 4 (gettext-0.14.2)
+-dnl Copyright (C) 1996-2003, 2005 Free Software Foundation, Inc.
++# progtest.m4 serial 6 (gettext-0.18)
++dnl Copyright (C) 1996-2003, 2005, 2008-2010 Free Software Foundation, Inc.
+ dnl This file is free software; the Free Software Foundation
+ dnl gives unlimited permission to copy and/or distribute it,
+ dnl with or without modifications, as long as this notice is preserved.
+@@ -16,7 +16,7 @@ dnl They are *not* in the public domain.
+ dnl Authors:
+ dnl Ulrich Drepper <drepper@cygnus.com>, 1996.
+
+-AC_PREREQ(2.50)
++AC_PREREQ([2.50])
+
+ # Search path for a program which passes the given test.
+
+@@ -55,7 +55,7 @@ rm -f conf$$.file
+ # Extract the first word of "$2", so it can be a program name with args.
+ set dummy $2; ac_word=[$]2
+ AC_MSG_CHECKING([for $ac_word])
+-AC_CACHE_VAL(ac_cv_path_$1,
++AC_CACHE_VAL([ac_cv_path_$1],
+ [case "[$]$1" in
+ [[\\/]]* | ?:[[\\/]]*)
+ ac_cv_path_$1="[$]$1" # Let the user override the test with a path.
+@@ -84,9 +84,9 @@ ifelse([$4], , , [ test -z "[$]ac_cv_pa
+ esac])dnl
+ $1="$ac_cv_path_$1"
+ if test ifelse([$4], , [-n "[$]$1"], ["[$]$1" != "$4"]); then
+- AC_MSG_RESULT([$]$1)
++ AC_MSG_RESULT([$][$1])
+ else
+- AC_MSG_RESULT(no)
++ AC_MSG_RESULT([no])
+ fi
+-AC_SUBST($1)dnl
++AC_SUBST([$1])dnl
+ ])
+Index: gnutls-2.8.6/lib/po/ChangeLog
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ gnutls-2.8.6/lib/po/ChangeLog 2010-05-19 22:15:18.521282615 -0700
+@@ -0,0 +1,5 @@
++2010-05-19 gettextize <bug-gnu-gettext@gnu.org>
++
++ * Makefile.in.in: Upgrade to gettext-0.18.
++ * Rules-quot: Upgrade to gettext-0.18.
++
+Index: gnutls-2.8.6/lib/po/Makefile.in.in
+===================================================================
+--- gnutls-2.8.6.orig/lib/po/Makefile.in.in 2010-03-15 03:28:11.000000000 -0700
++++ gnutls-2.8.6/lib/po/Makefile.in.in 2010-05-19 22:15:18.531283048 -0700
+@@ -1,5 +1,5 @@
+ # Makefile for PO directory in any package using GNU gettext.
+-# Copyright (C) 1995-1997, 2000-2007 by Ulrich Drepper <drepper@gnu.ai.mit.edu>
++# Copyright (C) 1995-1997, 2000-2007, 2009-2010 by Ulrich Drepper <drepper@gnu.ai.mit.edu>
+ #
+ # This file can be copied and used freely without restrictions. It can
+ # be used in projects which are not available under the GNU General Public
+@@ -8,8 +8,8 @@
+ # Please note that the actual code of GNU gettext is covered by the GNU
+ # General Public License and is *not* in the public domain.
+ #
+-# Origin: gettext-0.17
+-GETTEXT_MACRO_VERSION = 0.17
++# Origin: gettext-0.18
++GETTEXT_MACRO_VERSION = 0.18
+
+ PACKAGE = @PACKAGE@
+ VERSION = @VERSION@
+@@ -88,8 +88,8 @@ CATALOGS = @CATALOGS@
+ .po.gmo:
+ @lang=`echo $* | sed -e 's,.*/,,'`; \
+ test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \
+- echo "$${cdcmd}rm -f $${lang}.gmo && $(GMSGFMT) -c --statistics -o $${lang}.gmo $${lang}.po"; \
+- cd $(srcdir) && rm -f $${lang}.gmo && $(GMSGFMT) -c --statistics -o t-$${lang}.gmo $${lang}.po && mv t-$${lang}.gmo $${lang}.gmo
++ echo "$${cdcmd}rm -f $${lang}.gmo && $(GMSGFMT) -c --statistics --verbose -o $${lang}.gmo $${lang}.po"; \
++ cd $(srcdir) && rm -f $${lang}.gmo && $(GMSGFMT) -c --statistics --verbose -o t-$${lang}.gmo $${lang}.po && mv t-$${lang}.gmo $${lang}.gmo
+
+ .sin.sed:
+ sed -e '/^#/d' $< > t-$@
+@@ -193,8 +193,15 @@ $(POFILES): $(srcdir)/$(DOMAIN).pot
+ @lang=`echo $@ | sed -e 's,.*/,,' -e 's/\.po$$//'`; \
+ if test -f "$(srcdir)/$${lang}.po"; then \
+ test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \
+- echo "$${cdcmd}$(MSGMERGE_UPDATE) $${lang}.po $(DOMAIN).pot"; \
+- cd $(srcdir) && $(MSGMERGE_UPDATE) $${lang}.po $(DOMAIN).pot; \
++ echo "$${cdcmd}$(MSGMERGE_UPDATE) $(MSGMERGE_OPTIONS) --lang=$${lang} $${lang}.po $(DOMAIN).pot"; \
++ cd $(srcdir) \
++ && { case `$(MSGMERGE_UPDATE) --version | sed 1q | sed -e 's,^[^0-9]*,,'` in \
++ '' | 0.[0-9] | 0.[0-9].* | 0.1[0-7] | 0.1[0-7].*) \
++ $(MSGMERGE_UPDATE) $(MSGMERGE_OPTIONS) $${lang}.po $(DOMAIN).pot;; \
++ *) \
++ $(MSGMERGE_UPDATE) $(MSGMERGE_OPTIONS) --lang=$${lang} $${lang}.po $(DOMAIN).pot;; \
++ esac; \
++ }; \
+ else \
+ $(MAKE) $${lang}.po-create; \
+ fi
+@@ -217,7 +224,6 @@ install-data: install-data-@USE_NLS@
+ fi
+ install-data-no: all
+ install-data-yes: all
+- $(mkdir_p) $(DESTDIR)$(datadir)
+ @catalogs='$(CATALOGS)'; \
+ for cat in $$catalogs; do \
+ cat=`basename $$cat`; \
+@@ -269,7 +275,6 @@ installdirs-data: installdirs-data-@USE_
+ fi
+ installdirs-data-no:
+ installdirs-data-yes:
+- $(mkdir_p) $(DESTDIR)$(datadir)
+ @catalogs='$(CATALOGS)'; \
+ for cat in $$catalogs; do \
+ cat=`basename $$cat`; \
+@@ -395,9 +400,15 @@ update-po: Makefile
+ tmpdir=`pwd`; \
+ echo "$$lang:"; \
+ test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \
+- echo "$${cdcmd}$(MSGMERGE) $$lang.po $(DOMAIN).pot -o $$lang.new.po"; \
++ echo "$${cdcmd}$(MSGMERGE) $(MSGMERGE_OPTIONS) --lang=$$lang $$lang.po $(DOMAIN).pot -o $$lang.new.po"; \
+ cd $(srcdir); \
+- if $(MSGMERGE) $$lang.po $(DOMAIN).pot -o $$tmpdir/$$lang.new.po; then \
++ if { case `$(MSGMERGE) --version | sed 1q | sed -e 's,^[^0-9]*,,'` in \
++ '' | 0.[0-9] | 0.[0-9].* | 0.1[0-7] | 0.1[0-7].*) \
++ $(MSGMERGE) $(MSGMERGE_OPTIONS) -o $$tmpdir/$$lang.new.po $$lang.po $(DOMAIN).pot;; \
++ *) \
++ $(MSGMERGE) $(MSGMERGE_OPTIONS) --lang=$$lang -o $$tmpdir/$$lang.new.po $$lang.po $(DOMAIN).pot;; \
++ esac; \
++ }; then \
+ if cmp $$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \
+ rm -f $$tmpdir/$$lang.new.po; \
+ else \
+@@ -418,9 +429,13 @@ $(DUMMYPOFILES):
+ update-gmo: Makefile $(GMOFILES)
+ @:
+
++# Recreate Makefile by invoking config.status. Explicitly invoke the shell,
++# because execution permission bits may not work on the current file system.
++# Use @SHELL@, which is the shell determined by autoconf for the use by its
++# scripts, not $(SHELL) which is hardwired to /bin/sh and may be deficient.
+ Makefile: Makefile.in.in Makevars $(top_builddir)/config.status @POMAKEFILEDEPS@
+ cd $(top_builddir) \
+- && $(SHELL) ./config.status $(subdir)/$@.in po-directories
++ && @SHELL@ ./config.status $(subdir)/$@.in po-directories
+
+ force:
+
+Index: gnutls-2.8.6/lib/po/Makevars.template
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ gnutls-2.8.6/lib/po/Makevars.template 2010-05-19 22:15:18.531283048 -0700
+@@ -0,0 +1,41 @@
++# Makefile variables for PO directory in any package using GNU gettext.
++
++# Usually the message domain is the same as the package name.
++DOMAIN = $(PACKAGE)
++
++# These two variables depend on the location of this directory.
++subdir = po
++top_builddir = ..
++
++# These options get passed to xgettext.
++XGETTEXT_OPTIONS = --keyword=_ --keyword=N_
++
++# This is the copyright holder that gets inserted into the header of the
++# $(DOMAIN).pot file. Set this to the copyright holder of the surrounding
++# package. (Note that the msgstr strings, extracted from the package's
++# sources, belong to the copyright holder of the package.) Translators are
++# expected to transfer the copyright for their translations to this person
++# or entity, or to disclaim their copyright. The empty string stands for
++# the public domain; in this case the translators are expected to disclaim
++# their copyright.
++COPYRIGHT_HOLDER = Free Software Foundation, Inc.
++
++# This is the email address or URL to which the translators shall report
++# bugs in the untranslated strings:
++# - Strings which are not entire sentences, see the maintainer guidelines
++# in the GNU gettext documentation, section 'Preparing Strings'.
++# - Strings which use unclear terms or require additional context to be
++# understood.
++# - Strings which make invalid assumptions about notation of date, time or
++# money.
++# - Pluralisation problems.
++# - Incorrect English spelling.
++# - Incorrect formatting.
++# It can be your email address, or a mailing list address where translators
++# can write to without being subscribed, or the URL of a web page through
++# which the translators can contact you.
++MSGID_BUGS_ADDRESS =
++
++# This is the list of locale categories, beyond LC_MESSAGES, for which the
++# message catalogs shall be used. It is usually empty.
++EXTRA_LOCALE_CATEGORIES =
+Index: gnutls-2.8.6/lib/po/Rules-quot
+===================================================================
+--- gnutls-2.8.6.orig/lib/po/Rules-quot 2010-03-15 03:28:11.000000000 -0700
++++ gnutls-2.8.6/lib/po/Rules-quot 2010-05-19 22:15:18.531283048 -0700
+@@ -20,7 +20,7 @@ en@boldquot.po-update: en@boldquot.po-up
+ ll=`echo $$lang | sed -e 's/@.*//'`; \
+ LC_ALL=C; export LC_ALL; \
+ cd $(srcdir); \
+- if $(MSGINIT) -i $(DOMAIN).pot --no-translator -l $$ll -o - 2>/dev/null | sed -f $$tmpdir/$$lang.insert-header | $(MSGCONV) -t UTF-8 | $(MSGFILTER) sed -f `echo $$lang | sed -e 's/.*@//'`.sed 2>/dev/null > $$tmpdir/$$lang.new.po; then \
++ if $(MSGINIT) -i $(DOMAIN).pot --no-translator -l $$lang -o - 2>/dev/null | sed -f $$tmpdir/$$lang.insert-header | $(MSGCONV) -t UTF-8 | $(MSGFILTER) sed -f `echo $$lang | sed -e 's/.*@//'`.sed 2>/dev/null > $$tmpdir/$$lang.new.po; then \
+ if cmp $$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \
+ rm -f $$tmpdir/$$lang.new.po; \
+ else \
diff --git a/recipes/gnutls/gnutls-2.8.6/gnutls-openssl.patch b/recipes/gnutls/gnutls-2.8.6/gnutls-openssl.patch
new file mode 100644
index 0000000..033e4d1
--- /dev/null
+++ b/recipes/gnutls/gnutls-2.8.6/gnutls-openssl.patch
@@ -0,0 +1,129 @@
+---
+ libextra/gnutls_openssl.c | 58 +++++++++++++++++++++++++++++++++++++
+ libextra/includes/gnutls/openssl.h | 5 +++
+ 2 files changed, 63 insertions(+)
+
+Index: gnutls-2.8.6/libextra/gnutls_openssl.c
+===================================================================
+--- gnutls-2.8.6.orig/libextra/gnutls_openssl.c 2009-11-06 00:39:42.000000000 -0800
++++ gnutls-2.8.6/libextra/gnutls_openssl.c 2010-05-19 22:20:34.071283592 -0700
+@@ -258,12 +258,17 @@ SSL_new (SSL_CTX * ctx)
+ ssl->rfd = (gnutls_transport_ptr_t) - 1;
+ ssl->wfd = (gnutls_transport_ptr_t) - 1;
+
++ ssl->ssl_peek_buffer = NULL;
++ ssl->ssl_peek_buffer_size = ssl->ssl_peek_avail = 0;
++
+ return ssl;
+ }
+
+ void
+ SSL_free (SSL * ssl)
+ {
++ if (ssl->ssl_peek_buffer)
++ free(ssl->ssl_peek_buffer);
+ gnutls_certificate_free_credentials (ssl->gnutls_cred);
+ gnutls_deinit (ssl->gnutls_state);
+ free (ssl);
+@@ -287,6 +292,7 @@ int
+ SSL_set_fd (SSL * ssl, int fd)
+ {
+ gnutls_transport_set_ptr (ssl->gnutls_state, GNUTLS_INT_TO_POINTER (fd));
++ ssl->rfd = ssl->wfd = fd;
+ return 1;
+ }
+
+@@ -312,6 +318,17 @@ SSL_set_wfd (SSL * ssl, int fd)
+ return 1;
+ }
+
++int SSL_get_rfd(SSL *ssl)
++{
++ return ssl->rfd;
++}
++
++int SSL_get_wfd(SSL *ssl)
++{
++ return ssl->wfd;
++}
++
++
+ void
+ SSL_set_bio (SSL * ssl, BIO * rbio, BIO * wbio)
+ {
+@@ -327,6 +344,8 @@ SSL_set_connect_state (SSL * ssl)
+ int
+ SSL_pending (SSL * ssl)
+ {
++ if (ssl->ssl_peek_avail)
++ return ssl->ssl_peek_avail;
+ return gnutls_record_check_pending (ssl->gnutls_state);
+ }
+
+@@ -482,11 +501,50 @@ SSL_shutdown (SSL * ssl)
+ return 1;
+ }
+
++int SSL_peek(SSL *ssl, void *buf, int len)
++{
++ if (len > ssl->ssl_peek_buffer_size) {
++ ssl->ssl_peek_buffer = realloc (ssl->ssl_peek_buffer, len);
++ ssl->ssl_peek_buffer_size = len;
++ }
++
++ if (ssl->ssl_peek_avail == 0) {
++
++ int ret;
++
++ ret = gnutls_record_recv(ssl->gnutls_state, ssl->ssl_peek_buffer, len);
++ ssl->last_error = ret;
++
++ if (ret > 0)
++ ssl->ssl_peek_avail += ret;
++ }
++
++ if (len > ssl->ssl_peek_avail)
++ len = ssl->ssl_peek_avail;
++
++ memcpy (buf, ssl->ssl_peek_buffer, len);
++
++ return len;
++}
++
+ int
+ SSL_read (SSL * ssl, void *buf, int len)
+ {
+ int ret;
+
++ if (ssl->ssl_peek_avail) {
++ int n = (ssl->ssl_peek_avail > len) ? len : ssl->ssl_peek_avail;
++
++ memcpy (buf, ssl->ssl_peek_buffer, n);
++
++ if (ssl->ssl_peek_avail > n)
++ memmove (ssl->ssl_peek_buffer, ssl->ssl_peek_buffer + n, ssl->ssl_peek_avail - n);
++
++ ssl->ssl_peek_avail -= n;
++
++ return n;
++ }
++
+ ret = gnutls_record_recv (ssl->gnutls_state, buf, len);
+ ssl->last_error = ret;
+
+Index: gnutls-2.8.6/libextra/includes/gnutls/openssl.h
+===================================================================
+--- gnutls-2.8.6.orig/libextra/includes/gnutls/openssl.h 2009-06-02 11:59:32.000000000 -0700
++++ gnutls-2.8.6/libextra/includes/gnutls/openssl.h 2010-05-19 22:20:34.071283592 -0700
+@@ -164,6 +164,11 @@ extern "C"
+
+ gnutls_transport_ptr_t rfd;
+ gnutls_transport_ptr_t wfd;
++
++ char *ssl_peek_buffer;
++ size_t ssl_peek_buffer_size;
++ size_t ssl_peek_avail;
++
+ };
+
+ #define rbio gnutls_state
diff --git a/recipes/gnutls/gnutls-2.8.6/gnutls-replace-siginterrupt.patch b/recipes/gnutls/gnutls-2.8.6/gnutls-replace-siginterrupt.patch
new file mode 100644
index 0000000..a0fb64f
--- /dev/null
+++ b/recipes/gnutls/gnutls-2.8.6/gnutls-replace-siginterrupt.patch
@@ -0,0 +1,41 @@
+---
+ src/tests.c | 12 ++++++++++--
+ 1 file changed, 10 insertions(+), 2 deletions(-)
+
+Index: gnutls-2.8.6/src/tests.c
+===================================================================
+--- gnutls-2.8.6.orig/src/tests.c 2009-06-02 11:59:32.000000000 -0700
++++ gnutls-2.8.6/src/tests.c 2010-05-19 22:20:51.703780601 -0700
+@@ -493,6 +493,7 @@ test_bye (gnutls_session_t session)
+ int old, secs = 6;
+
+ #ifndef _WIN32
++ struct sigaction act;
+ signal (SIGALRM, got_alarm);
+ #endif
+
+@@ -513,7 +514,9 @@ test_bye (gnutls_session_t session)
+ return TEST_FAILED;
+
+ #ifndef _WIN32
+- old = siginterrupt (SIGALRM, 1);
++ (void) sigaction(SIGALRM, NULL, &act);
++ act.sa_flags &= ~SA_RESTART;
++ old = sigaction(SIGALRM, &act, NULL);
+ alarm (secs);
+ #else
+ setsockopt ((int) gnutls_transport_get_ptr (session), SOL_SOCKET,
+@@ -527,7 +530,12 @@ test_bye (gnutls_session_t session)
+ while (ret > 0);
+
+ #ifndef _WIN32
+- siginterrupt (SIGALRM, old);
++ (void) sigaction(SIGALRM, NULL, &act);
++ if (old)
++ act.sa_flags &= ~SA_RESTART;
++ else
++ act.sa_flags |= SA_RESTART;
++ sigaction(SIGALRM, &act, NULL);
+ #else
+ if (WSAGetLastError () == WSAETIMEDOUT ||
+ WSAGetLastError () == WSAECONNABORTED)
diff --git a/recipes/gnutls/gnutls_2.8.5.bb b/recipes/gnutls/gnutls_2.8.5.bb
index b0786f6..c536d18 100644
--- a/recipes/gnutls/gnutls_2.8.5.bb
+++ b/recipes/gnutls/gnutls_2.8.5.bb
@@ -1,4 +1,7 @@
require gnutls.inc
+
+PR = "${INC_PR}.0"
+
LICENSE_${PN}-extra = "GPLv3"
SRC_URI += "\
diff --git a/recipes/gnutls/gnutls_2.8.6.bb b/recipes/gnutls/gnutls_2.8.6.bb
new file mode 100644
index 0000000..0998c6b
--- /dev/null
+++ b/recipes/gnutls/gnutls_2.8.6.bb
@@ -0,0 +1,16 @@
+require gnutls.inc
+
+PR = "${INC_PR}.0"
+
+LICENSE_${PN}-extra = "GPLv3"
+
+EXTRA_OECONF += " --without-libgcrypt-prefix "
+
+SRC_URI += "file://gettextize-with-gettext-0.18.patch \
+ file://gnutls-openssl.patch \
+ file://gnutls-replace-siginterrupt.patch \
+ "
+
+SRC_URI[gnutls.md5sum] = "eb0a6d7d3cb9ac684d971c14f9f6d3ba"
+SRC_URI[gnutls.sha256sum] = "d6f846a7064af3ee2c9aebd65dcee76953b767170cbcd719e990ed6b9688a356"
+
--
1.7.0.4
^ permalink raw reply related [flat|nested] 45+ messages in thread
* [PATCH 10/16] inetutils_1.8.bb: Add recipe
2010-06-02 20:34 [PATCH 00/16] Upgrade gettext, GNU utilities, fix general build issues with uclibc distros Khem Raj
` (8 preceding siblings ...)
2010-06-02 20:34 ` [PATCH 09/16] gnutls_2.8.6.bb: Add recipe for version 2.8.6 Khem Raj
@ 2010-06-02 20:34 ` Khem Raj
2010-06-04 7:40 ` Martin Jansa
2010-06-02 20:34 ` [PATCH 11/16] findutils_4.5.9.bb: " Khem Raj
` (7 subsequent siblings)
17 siblings, 1 reply; 45+ messages in thread
From: Khem Raj @ 2010-06-02 20:34 UTC (permalink / raw)
To: openembedded-devel
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
recipes/inetutils/inetutils_1.8.bb | 43 ++++++++++++++++++++++++++++++++++++
1 files changed, 43 insertions(+), 0 deletions(-)
create mode 100644 recipes/inetutils/inetutils_1.8.bb
diff --git a/recipes/inetutils/inetutils_1.8.bb b/recipes/inetutils/inetutils_1.8.bb
new file mode 100644
index 0000000..11fb818
--- /dev/null
+++ b/recipes/inetutils/inetutils_1.8.bb
@@ -0,0 +1,43 @@
+SECTION = "libs"
+DEPENDS = "ncurses"
+LICENSE = "GPL"
+DESCRIPTION = "The GNU inetutils are a collection of common \
+networking utilities and servers including ftp, ftpd, rcp, \
+rexec, rlogin, rlogind, rsh, rshd, syslog, syslogd, talk, \
+talkd, telnet, telnetd, tftp, tftpd, and uucpd."
+
+PR = "r0"
+
+SRC_URI = "${GNU_MIRROR}/inetutils/inetutils-${PV}.tar.gz \
+"
+
+inherit autotools
+
+EXTRA_OECONF = "--with-ncurses-include-dir=${STAGING_INCDIR}"
+
+do_configure_prepend () {
+ cp ${STAGING_DATADIR_NATIVE}/gettext/config.rpath ${S}/build-aux/config.rpath
+ rm -f ${S}/glob/configure*
+}
+
+do_install () {
+ autotools_do_install
+ mv ${D}${bindir}/tftp ${D}${bindir}/tftp.${PN}
+ mv ${D}${bindir}/telnet ${D}${bindir}/telnet.${PN}
+ mv ${D}${bindir}/logger ${D}${bindir}/logger.${PN}
+}
+
+pkg_postinst_${PN} () {
+ update-alternatives --install ${bindir}/tftp tftp tftp.${PN} 100
+ update-alternatives --install ${bindir}/telnet telnet telnet.${PN} 100
+ update-alternatives --install ${bindir}/logger logger logger.${PN} 100
+}
+
+pkg_prerm_${PN} () {
+ update-alternatives --remove tftp tftp.${PN}
+ update-alternatives --remove telnet telnet.${PN}
+ update-alternatives --remove logger logger.${PN}
+}
+SRC_URI[md5sum] = "ad8fdcdf1797b9ca258264a6b04e48fd"
+SRC_URI[sha256sum] = "c8500baee04b9ea408c9e65e24ad7f5b41e7d96d42fb1d29abf25b52b68311c7"
+
--
1.7.0.4
^ permalink raw reply related [flat|nested] 45+ messages in thread
* [PATCH 11/16] findutils_4.5.9.bb: Add recipe.
2010-06-02 20:34 [PATCH 00/16] Upgrade gettext, GNU utilities, fix general build issues with uclibc distros Khem Raj
` (9 preceding siblings ...)
2010-06-02 20:34 ` [PATCH 10/16] inetutils_1.8.bb: Add recipe Khem Raj
@ 2010-06-02 20:34 ` Khem Raj
2010-06-04 7:41 ` Martin Jansa
2010-06-02 20:34 ` [PATCH 12/16] gstreamer_0.10.28.bb: Fix to build with gettext 0.18 Khem Raj
` (6 subsequent siblings)
17 siblings, 1 reply; 45+ messages in thread
From: Khem Raj @ 2010-06-02 20:34 UTC (permalink / raw)
To: openembedded-devel
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
.../findutils-4.5.9/gettext-0.18-update.patch | 3074 ++++++++++++++++++++
recipes/findutils/findutils_4.5.9.bb | 12 +
2 files changed, 3086 insertions(+), 0 deletions(-)
create mode 100644 recipes/findutils/findutils-4.5.9/gettext-0.18-update.patch
create mode 100644 recipes/findutils/findutils_4.5.9.bb
diff --git a/recipes/findutils/findutils-4.5.9/gettext-0.18-update.patch b/recipes/findutils/findutils-4.5.9/gettext-0.18-update.patch
new file mode 100644
index 0000000..994ed6d
--- /dev/null
+++ b/recipes/findutils/findutils-4.5.9/gettext-0.18-update.patch
@@ -0,0 +1,3074 @@
+diff -urp -x '*~' findutils-4.5.9.org/ABOUT-NLS findutils-4.5.9/ABOUT-NLS
+--- findutils-4.5.9.org/ABOUT-NLS 2010-04-29 14:26:12.000000000 -0700
++++ findutils-4.5.9/ABOUT-NLS 2010-05-23 09:08:51.825173977 -0700
+@@ -181,855 +181,1114 @@ programming skills, here.
+ ======================
+
+ Languages are not equally supported in all packages. The following
+-matrix shows the current state of internationalization, as of November
+-2007. The matrix shows, in regard of each package, for which languages
+-PO files have been submitted to translation coordination, with a
++matrix shows the current state of internationalization, as of May 2010.
++The matrix shows, in regard of each package, for which languages PO
++files have been submitted to translation coordination, with a
+ translation percentage of at least 50%.
+
+- Ready PO files af am ar az be bg bs ca cs cy da de el en en_GB eo
+- +----------------------------------------------------+
+- Compendium | [] [] [] [] |
+- a2ps | [] [] [] [] [] |
+- aegis | () |
+- ant-phone | () |
+- anubis | [] |
+- ap-utils | |
+- aspell | [] [] [] [] [] |
+- bash | [] |
+- bfd | |
+- bibshelf | [] |
+- binutils | |
+- bison | [] [] |
+- bison-runtime | [] |
+- bluez-pin | [] [] [] [] [] |
+- cflow | [] |
+- clisp | [] [] [] |
+- console-tools | [] [] |
+- coreutils | [] [] [] [] |
+- cpio | |
+- cpplib | [] [] [] |
+- cryptonit | [] |
+- dialog | |
+- diffutils | [] [] [] [] [] [] |
+- doodle | [] |
+- e2fsprogs | [] [] |
+- enscript | [] [] [] [] |
+- fetchmail | [] [] () [] [] |
+- findutils | [] |
+- findutils_stable | [] [] [] |
+- flex | [] [] [] |
+- fslint | |
+- gas | |
+- gawk | [] [] [] |
+- gcal | [] |
+- gcc | [] |
+- gettext-examples | [] [] [] [] [] |
+- gettext-runtime | [] [] [] [] [] |
+- gettext-tools | [] [] |
+- gip | [] |
+- gliv | [] [] |
+- glunarclock | [] |
+- gmult | [] [] |
+- gnubiff | () |
+- gnucash | [] [] () () [] |
+- gnuedu | |
+- gnulib | [] |
+- gnunet | |
+- gnunet-gtk | |
+- gnutls | [] |
+- gpe-aerial | [] [] |
+- gpe-beam | [] [] |
+- gpe-calendar | |
+- gpe-clock | [] [] |
+- gpe-conf | [] [] |
+- gpe-contacts | |
+- gpe-edit | [] |
+- gpe-filemanager | |
+- gpe-go | [] |
+- gpe-login | [] [] |
+- gpe-ownerinfo | [] [] |
+- gpe-package | |
+- gpe-sketchbook | [] [] |
+- gpe-su | [] [] |
+- gpe-taskmanager | [] [] |
+- gpe-timesheet | [] |
+- gpe-today | [] [] |
+- gpe-todo | |
+- gphoto2 | [] [] [] [] |
+- gprof | [] [] |
+- gpsdrive | |
+- gramadoir | [] [] |
+- grep | [] [] |
+- gretl | () |
+- gsasl | |
+- gss | |
+- gst-plugins-bad | [] [] |
+- gst-plugins-base | [] [] |
+- gst-plugins-good | [] [] [] |
+- gst-plugins-ugly | [] [] |
+- gstreamer | [] [] [] [] [] [] [] |
+- gtick | () |
+- gtkam | [] [] [] [] |
+- gtkorphan | [] [] |
+- gtkspell | [] [] [] [] |
+- gutenprint | [] |
+- hello | [] [] [] [] [] |
+- herrie | [] |
+- hylafax | |
+- idutils | [] [] |
+- indent | [] [] [] [] |
+- iso_15924 | |
+- iso_3166 | [] [] [] [] [] [] [] [] [] [] [] |
+- iso_3166_2 | |
+- iso_4217 | [] [] [] |
+- iso_639 | [] [] [] [] |
+- jpilot | [] |
+- jtag | |
+- jwhois | |
+- kbd | [] [] [] [] |
+- keytouch | [] [] |
+- keytouch-editor | [] |
+- keytouch-keyboa... | [] |
+- latrine | () |
+- ld | [] |
+- leafpad | [] [] [] [] [] |
+- libc | [] [] [] [] |
+- libexif | [] |
+- libextractor | [] |
+- libgpewidget | [] [] [] |
+- libgpg-error | [] |
+- libgphoto2 | [] [] |
+- libgphoto2_port | [] [] |
+- libgsasl | |
+- libiconv | [] [] |
+- libidn | [] [] [] |
+- lifelines | [] () |
+- lilypond | [] |
+- lingoteach | |
+- lprng | |
+- lynx | [] [] [] [] |
+- m4 | [] [] [] [] |
+- mailfromd | |
+- mailutils | [] |
+- make | [] [] |
+- man-db | [] [] [] |
+- minicom | [] [] [] |
+- nano | [] [] [] |
+- opcodes | [] |
+- parted | [] [] |
+- pilot-qof | |
+- popt | [] [] [] |
+- psmisc | [] |
+- pwdutils | |
+- qof | |
+- radius | [] |
+- recode | [] [] [] [] [] [] |
+- rpm | [] |
+- screem | |
+- scrollkeeper | [] [] [] [] [] [] [] [] |
+- sed | [] [] [] |
+- shared-mime-info | [] [] [] [] () [] [] [] |
+- sharutils | [] [] [] [] [] [] |
+- shishi | |
+- skencil | [] () |
+- solfege | |
+- soundtracker | [] [] |
+- sp | [] |
+- system-tools-ba... | [] [] [] [] [] [] [] [] [] |
+- tar | [] [] |
+- texinfo | [] [] [] |
+- tin | () () |
+- tuxpaint | [] [] [] [] [] [] |
+- unicode-han-tra... | |
+- unicode-transla... | |
+- util-linux | [] [] [] [] |
+- util-linux-ng | [] [] [] [] |
+- vorbis-tools | [] |
+- wastesedge | () |
+- wdiff | [] [] [] [] |
+- wget | [] [] [] |
+- xchat | [] [] [] [] [] [] [] |
+- xkeyboard-config | [] |
+- xpad | [] [] [] |
+- +----------------------------------------------------+
+- af am ar az be bg bs ca cs cy da de el en en_GB eo
+- 6 0 2 1 8 26 2 40 48 2 56 88 15 1 15 18
+-
+- es et eu fa fi fr ga gl gu he hi hr hu id is it
+- +--------------------------------------------------+
+- Compendium | [] [] [] [] [] |
+- a2ps | [] [] [] () |
+- aegis | |
+- ant-phone | [] |
+- anubis | [] |
+- ap-utils | [] [] |
+- aspell | [] [] [] |
+- bash | [] |
+- bfd | [] [] |
+- bibshelf | [] [] [] |
+- binutils | [] [] [] |
+- bison | [] [] [] [] [] [] |
+- bison-runtime | [] [] [] [] [] |
+- bluez-pin | [] [] [] [] [] |
+- cflow | [] |
+- clisp | [] [] |
+- console-tools | |
+- coreutils | [] [] [] [] [] [] |
+- cpio | [] [] [] |
+- cpplib | [] [] |
+- cryptonit | [] |
+- dialog | [] [] [] |
+- diffutils | [] [] [] [] [] [] [] [] [] |
+- doodle | [] [] |
+- e2fsprogs | [] [] [] |
+- enscript | [] [] [] |
+- fetchmail | [] |
+- findutils | [] [] [] |
+- findutils_stable | [] [] [] [] |
+- flex | [] [] [] |
+- fslint | |
+- gas | [] [] |
+- gawk | [] [] [] [] () |
+- gcal | [] [] |
+- gcc | [] |
+- gettext-examples | [] [] [] [] [] [] [] |
+- gettext-runtime | [] [] [] [] [] [] |
+- gettext-tools | [] [] [] [] |
+- gip | [] [] [] [] |
+- gliv | () |
+- glunarclock | [] [] [] |
+- gmult | [] [] [] |
+- gnubiff | () () |
+- gnucash | () () () |
+- gnuedu | [] |
+- gnulib | [] [] [] |
+- gnunet | |
+- gnunet-gtk | |
+- gnutls | |
+- gpe-aerial | [] [] |
+- gpe-beam | [] [] |
+- gpe-calendar | |
+- gpe-clock | [] [] [] [] |
+- gpe-conf | [] |
+- gpe-contacts | [] [] |
+- gpe-edit | [] [] [] [] |
+- gpe-filemanager | [] |
+- gpe-go | [] [] [] |
+- gpe-login | [] [] [] |
+- gpe-ownerinfo | [] [] [] [] [] |
+- gpe-package | [] |
+- gpe-sketchbook | [] [] |
+- gpe-su | [] [] [] [] |
+- gpe-taskmanager | [] [] [] |
+- gpe-timesheet | [] [] [] [] |
+- gpe-today | [] [] [] [] |
+- gpe-todo | [] |
+- gphoto2 | [] [] [] [] [] |
+- gprof | [] [] [] [] [] |
+- gpsdrive | [] |
+- gramadoir | [] [] |
+- grep | [] [] [] |
+- gretl | [] [] [] () |
+- gsasl | [] [] |
+- gss | [] [] |
+- gst-plugins-bad | [] [] [] [] |
+- gst-plugins-base | [] [] [] [] |
+- gst-plugins-good | [] [] [] [] [] |
+- gst-plugins-ugly | [] [] [] [] |
+- gstreamer | [] [] [] |
+- gtick | [] [] [] |
+- gtkam | [] [] [] [] |
+- gtkorphan | [] [] |
+- gtkspell | [] [] [] [] [] [] [] |
+- gutenprint | [] |
+- hello | [] [] [] [] [] [] [] [] [] [] [] [] [] |
+- herrie | [] |
+- hylafax | |
+- idutils | [] [] [] [] [] |
+- indent | [] [] [] [] [] [] [] [] [] [] |
+- iso_15924 | [] |
+- iso_3166 | [] [] [] [] [] [] [] [] [] [] [] [] [] |
+- iso_3166_2 | [] |
+- iso_4217 | [] [] [] [] [] [] |
+- iso_639 | [] [] [] [] [] [] |
+- jpilot | [] [] |
+- jtag | [] |
+- jwhois | [] [] [] [] [] |
+- kbd | [] [] |
+- keytouch | [] [] [] |
+- keytouch-editor | [] |
+- keytouch-keyboa... | [] [] |
+- latrine | [] [] |
+- ld | [] [] [] [] |
+- leafpad | [] [] [] [] [] [] |
+- libc | [] [] [] [] [] |
+- libexif | [] |
+- libextractor | [] |
+- libgpewidget | [] [] [] [] [] |
+- libgpg-error | [] |
+- libgphoto2 | [] [] [] |
+- libgphoto2_port | [] [] |
+- libgsasl | [] [] |
+- libiconv | [] [] [] |
+- libidn | [] [] |
+- lifelines | () |
+- lilypond | [] [] [] |
+- lingoteach | [] [] [] |
+- lprng | |
+- lynx | [] [] [] |
+- m4 | [] [] [] [] |
+- mailfromd | |
+- mailutils | [] [] |
+- make | [] [] [] [] [] [] [] [] |
+- man-db | [] |
+- minicom | [] [] [] [] |
+- nano | [] [] [] [] [] [] [] |
+- opcodes | [] [] [] [] |
+- parted | [] [] [] |
+- pilot-qof | |
+- popt | [] [] [] [] |
+- psmisc | [] [] |
+- pwdutils | |
+- qof | [] |
+- radius | [] [] |
+- recode | [] [] [] [] [] [] [] [] |
+- rpm | [] [] |
+- screem | |
+- scrollkeeper | [] [] [] |
+- sed | [] [] [] [] [] |
+- shared-mime-info | [] [] [] [] [] [] |
+- sharutils | [] [] [] [] [] [] [] [] |
+- shishi | [] |
+- skencil | [] [] |
+- solfege | [] |
+- soundtracker | [] [] [] |
+- sp | [] |
+- system-tools-ba... | [] [] [] [] [] [] [] [] [] |
+- tar | [] [] [] [] [] |
+- texinfo | [] [] [] |
+- tin | [] () |
+- tuxpaint | [] [] |
+- unicode-han-tra... | |
+- unicode-transla... | [] [] |
+- util-linux | [] [] [] [] [] [] [] |
+- util-linux-ng | [] [] [] [] [] [] [] |
+- vorbis-tools | |
+- wastesedge | () |
+- wdiff | [] [] [] [] [] [] [] [] |
+- wget | [] [] [] [] [] [] [] [] |
+- xchat | [] [] [] [] [] [] [] |
+- xkeyboard-config | [] [] [] [] |
+- xpad | [] [] [] |
+- +--------------------------------------------------+
+- es et eu fa fi fr ga gl gu he hi hr hu id is it
+- 85 22 14 2 48 101 61 12 2 8 2 6 53 29 1 52
+-
+- ja ka ko ku ky lg lt lv mk mn ms mt nb ne nl nn
+- +--------------------------------------------------+
+- Compendium | [] |
+- a2ps | () [] [] |
+- aegis | () |
+- ant-phone | [] |
+- anubis | [] [] [] |
+- ap-utils | [] |
+- aspell | [] [] |
+- bash | [] |
+- bfd | |
+- bibshelf | [] |
+- binutils | |
+- bison | [] [] [] |
+- bison-runtime | [] [] [] |
+- bluez-pin | [] [] [] |
+- cflow | |
+- clisp | [] |
+- console-tools | |
+- coreutils | [] |
+- cpio | [] |
+- cpplib | [] |
+- cryptonit | [] |
+- dialog | [] [] |
+- diffutils | [] [] [] |
+- doodle | |
+- e2fsprogs | [] |
+- enscript | [] |
+- fetchmail | [] [] |
+- findutils | [] |
+- findutils_stable | [] |
+- flex | [] [] |
+- fslint | |
+- gas | |
+- gawk | [] [] |
+- gcal | |
+- gcc | |
+- gettext-examples | [] [] [] |
+- gettext-runtime | [] [] [] |
+- gettext-tools | [] [] |
+- gip | [] [] |
+- gliv | [] |
+- glunarclock | [] [] |
+- gmult | [] [] [] |
+- gnubiff | |
+- gnucash | () () () |
+- gnuedu | |
+- gnulib | [] [] |
+- gnunet | |
+- gnunet-gtk | |
+- gnutls | [] |
+- gpe-aerial | [] |
+- gpe-beam | [] |
+- gpe-calendar | [] |
+- gpe-clock | [] [] [] |
+- gpe-conf | [] [] [] |
+- gpe-contacts | [] |
+- gpe-edit | [] [] [] |
+- gpe-filemanager | [] [] |
+- gpe-go | [] [] [] |
+- gpe-login | [] [] [] |
+- gpe-ownerinfo | [] [] |
+- gpe-package | [] [] |
+- gpe-sketchbook | [] [] |
+- gpe-su | [] [] [] |
+- gpe-taskmanager | [] [] [] [] |
+- gpe-timesheet | [] |
+- gpe-today | [] [] |
+- gpe-todo | [] |
+- gphoto2 | [] [] |
+- gprof | [] |
+- gpsdrive | [] |
+- gramadoir | () |
+- grep | [] [] |
+- gretl | |
+- gsasl | [] |
+- gss | |
+- gst-plugins-bad | [] |
+- gst-plugins-base | [] |
+- gst-plugins-good | [] |
+- gst-plugins-ugly | [] |
+- gstreamer | [] |
+- gtick | [] |
+- gtkam | [] [] |
+- gtkorphan | [] |
+- gtkspell | [] [] |
+- gutenprint | [] |
+- hello | [] [] [] [] [] [] [] |
+- herrie | [] |
+- hylafax | |
+- idutils | [] |
+- indent | [] [] |
+- iso_15924 | [] |
+- iso_3166 | [] [] [] [] [] [] [] [] |
+- iso_3166_2 | [] |
+- iso_4217 | [] [] [] |
+- iso_639 | [] [] [] [] |
+- jpilot | () () |
+- jtag | |
+- jwhois | [] |
+- kbd | [] |
+- keytouch | [] |
+- keytouch-editor | [] |
+- keytouch-keyboa... | |
+- latrine | [] |
+- ld | |
+- leafpad | [] [] |
+- libc | [] [] [] |
+- libexif | |
+- libextractor | |
+- libgpewidget | [] |
+- libgpg-error | |
+- libgphoto2 | [] |
+- libgphoto2_port | [] |
+- libgsasl | [] |
+- libiconv | [] |
+- libidn | [] [] |
+- lifelines | [] |
+- lilypond | [] |
+- lingoteach | [] |
+- lprng | |
+- lynx | [] [] |
+- m4 | [] [] |
+- mailfromd | |
+- mailutils | |
+- make | [] [] [] |
+- man-db | |
+- minicom | [] |
+- nano | [] [] [] |
+- opcodes | [] |
+- parted | [] [] |
+- pilot-qof | |
+- popt | [] [] [] |
+- psmisc | [] [] [] |
+- pwdutils | |
+- qof | |
+- radius | |
+- recode | [] |
+- rpm | [] [] |
+- screem | [] |
+- scrollkeeper | [] [] [] [] |
+- sed | [] [] |
+- shared-mime-info | [] [] [] [] [] [] [] |
+- sharutils | [] [] |
+- shishi | |
+- skencil | |
+- solfege | () () |
+- soundtracker | |
+- sp | () |
+- system-tools-ba... | [] [] [] [] |
+- tar | [] [] [] |
+- texinfo | [] [] |
+- tin | |
+- tuxpaint | () [] [] |
+- unicode-han-tra... | |
+- unicode-transla... | |
+- util-linux | [] [] |
+- util-linux-ng | [] [] |
+- vorbis-tools | |
+- wastesedge | [] |
+- wdiff | [] [] |
+- wget | [] [] |
+- xchat | [] [] [] [] |
+- xkeyboard-config | [] [] [] |
+- xpad | [] [] [] |
+- +--------------------------------------------------+
+- ja ka ko ku ky lg lt lv mk mn ms mt nb ne nl nn
+- 51 2 25 3 2 0 6 0 2 2 20 0 11 1 103 6
+-
+- or pa pl pt pt_BR rm ro ru rw sk sl sq sr sv ta
+- +--------------------------------------------------+
+- Compendium | [] [] [] [] [] |
+- a2ps | () [] [] [] [] [] [] |
+- aegis | () () |
+- ant-phone | [] [] |
+- anubis | [] [] [] |
+- ap-utils | () |
+- aspell | [] [] [] |
+- bash | [] [] |
+- bfd | |
+- bibshelf | [] |
+- binutils | [] [] |
+- bison | [] [] [] [] [] |
+- bison-runtime | [] [] [] [] [] |
+- bluez-pin | [] [] [] [] [] [] [] [] [] |
+- cflow | [] |
+- clisp | [] |
+- console-tools | [] |
+- coreutils | [] [] [] [] |
+- cpio | [] [] [] |
+- cpplib | [] |
+- cryptonit | [] [] |
+- dialog | [] |
+- diffutils | [] [] [] [] [] [] |
+- doodle | [] [] |
+- e2fsprogs | [] [] |
+- enscript | [] [] [] [] [] |
+- fetchmail | [] [] [] |
+- findutils | [] [] [] |
+- findutils_stable | [] [] [] [] [] [] |
+- flex | [] [] [] [] [] |
+- fslint | [] |
+- gas | |
+- gawk | [] [] [] [] |
+- gcal | [] |
+- gcc | [] [] |
+- gettext-examples | [] [] [] [] [] [] [] [] |
+- gettext-runtime | [] [] [] [] [] [] [] [] |
+- gettext-tools | [] [] [] [] [] [] [] |
+- gip | [] [] [] [] |
+- gliv | [] [] [] [] [] [] |
+- glunarclock | [] [] [] [] [] [] |
+- gmult | [] [] [] [] |
+- gnubiff | () [] |
+- gnucash | () [] |
+- gnuedu | |
+- gnulib | [] [] [] |
+- gnunet | |
+- gnunet-gtk | [] |
+- gnutls | [] [] |
+- gpe-aerial | [] [] [] [] [] [] [] |
+- gpe-beam | [] [] [] [] [] [] [] |
+- gpe-calendar | [] [] [] [] |
+- gpe-clock | [] [] [] [] [] [] [] [] |
+- gpe-conf | [] [] [] [] [] [] [] |
+- gpe-contacts | [] [] [] [] [] |
+- gpe-edit | [] [] [] [] [] [] [] [] [] |
+- gpe-filemanager | [] [] |
+- gpe-go | [] [] [] [] [] [] [] [] |
+- gpe-login | [] [] [] [] [] [] [] [] |
+- gpe-ownerinfo | [] [] [] [] [] [] [] [] |
+- gpe-package | [] [] |
+- gpe-sketchbook | [] [] [] [] [] [] [] [] |
+- gpe-su | [] [] [] [] [] [] [] [] |
+- gpe-taskmanager | [] [] [] [] [] [] [] [] |
+- gpe-timesheet | [] [] [] [] [] [] [] [] |
+- gpe-today | [] [] [] [] [] [] [] [] |
+- gpe-todo | [] [] [] [] |
+- gphoto2 | [] [] [] [] [] [] |
+- gprof | [] [] [] |
+- gpsdrive | [] [] |
+- gramadoir | [] [] |
+- grep | [] [] [] [] |
+- gretl | [] [] [] |
+- gsasl | [] [] [] |
+- gss | [] [] [] [] |
+- gst-plugins-bad | [] [] [] |
+- gst-plugins-base | [] [] |
+- gst-plugins-good | [] [] |
+- gst-plugins-ugly | [] [] [] |
+- gstreamer | [] [] [] [] |
+- gtick | [] |
+- gtkam | [] [] [] [] [] |
+- gtkorphan | [] |
+- gtkspell | [] [] [] [] [] [] [] [] |
+- gutenprint | [] |
+- hello | [] [] [] [] [] [] [] [] |
+- herrie | [] [] [] |
+- hylafax | |
+- idutils | [] [] [] [] [] |
+- indent | [] [] [] [] [] [] [] |
+- iso_15924 | |
+- iso_3166 | [] [] [] [] [] [] [] [] [] [] [] [] [] |
+- iso_3166_2 | |
+- iso_4217 | [] [] [] [] [] [] [] |
+- iso_639 | [] [] [] [] [] [] [] |
+- jpilot | |
+- jtag | [] |
+- jwhois | [] [] [] [] |
+- kbd | [] [] [] |
+- keytouch | [] |
+- keytouch-editor | [] |
+- keytouch-keyboa... | [] |
+- latrine | |
+- ld | [] |
+- leafpad | [] [] [] [] [] [] |
+- libc | [] [] [] [] |
+- libexif | [] [] |
+- libextractor | [] [] |
+- libgpewidget | [] [] [] [] [] [] [] [] |
+- libgpg-error | [] [] [] |
+- libgphoto2 | [] |
+- libgphoto2_port | [] [] [] |
+- libgsasl | [] [] [] [] |
+- libiconv | [] [] [] |
+- libidn | [] [] () |
+- lifelines | [] [] |
+- lilypond | |
+- lingoteach | [] |
+- lprng | [] |
+- lynx | [] [] [] |
+- m4 | [] [] [] [] [] |
+- mailfromd | [] |
+- mailutils | [] [] [] |
+- make | [] [] [] [] |
+- man-db | [] [] [] [] |
+- minicom | [] [] [] [] [] |
+- nano | [] [] [] [] |
+- opcodes | [] [] |
+- parted | [] |
+- pilot-qof | |
+- popt | [] [] [] [] |
+- psmisc | [] [] |
+- pwdutils | [] [] |
+- qof | [] [] |
+- radius | [] [] |
+- recode | [] [] [] [] [] [] [] |
+- rpm | [] [] [] [] |
+- screem | |
+- scrollkeeper | [] [] [] [] [] [] [] |
+- sed | [] [] [] [] [] [] [] [] [] |
+- shared-mime-info | [] [] [] [] [] [] |
+- sharutils | [] [] [] [] |
+- shishi | [] |
+- skencil | [] [] [] |
+- solfege | [] |
+- soundtracker | [] [] |
+- sp | |
+- system-tools-ba... | [] [] [] [] [] [] [] [] [] |
+- tar | [] [] [] [] |
+- texinfo | [] [] [] [] |
+- tin | () |
+- tuxpaint | [] [] [] [] [] [] |
+- unicode-han-tra... | |
+- unicode-transla... | |
+- util-linux | [] [] [] [] |
+- util-linux-ng | [] [] [] [] |
+- vorbis-tools | [] |
+- wastesedge | |
+- wdiff | [] [] [] [] [] [] [] |
+- wget | [] [] [] [] |
+- xchat | [] [] [] [] [] [] [] |
+- xkeyboard-config | [] [] [] |
+- xpad | [] [] [] |
+- +--------------------------------------------------+
+- or pa pl pt pt_BR rm ro ru rw sk sl sq sr sv ta
+- 0 5 77 31 53 4 58 72 3 45 46 9 45 122 3
++ Ready PO files af am ar as ast az be be@latin bg bn_IN bs ca crh
++ +---------------------------------------------------+
++ a2ps | [] [] |
++ aegis | |
++ ant-phone | |
++ anubis | |
++ aspell | [] [] |
++ bash | |
++ bfd | |
++ bibshelf | [] |
++ binutils | |
++ bison | |
++ bison-runtime | [] |
++ bluez-pin | [] [] |
++ bombono-dvd | |
++ buzztard | |
++ cflow | |
++ clisp | |
++ coreutils | [] [] |
++ cpio | |
++ cppi | |
++ cpplib | [] |
++ cryptsetup | |
++ dfarc | |
++ dialog | [] [] |
++ dico | |
++ diffutils | [] |
++ dink | |
++ doodle | |
++ e2fsprogs | [] |
++ enscript | [] |
++ exif | |
++ fetchmail | [] |
++ findutils | [] |
++ flex | [] |
++ freedink | |
++ gas | |
++ gawk | [] [] |
++ gcal | [] |
++ gcc | |
++ gettext-examples | [] [] [] [] |
++ gettext-runtime | [] [] [] |
++ gettext-tools | [] [] |
++ gip | [] |
++ gjay | |
++ gliv | [] |
++ glunarclock | [] [] |
++ gnubiff | |
++ gnucash | [] |
++ gnuedu | |
++ gnulib | |
++ gnunet | |
++ gnunet-gtk | |
++ gnutls | |
++ gold | |
++ gpe-aerial | |
++ gpe-beam | |
++ gpe-bluetooth | |
++ gpe-calendar | |
++ gpe-clock | [] |
++ gpe-conf | |
++ gpe-contacts | |
++ gpe-edit | |
++ gpe-filemanager | |
++ gpe-go | |
++ gpe-login | |
++ gpe-ownerinfo | [] |
++ gpe-package | |
++ gpe-sketchbook | |
++ gpe-su | [] |
++ gpe-taskmanager | [] |
++ gpe-timesheet | [] |
++ gpe-today | [] |
++ gpe-todo | |
++ gphoto2 | |
++ gprof | [] |
++ gpsdrive | |
++ gramadoir | |
++ grep | |
++ grub | [] [] |
++ gsasl | |
++ gss | |
++ gst-plugins-bad | [] |
++ gst-plugins-base | [] |
++ gst-plugins-good | [] |
++ gst-plugins-ugly | [] |
++ gstreamer | [] [] [] |
++ gtick | |
++ gtkam | [] |
++ gtkorphan | [] |
++ gtkspell | [] [] [] |
++ gutenprint | |
++ hello | [] |
++ help2man | |
++ hylafax | |
++ idutils | |
++ indent | [] [] |
++ iso_15924 | |
++ iso_3166 | [] [] [] [] [] [] [] [] |
++ iso_3166_2 | |
++ iso_4217 | |
++ iso_639 | [] [] [] [] [] |
++ iso_639_3 | [] |
++ jwhois | |
++ kbd | |
++ keytouch | [] |
++ keytouch-editor | |
++ keytouch-keyboa... | [] |
++ klavaro | [] |
++ latrine | |
++ ld | [] |
++ leafpad | [] [] |
++ libc | [] [] |
++ libexif | () |
++ libextractor | |
++ libgnutls | |
++ libgpewidget | |
++ libgpg-error | |
++ libgphoto2 | |
++ libgphoto2_port | |
++ libgsasl | |
++ libiconv | [] |
++ libidn | |
++ lifelines | |
++ liferea | [] [] |
++ lilypond | |
++ linkdr | [] |
++ lordsawar | |
++ lprng | |
++ lynx | [] |
++ m4 | |
++ mailfromd | |
++ mailutils | |
++ make | |
++ man-db | |
++ man-db-manpages | |
++ minicom | |
++ mkisofs | |
++ myserver | |
++ nano | [] [] |
++ opcodes | |
++ parted | |
++ pies | |
++ popt | |
++ psmisc | |
++ pspp | [] |
++ pwdutils | |
++ radius | [] |
++ recode | [] [] |
++ rosegarden | |
++ rpm | |
++ rush | |
++ sarg | |
++ screem | |
++ scrollkeeper | [] [] [] |
++ sed | [] [] |
++ sharutils | [] [] |
++ shishi | |
++ skencil | |
++ solfege | |
++ solfege-manual | |
++ soundtracker | |
++ sp | |
++ sysstat | |
++ tar | [] |
++ texinfo | |
++ tin | |
++ unicode-han-tra... | |
++ unicode-transla... | |
++ util-linux-ng | [] |
++ vice | |
++ vmm | |
++ vorbis-tools | |
++ wastesedge | |
++ wdiff | |
++ wget | [] [] |
++ wyslij-po | |
++ xchat | [] [] [] [] |
++ xdg-user-dirs | [] [] [] [] [] [] [] [] [] |
++ xkeyboard-config | [] [] [] |
++ +---------------------------------------------------+
++ af am ar as ast az be be@latin bg bn_IN bs ca crh
++ 6 0 2 3 19 1 11 3 28 3 1 38 5
++
++ cs da de el en en_GB en_ZA eo es et eu fa fi
++ +-------------------------------------------------+
++ a2ps | [] [] [] [] [] [] [] [] |
++ aegis | [] [] [] |
++ ant-phone | [] () |
++ anubis | [] [] [] |
++ aspell | [] [] [] [] [] |
++ bash | [] [] [] [] |
++ bfd | [] [] |
++ bibshelf | [] [] [] [] |
++ binutils | [] [] |
++ bison | [] [] [] |
++ bison-runtime | [] [] [] [] [] |
++ bluez-pin | [] [] [] [] [] [] [] |
++ bombono-dvd | [] [] |
++ buzztard | [] [] [] |
++ cflow | [] [] [] |
++ clisp | [] [] [] [] |
++ coreutils | [] [] [] [] |
++ cpio | [] |
++ cppi | [] |
++ cpplib | [] [] [] |
++ cryptsetup | [] |
++ dfarc | [] [] [] [] |
++ dialog | [] [] [] [] [] |
++ dico | |
++ diffutils | [] [] [] [] [] [] [] |
++ dink | [] [] [] |
++ doodle | [] |
++ e2fsprogs | [] [] [] |
++ enscript | [] [] [] |
++ exif | () [] [] [] |
++ fetchmail | [] [] () [] [] [] |
++ findutils | [] [] [] [] |
++ flex | [] [] [] |
++ freedink | [] [] [] [] |
++ gas | [] |
++ gawk | [] [] [] |
++ gcal | [] |
++ gcc | [] [] |
++ gettext-examples | [] [] [] [] [] |
++ gettext-runtime | [] [] [] [] [] |
++ gettext-tools | [] [] [] |
++ gip | [] [] [] [] [] |
++ gjay | [] [] |
++ gliv | [] [] [] [] |
++ glunarclock | [] [] [] |
++ gnubiff | () |
++ gnucash | [] () () () () () |
++ gnuedu | [] [] |
++ gnulib | [] [] [] |
++ gnunet | |
++ gnunet-gtk | [] |
++ gnutls | [] [] |
++ gold | [] [] |
++ gpe-aerial | [] [] [] [] [] |
++ gpe-beam | [] [] [] [] [] |
++ gpe-bluetooth | [] [] [] |
++ gpe-calendar | [] [] |
++ gpe-clock | [] [] [] [] [] |
++ gpe-conf | [] [] [] [] |
++ gpe-contacts | [] [] [] [] |
++ gpe-edit | [] [] [] |
++ gpe-filemanager | [] [] [] [] |
++ gpe-go | [] [] [] [] [] |
++ gpe-login | [] [] [] |
++ gpe-ownerinfo | [] [] [] [] [] |
++ gpe-package | [] [] [] [] |
++ gpe-sketchbook | [] [] [] [] [] |
++ gpe-su | [] [] [] [] [] |
++ gpe-taskmanager | [] [] [] [] [] |
++ gpe-timesheet | [] [] [] [] [] |
++ gpe-today | [] [] [] [] [] |
++ gpe-todo | [] [] [] [] |
++ gphoto2 | [] [] () [] [] [] [] |
++ gprof | [] [] [] [] |
++ gpsdrive | [] [] [] |
++ gramadoir | [] [] [] |
++ grep | [] [] |
++ grub | [] [] [] |
++ gsasl | [] [] |
++ gss | [] |
++ gst-plugins-bad | [] [] [] [] [] [] |
++ gst-plugins-base | [] [] [] [] [] [] |
++ gst-plugins-good | [] [] [] [] [] [] [] |
++ gst-plugins-ugly | [] [] [] [] [] [] [] |
++ gstreamer | [] [] [] [] [] [] |
++ gtick | [] () [] [] |
++ gtkam | [] [] () [] [] |
++ gtkorphan | [] [] [] [] |
++ gtkspell | [] [] [] [] [] [] [] [] |
++ gutenprint | [] [] [] [] |
++ hello | [] [] [] [] [] |
++ help2man | [] [] |
++ hylafax | [] [] |
++ idutils | [] [] [] |
++ indent | [] [] [] [] [] [] [] [] |
++ iso_15924 | [] () [] [] [] |
++ iso_3166 | [] [] [] () [] [] [] () [] |
++ iso_3166_2 | () |
++ iso_4217 | [] [] [] () [] [] [] |
++ iso_639 | [] [] [] () [] [] [] |
++ iso_639_3 | |
++ jwhois | [] [] |
++ kbd | [] [] [] [] [] |
++ keytouch | [] [] [] |
++ keytouch-editor | [] [] [] |
++ keytouch-keyboa... | [] [] |
++ klavaro | [] [] [] [] |
++ latrine | [] () [] |
++ ld | [] [] [] |
++ leafpad | [] [] [] [] [] [] [] |
++ libc | [] [] [] [] [] |
++ libexif | [] [] () |
++ libextractor | |
++ libgnutls | [] |
++ libgpewidget | [] [] [] |
++ libgpg-error | [] [] |
++ libgphoto2 | [] () |
++ libgphoto2_port | [] () [] |
++ libgsasl | [] |
++ libiconv | [] [] [] [] [] [] |
++ libidn | [] [] [] [] |
++ lifelines | [] () |
++ liferea | [] [] [] [] [] |
++ lilypond | [] [] [] [] |
++ linkdr | [] [] [] [] |
++ lordsawar | [] |
++ lprng | |
++ lynx | [] [] [] [] |
++ m4 | [] [] [] [] [] |
++ mailfromd | |
++ mailutils | [] |
++ make | [] [] [] [] |
++ man-db | |
++ man-db-manpages | |
++ minicom | [] [] [] [] [] |
++ mkisofs | [] |
++ myserver | |
++ nano | [] [] [] [] |
++ opcodes | [] [] [] |
++ parted | [] [] |
++ pies | |
++ popt | [] [] [] [] [] [] |
++ psmisc | [] [] [] [] |
++ pspp | [] |
++ pwdutils | [] |
++ radius | [] |
++ recode | [] [] [] [] [] [] [] |
++ rosegarden | () () () () |
++ rpm | [] [] [] |
++ rush | |
++ sarg | |
++ screem | |
++ scrollkeeper | [] [] [] [] [] [] |
++ sed | [] [] [] [] [] [] [] |
++ sharutils | [] [] [] [] [] |
++ shishi | |
++ skencil | [] () [] |
++ solfege | [] [] [] [] |
++ solfege-manual | [] [] |
++ soundtracker | [] [] [] |
++ sp | [] |
++ sysstat | [] [] [] [] |
++ tar | [] [] [] [] [] |
++ texinfo | [] [] [] |
++ tin | [] [] |
++ unicode-han-tra... | |
++ unicode-transla... | |
++ util-linux-ng | [] [] [] [] [] |
++ vice | () () |
++ vmm | [] |
++ vorbis-tools | [] [] |
++ wastesedge | [] |
++ wdiff | [] [] [] |
++ wget | [] [] [] [] |
++ wyslij-po | [] |
++ xchat | [] [] [] [] [] [] |
++ xdg-user-dirs | [] [] [] [] [] [] [] [] [] |
++ xkeyboard-config | [] [] [] [] [] [] |
++ +-------------------------------------------------+
++ cs da de el en en_GB en_ZA eo es et eu fa fi
++ 64 105 117 18 1 8 0 28 89 18 19 0 104
++
++ fr ga gl gu he hi hr hu hy id is it ja ka kn
++ +------------------------------------------------+
++ a2ps | [] [] [] |
++ aegis | [] [] |
++ ant-phone | [] [] |
++ anubis | [] [] [] |
++ aspell | [] [] [] [] |
++ bash | [] [] [] |
++ bfd | [] [] |
++ bibshelf | [] [] [] [] |
++ binutils | [] [] |
++ bison | [] [] [] |
++ bison-runtime | [] [] [] [] [] |
++ bluez-pin | [] [] [] [] [] [] [] |
++ bombono-dvd | |
++ buzztard | [] |
++ cflow | [] [] |
++ clisp | [] |
++ coreutils | [] [] [] [] [] |
++ cpio | [] [] [] |
++ cppi | [] |
++ cpplib | [] [] |
++ cryptsetup | [] [] [] |
++ dfarc | [] [] |
++ dialog | [] [] [] [] [] [] [] |
++ dico | |
++ diffutils | [] [] [] [] [] [] [] [] |
++ dink | [] |
++ doodle | [] [] |
++ e2fsprogs | [] [] |
++ enscript | [] [] [] [] |
++ exif | [] [] [] [] [] |
++ fetchmail | [] [] [] [] |
++ findutils | [] [] [] [] [] |
++ flex | [] [] |
++ freedink | [] [] |
++ gas | [] [] |
++ gawk | [] [] [] [] () [] |
++ gcal | [] |
++ gcc | [] |
++ gettext-examples | [] [] [] [] [] [] |
++ gettext-runtime | [] [] [] [] [] |
++ gettext-tools | [] [] [] [] |
++ gip | [] [] [] [] [] |
++ gjay | |
++ gliv | () |
++ glunarclock | [] [] [] |
++ gnubiff | () [] () |
++ gnucash | () () () () [] |
++ gnuedu | [] [] |
++ gnulib | [] [] [] [] [] |
++ gnunet | |
++ gnunet-gtk | [] |
++ gnutls | [] [] |
++ gold | [] |
++ gpe-aerial | [] [] |
++ gpe-beam | [] [] [] |
++ gpe-bluetooth | [] [] [] |
++ gpe-calendar | [] |
++ gpe-clock | [] [] [] [] |
++ gpe-conf | [] [] [] |
++ gpe-contacts | [] [] [] |
++ gpe-edit | [] [] |
++ gpe-filemanager | [] [] [] |
++ gpe-go | [] [] [] [] |
++ gpe-login | [] [] |
++ gpe-ownerinfo | [] [] [] [] |
++ gpe-package | [] [] |
++ gpe-sketchbook | [] [] [] |
++ gpe-su | [] [] [] [] [] |
++ gpe-taskmanager | [] [] [] [] |
++ gpe-timesheet | [] [] [] [] |
++ gpe-today | [] [] [] [] [] [] |
++ gpe-todo | [] [] |
++ gphoto2 | [] [] [] [] [] |
++ gprof | [] [] [] |
++ gpsdrive | [] [] [] |
++ gramadoir | [] [] [] |
++ grep | [] |
++ grub | [] [] [] |
++ gsasl | [] [] [] [] |
++ gss | [] [] [] [] |
++ gst-plugins-bad | [] [] [] [] |
++ gst-plugins-base | [] [] [] [] [] |
++ gst-plugins-good | [] [] [] [] [] |
++ gst-plugins-ugly | [] [] [] [] [] |
++ gstreamer | [] [] [] [] |
++ gtick | [] [] [] [] |
++ gtkam | [] [] [] [] [] |
++ gtkorphan | [] [] [] |
++ gtkspell | [] [] [] [] [] [] [] [] |
++ gutenprint | [] [] [] |
++ hello | [] [] |
++ help2man | [] |
++ hylafax | [] |
++ idutils | [] [] [] [] [] |
++ indent | [] [] [] [] [] [] [] |
++ iso_15924 | () [] [] |
++ iso_3166 | () [] [] [] [] [] [] [] [] [] [] |
++ iso_3166_2 | () [] [] [] |
++ iso_4217 | () [] [] [] [] |
++ iso_639 | () [] [] [] [] [] [] [] |
++ iso_639_3 | () [] [] |
++ jwhois | [] [] [] [] |
++ kbd | [] [] |
++ keytouch | [] [] [] [] [] |
++ keytouch-editor | [] [] [] [] |
++ keytouch-keyboa... | [] [] [] [] |
++ klavaro | [] [] |
++ latrine | [] [] |
++ ld | [] [] [] |
++ leafpad | [] [] [] [] [] [] () |
++ libc | [] [] [] [] |
++ libexif | |
++ libextractor | |
++ libgnutls | [] [] |
++ libgpewidget | [] [] [] |
++ libgpg-error | [] [] |
++ libgphoto2 | [] [] [] |
++ libgphoto2_port | [] [] [] |
++ libgsasl | [] [] [] [] |
++ libiconv | [] [] [] [] [] |
++ libidn | [] [] [] |
++ lifelines | () |
++ liferea | [] [] [] [] |
++ lilypond | [] |
++ linkdr | [] [] [] [] |
++ lordsawar | |
++ lprng | [] |
++ lynx | [] [] [] [] [] |
++ m4 | [] [] [] [] [] |
++ mailfromd | |
++ mailutils | [] [] |
++ make | [] [] [] [] [] [] [] [] |
++ man-db | [] [] |
++ man-db-manpages | [] |
++ minicom | [] [] [] [] |
++ mkisofs | [] [] [] |
++ myserver | |
++ nano | [] [] [] [] [] |
++ opcodes | [] [] [] |
++ parted | [] [] [] [] |
++ pies | |
++ popt | [] [] [] [] [] [] [] [] |
++ psmisc | [] [] |
++ pspp | |
++ pwdutils | [] [] |
++ radius | [] [] |
++ recode | [] [] [] [] [] [] [] |
++ rosegarden | () () () () |
++ rpm | [] [] |
++ rush | |
++ sarg | [] |
++ screem | [] [] |
++ scrollkeeper | [] [] [] |
++ sed | [] [] [] [] [] [] [] |
++ sharutils | [] [] [] [] [] [] |
++ shishi | [] |
++ skencil | [] |
++ solfege | [] [] [] |
++ solfege-manual | [] [] |
++ soundtracker | [] [] |
++ sp | [] () |
++ sysstat | [] [] [] [] |
++ tar | [] [] [] [] [] [] |
++ texinfo | [] [] [] [] |
++ tin | [] |
++ unicode-han-tra... | |
++ unicode-transla... | [] [] |
++ util-linux-ng | [] [] [] [] [] |
++ vice | () () () |
++ vmm | [] |
++ vorbis-tools | [] |
++ wastesedge | () () |
++ wdiff | |
++ wget | [] [] [] [] [] [] [] |
++ wyslij-po | [] [] |
++ xchat | [] [] [] [] [] [] [] [] |
++ xdg-user-dirs | [] [] [] [] [] [] [] [] [] [] [] |
++ xkeyboard-config | [] [] [] [] |
++ +------------------------------------------------+
++ fr ga gl gu he hi hr hu hy id is it ja ka kn
++ 121 53 20 4 8 2 5 53 2 120 5 83 66 0 4
++
++ ko ku ky lg lt lv mk ml mn mr ms mt nb nds ne
++ +-----------------------------------------------+
++ a2ps | [] |
++ aegis | |
++ ant-phone | |
++ anubis | [] [] |
++ aspell | [] |
++ bash | |
++ bfd | |
++ bibshelf | [] [] |
++ binutils | |
++ bison | [] |
++ bison-runtime | [] [] [] [] [] |
++ bluez-pin | [] [] [] [] [] |
++ bombono-dvd | |
++ buzztard | |
++ cflow | |
++ clisp | |
++ coreutils | [] |
++ cpio | |
++ cppi | |
++ cpplib | |
++ cryptsetup | |
++ dfarc | [] |
++ dialog | [] [] [] [] [] |
++ dico | |
++ diffutils | [] [] |
++ dink | |
++ doodle | |
++ e2fsprogs | |
++ enscript | |
++ exif | [] |
++ fetchmail | |
++ findutils | |
++ flex | |
++ freedink | [] |
++ gas | |
++ gawk | |
++ gcal | |
++ gcc | |
++ gettext-examples | [] [] [] [] |
++ gettext-runtime | [] |
++ gettext-tools | [] |
++ gip | [] [] |
++ gjay | |
++ gliv | |
++ glunarclock | [] |
++ gnubiff | |
++ gnucash | () () () () |
++ gnuedu | |
++ gnulib | |
++ gnunet | |
++ gnunet-gtk | |
++ gnutls | [] |
++ gold | |
++ gpe-aerial | [] |
++ gpe-beam | [] |
++ gpe-bluetooth | [] [] |
++ gpe-calendar | [] |
++ gpe-clock | [] [] [] [] [] |
++ gpe-conf | [] [] |
++ gpe-contacts | [] [] |
++ gpe-edit | [] |
++ gpe-filemanager | [] [] |
++ gpe-go | [] [] [] |
++ gpe-login | [] |
++ gpe-ownerinfo | [] [] |
++ gpe-package | [] [] |
++ gpe-sketchbook | [] [] |
++ gpe-su | [] [] [] [] [] [] |
++ gpe-taskmanager | [] [] [] [] [] [] |
++ gpe-timesheet | [] [] |
++ gpe-today | [] [] [] [] |
++ gpe-todo | [] [] |
++ gphoto2 | |
++ gprof | [] |
++ gpsdrive | |
++ gramadoir | |
++ grep | |
++ grub | |
++ gsasl | |
++ gss | |
++ gst-plugins-bad | [] [] |
++ gst-plugins-base | [] [] |
++ gst-plugins-good | [] [] |
++ gst-plugins-ugly | [] [] [] [] [] |
++ gstreamer | |
++ gtick | |
++ gtkam | [] |
++ gtkorphan | [] [] |
++ gtkspell | [] [] [] [] [] [] [] |
++ gutenprint | |
++ hello | [] [] [] |
++ help2man | |
++ hylafax | |
++ idutils | |
++ indent | |
++ iso_15924 | [] [] |
++ iso_3166 | [] [] () [] [] [] [] [] |
++ iso_3166_2 | |
++ iso_4217 | [] [] |
++ iso_639 | [] [] |
++ iso_639_3 | [] |
++ jwhois | [] |
++ kbd | |
++ keytouch | [] |
++ keytouch-editor | [] |
++ keytouch-keyboa... | [] |
++ klavaro | [] |
++ latrine | [] |
++ ld | |
++ leafpad | [] [] [] |
++ libc | [] |
++ libexif | |
++ libextractor | |
++ libgnutls | [] |
++ libgpewidget | [] [] |
++ libgpg-error | |
++ libgphoto2 | |
++ libgphoto2_port | |
++ libgsasl | |
++ libiconv | |
++ libidn | |
++ lifelines | |
++ liferea | |
++ lilypond | |
++ linkdr | |
++ lordsawar | |
++ lprng | |
++ lynx | |
++ m4 | |
++ mailfromd | |
++ mailutils | |
++ make | [] |
++ man-db | |
++ man-db-manpages | |
++ minicom | [] |
++ mkisofs | |
++ myserver | |
++ nano | [] [] |
++ opcodes | |
++ parted | |
++ pies | |
++ popt | [] [] [] |
++ psmisc | |
++ pspp | |
++ pwdutils | |
++ radius | |
++ recode | |
++ rosegarden | |
++ rpm | |
++ rush | |
++ sarg | |
++ screem | |
++ scrollkeeper | [] [] |
++ sed | |
++ sharutils | |
++ shishi | |
++ skencil | |
++ solfege | [] |
++ solfege-manual | |
++ soundtracker | |
++ sp | |
++ sysstat | [] |
++ tar | [] |
++ texinfo | [] |
++ tin | |
++ unicode-han-tra... | |
++ unicode-transla... | |
++ util-linux-ng | |
++ vice | |
++ vmm | |
++ vorbis-tools | |
++ wastesedge | |
++ wdiff | |
++ wget | [] |
++ wyslij-po | |
++ xchat | [] [] [] |
++ xdg-user-dirs | [] [] [] [] [] [] [] [] |
++ xkeyboard-config | [] [] [] |
++ +-----------------------------------------------+
++ ko ku ky lg lt lv mk ml mn mr ms mt nb nds ne
++ 20 5 10 1 12 48 4 2 2 4 24 10 19 3 1
++
++ nl nn or pa pl ps pt pt_BR ro ru rw sk sl sq sr
++ +---------------------------------------------------+
++ a2ps | [] [] [] [] [] [] [] [] |
++ aegis | [] [] [] |
++ ant-phone | [] [] |
++ anubis | [] [] [] |
++ aspell | [] [] [] [] [] |
++ bash | [] [] |
++ bfd | [] |
++ bibshelf | [] [] |
++ binutils | [] [] |
++ bison | [] [] [] |
++ bison-runtime | [] [] [] [] [] [] [] |
++ bluez-pin | [] [] [] [] [] [] [] [] |
++ bombono-dvd | [] () |
++ buzztard | [] [] |
++ cflow | [] |
++ clisp | [] [] |
++ coreutils | [] [] [] [] [] [] |
++ cpio | [] [] [] |
++ cppi | [] |
++ cpplib | [] |
++ cryptsetup | [] |
++ dfarc | [] |
++ dialog | [] [] [] [] |
++ dico | [] |
++ diffutils | [] [] [] [] [] [] |
++ dink | () |
++ doodle | [] [] |
++ e2fsprogs | [] [] |
++ enscript | [] [] [] [] [] |
++ exif | [] [] [] () [] |
++ fetchmail | [] [] [] [] |
++ findutils | [] [] [] [] [] |
++ flex | [] [] [] [] [] |
++ freedink | [] [] |
++ gas | |
++ gawk | [] [] [] [] |
++ gcal | |
++ gcc | [] |
++ gettext-examples | [] [] [] [] [] [] [] [] |
++ gettext-runtime | [] [] [] [] [] [] [] [] [] |
++ gettext-tools | [] [] [] [] [] [] |
++ gip | [] [] [] [] [] |
++ gjay | |
++ gliv | [] [] [] [] [] [] |
++ glunarclock | [] [] [] [] [] |
++ gnubiff | [] () |
++ gnucash | [] () () () |
++ gnuedu | [] |
++ gnulib | [] [] [] [] |
++ gnunet | |
++ gnunet-gtk | |
++ gnutls | [] [] |
++ gold | |
++ gpe-aerial | [] [] [] [] [] [] [] |
++ gpe-beam | [] [] [] [] [] [] [] |
++ gpe-bluetooth | [] [] |
++ gpe-calendar | [] [] [] [] |
++ gpe-clock | [] [] [] [] [] [] [] [] |
++ gpe-conf | [] [] [] [] [] [] [] |
++ gpe-contacts | [] [] [] [] [] |
++ gpe-edit | [] [] [] |
++ gpe-filemanager | [] [] [] |
++ gpe-go | [] [] [] [] [] [] [] [] |
++ gpe-login | [] [] |
++ gpe-ownerinfo | [] [] [] [] [] [] [] [] |
++ gpe-package | [] [] |
++ gpe-sketchbook | [] [] [] [] [] [] [] |
++ gpe-su | [] [] [] [] [] [] [] [] |
++ gpe-taskmanager | [] [] [] [] [] [] [] [] |
++ gpe-timesheet | [] [] [] [] [] [] [] [] |
++ gpe-today | [] [] [] [] [] [] [] [] |
++ gpe-todo | [] [] [] [] [] |
++ gphoto2 | [] [] [] [] [] [] [] [] |
++ gprof | [] [] [] |
++ gpsdrive | [] [] |
++ gramadoir | [] [] |
++ grep | [] [] [] [] |
++ grub | [] [] [] |
++ gsasl | [] [] [] [] |
++ gss | [] [] [] |
++ gst-plugins-bad | [] [] [] [] [] |
++ gst-plugins-base | [] [] [] [] [] |
++ gst-plugins-good | [] [] [] [] [] |
++ gst-plugins-ugly | [] [] [] [] [] [] |
++ gstreamer | [] [] [] [] [] |
++ gtick | [] [] [] |
++ gtkam | [] [] [] [] [] [] |
++ gtkorphan | [] |
++ gtkspell | [] [] [] [] [] [] [] [] [] [] |
++ gutenprint | [] [] |
++ hello | [] [] [] [] |
++ help2man | [] [] |
++ hylafax | [] |
++ idutils | [] [] [] [] [] |
++ indent | [] [] [] [] [] [] [] |
++ iso_15924 | [] [] [] [] |
++ iso_3166 | [] [] [] [] [] () [] [] [] [] [] [] [] [] |
++ iso_3166_2 | [] [] [] |
++ iso_4217 | [] [] [] [] [] [] [] [] |
++ iso_639 | [] [] [] [] [] [] [] [] [] |
++ iso_639_3 | [] [] |
++ jwhois | [] [] [] [] |
++ kbd | [] [] [] |
++ keytouch | [] [] [] |
++ keytouch-editor | [] [] [] |
++ keytouch-keyboa... | [] [] [] |
++ klavaro | [] [] |
++ latrine | [] [] |
++ ld | |
++ leafpad | [] [] [] [] [] [] [] [] [] |
++ libc | [] [] [] [] |
++ libexif | [] [] () [] |
++ libextractor | |
++ libgnutls | [] [] |
++ libgpewidget | [] [] [] |
++ libgpg-error | [] [] |
++ libgphoto2 | [] [] |
++ libgphoto2_port | [] [] [] [] |
++ libgsasl | [] [] [] [] [] |
++ libiconv | [] [] [] [] [] |
++ libidn | [] [] |
++ lifelines | [] [] |
++ liferea | [] [] [] [] [] () () [] |
++ lilypond | [] |
++ linkdr | [] [] [] |
++ lordsawar | |
++ lprng | [] |
++ lynx | [] [] [] |
++ m4 | [] [] [] [] [] |
++ mailfromd | [] |
++ mailutils | [] |
++ make | [] [] [] [] |
++ man-db | [] [] [] |
++ man-db-manpages | [] [] [] |
++ minicom | [] [] [] [] |
++ mkisofs | [] [] [] |
++ myserver | |
++ nano | [] [] [] [] |
++ opcodes | [] [] |
++ parted | [] [] [] [] |
++ pies | [] |
++ popt | [] [] [] [] |
++ psmisc | [] [] [] |
++ pspp | [] [] |
++ pwdutils | [] |
++ radius | [] [] [] |
++ recode | [] [] [] [] [] [] [] [] |
++ rosegarden | () () |
++ rpm | [] [] [] |
++ rush | [] [] |
++ sarg | |
++ screem | |
++ scrollkeeper | [] [] [] [] [] [] [] [] |
++ sed | [] [] [] [] [] [] [] [] [] |
++ sharutils | [] [] [] [] |
++ shishi | [] |
++ skencil | [] [] |
++ solfege | [] [] [] [] |
++ solfege-manual | [] [] [] |
++ soundtracker | [] |
++ sp | |
++ sysstat | [] [] [] [] |
++ tar | [] [] [] [] |
++ texinfo | [] [] [] [] |
++ tin | [] |
++ unicode-han-tra... | |
++ unicode-transla... | |
++ util-linux-ng | [] [] [] [] [] |
++ vice | [] |
++ vmm | [] |
++ vorbis-tools | [] [] |
++ wastesedge | [] |
++ wdiff | [] [] |
++ wget | [] [] [] [] [] [] [] |
++ wyslij-po | [] [] [] |
++ xchat | [] [] [] [] [] [] [] [] [] |
++ xdg-user-dirs | [] [] [] [] [] [] [] [] [] [] [] [] [] [] |
++ xkeyboard-config | [] [] [] [] [] |
++ +---------------------------------------------------+
++ nl nn or pa pl ps pt pt_BR ro ru rw sk sl sq sr
++ 135 10 4 7 105 1 29 61 47 91 3 55 47 8 37
+
+- tg th tk tr uk ven vi wa xh zh_CN zh_HK zh_TW zu
++ sv sw ta te tg th tr uk vi wa zh_CN zh_HK zh_TW
+ +---------------------------------------------------+
+- Compendium | [] [] [] [] | 19
+- a2ps | [] [] [] | 19
+- aegis | [] | 1
+- ant-phone | [] [] | 6
+- anubis | [] [] [] | 11
+- ap-utils | () [] | 4
+- aspell | [] [] [] | 16
+- bash | [] | 6
+- bfd | | 2
+- bibshelf | [] | 7
+- binutils | [] [] [] [] | 9
+- bison | [] [] [] [] | 20
+- bison-runtime | [] [] [] [] | 18
+- bluez-pin | [] [] [] [] [] [] | 28
+- cflow | [] [] | 5
+- clisp | | 9
+- console-tools | [] [] | 5
+- coreutils | [] [] [] | 18
+- cpio | [] [] [] [] | 11
+- cpplib | [] [] [] [] [] | 12
+- cryptonit | [] | 6
+- dialog | [] [] [] | 9
+- diffutils | [] [] [] [] [] | 29
+- doodle | [] | 6
+- e2fsprogs | [] [] | 10
+- enscript | [] [] [] | 16
+- fetchmail | [] [] | 12
+- findutils | [] [] [] | 11
+- findutils_stable | [] [] [] [] | 18
+- flex | [] [] | 15
+- fslint | [] | 2
+- gas | [] | 3
+- gawk | [] [] [] | 16
+- gcal | [] | 5
+- gcc | [] [] [] | 7
+- gettext-examples | [] [] [] [] [] [] | 29
+- gettext-runtime | [] [] [] [] [] [] | 28
+- gettext-tools | [] [] [] [] [] | 20
+- gip | [] [] | 13
+- gliv | [] [] | 11
+- glunarclock | [] [] [] | 15
+- gmult | [] [] [] [] | 16
+- gnubiff | [] | 2
+- gnucash | () [] | 5
+- gnuedu | [] | 2
+- gnulib | [] | 10
+- gnunet | | 0
+- gnunet-gtk | [] [] | 3
+- gnutls | | 4
+- gpe-aerial | [] [] | 14
+- gpe-beam | [] [] | 14
+- gpe-calendar | [] [] | 7
+- gpe-clock | [] [] [] [] | 21
+- gpe-conf | [] [] [] | 16
+- gpe-contacts | [] [] | 10
+- gpe-edit | [] [] [] [] [] | 22
+- gpe-filemanager | [] [] | 7
+- gpe-go | [] [] [] [] | 19
+- gpe-login | [] [] [] [] [] | 21
+- gpe-ownerinfo | [] [] [] [] | 21
+- gpe-package | [] | 6
+- gpe-sketchbook | [] [] | 16
+- gpe-su | [] [] [] [] | 21
+- gpe-taskmanager | [] [] [] [] | 21
+- gpe-timesheet | [] [] [] [] | 18
+- gpe-today | [] [] [] [] [] | 21
+- gpe-todo | [] [] | 8
+- gphoto2 | [] [] [] [] | 21
+- gprof | [] [] | 13
+- gpsdrive | [] | 5
+- gramadoir | [] | 7
+- grep | [] | 12
+- gretl | | 6
+- gsasl | [] [] [] | 9
+- gss | [] | 7
+- gst-plugins-bad | [] [] [] | 13
+- gst-plugins-base | [] [] | 11
+- gst-plugins-good | [] [] [] [] [] | 16
+- gst-plugins-ugly | [] [] [] | 13
+- gstreamer | [] [] [] | 18
+- gtick | [] [] | 7
+- gtkam | [] | 16
+- gtkorphan | [] | 7
+- gtkspell | [] [] [] [] [] [] | 27
+- gutenprint | | 4
+- hello | [] [] [] [] [] | 38
+- herrie | [] [] | 8
+- hylafax | | 0
+- idutils | [] [] | 15
+- indent | [] [] [] [] [] | 28
+- iso_15924 | [] [] | 4
+- iso_3166 | [] [] [] [] [] [] [] [] [] | 54
+- iso_3166_2 | [] [] | 4
+- iso_4217 | [] [] [] [] [] | 24
+- iso_639 | [] [] [] [] [] | 26
+- jpilot | [] [] [] [] | 7
+- jtag | [] | 3
+- jwhois | [] [] [] | 13
+- kbd | [] [] [] | 13
+- keytouch | [] | 8
+- keytouch-editor | [] | 5
+- keytouch-keyboa... | [] | 5
+- latrine | [] [] | 5
+- ld | [] [] [] [] | 10
+- leafpad | [] [] [] [] [] | 24
+- libc | [] [] [] | 19
+- libexif | [] | 5
+- libextractor | [] | 5
+- libgpewidget | [] [] [] | 20
+- libgpg-error | [] | 6
+- libgphoto2 | [] [] | 9
+- libgphoto2_port | [] [] [] | 11
+- libgsasl | [] | 8
+- libiconv | [] [] | 11
+- libidn | [] [] | 11
+- lifelines | | 4
+- lilypond | [] | 6
+- lingoteach | [] | 6
+- lprng | [] | 2
+- lynx | [] [] [] | 15
+- m4 | [] [] [] | 18
+- mailfromd | [] [] | 3
+- mailutils | [] [] | 8
+- make | [] [] [] | 20
+- man-db | [] | 9
+- minicom | [] | 14
+- nano | [] [] [] | 20
+- opcodes | [] [] | 10
+- parted | [] [] [] | 11
+- pilot-qof | [] | 1
+- popt | [] [] [] [] | 18
+- psmisc | [] [] | 10
+- pwdutils | [] | 3
+- qof | [] | 4
+- radius | [] [] | 7
+- recode | [] [] [] | 25
+- rpm | [] [] [] [] | 13
+- screem | [] | 2
+- scrollkeeper | [] [] [] [] | 26
+- sed | [] [] [] [] | 23
+- shared-mime-info | [] [] [] | 29
+- sharutils | [] [] [] | 23
+- shishi | [] | 3
+- skencil | [] | 7
+- solfege | [] | 3
+- soundtracker | [] [] | 9
+- sp | [] | 3
+- system-tools-ba... | [] [] [] [] [] [] [] | 38
+- tar | [] [] [] | 17
+- texinfo | [] [] [] | 15
+- tin | | 1
+- tuxpaint | [] [] [] | 19
++ a2ps | [] [] [] [] [] | 27
++ aegis | [] | 9
++ ant-phone | [] [] [] [] | 9
++ anubis | [] [] [] [] | 15
++ aspell | [] [] [] | 20
++ bash | [] [] | 11
++ bfd | [] | 6
++ bibshelf | [] [] [] | 16
++ binutils | [] [] | 8
++ bison | [] [] | 12
++ bison-runtime | [] [] [] [] [] [] | 29
++ bluez-pin | [] [] [] [] [] [] [] [] | 37
++ bombono-dvd | [] | 4
++ buzztard | [] | 7
++ cflow | [] [] [] | 9
++ clisp | | 10
++ coreutils | [] [] [] [] | 22
++ cpio | [] [] [] [] [] [] | 13
++ cppi | [] [] | 5
++ cpplib | [] [] [] [] [] [] | 13
++ cryptsetup | [] [] | 7
++ dfarc | [] | 9
++ dialog | [] [] [] [] [] [] [] | 30
++ dico | [] | 2
++ diffutils | [] [] [] [] [] [] | 30
++ dink | | 4
++ doodle | [] [] | 7
++ e2fsprogs | [] [] [] | 11
++ enscript | [] [] [] [] | 17
++ exif | [] [] [] | 16
++ fetchmail | [] [] [] | 17
++ findutils | [] [] [] [] [] | 20
++ flex | [] [] [] [] | 15
++ freedink | [] | 10
++ gas | [] | 4
++ gawk | [] [] [] [] | 18
++ gcal | [] [] | 5
++ gcc | [] [] [] | 7
++ gettext-examples | [] [] [] [] [] [] [] | 34
++ gettext-runtime | [] [] [] [] [] [] [] | 30
++ gettext-tools | [] [] [] [] [] [] | 22
++ gip | [] [] [] [] | 22
++ gjay | [] | 3
++ gliv | [] [] [] | 14
++ glunarclock | [] [] [] [] [] | 19
++ gnubiff | [] [] | 4
++ gnucash | () [] () () | 9
++ gnuedu | [] [] | 7
++ gnulib | [] [] [] [] | 16
++ gnunet | [] | 1
++ gnunet-gtk | [] [] [] | 5
++ gnutls | [] [] [] | 10
++ gold | [] | 4
++ gpe-aerial | [] [] [] | 18
++ gpe-beam | [] [] [] | 19
++ gpe-bluetooth | [] [] [] | 13
++ gpe-calendar | [] [] [] [] | 12
++ gpe-clock | [] [] [] [] [] | 28
++ gpe-conf | [] [] [] [] | 20
++ gpe-contacts | [] [] [] | 17
++ gpe-edit | [] [] [] | 12
++ gpe-filemanager | [] [] [] [] | 16
++ gpe-go | [] [] [] [] [] | 25
++ gpe-login | [] [] [] | 11
++ gpe-ownerinfo | [] [] [] [] [] | 25
++ gpe-package | [] [] [] | 13
++ gpe-sketchbook | [] [] [] | 20
++ gpe-su | [] [] [] [] [] | 30
++ gpe-taskmanager | [] [] [] [] [] | 29
++ gpe-timesheet | [] [] [] [] [] | 25
++ gpe-today | [] [] [] [] [] [] | 30
++ gpe-todo | [] [] [] [] | 17
++ gphoto2 | [] [] [] [] [] | 24
++ gprof | [] [] [] | 15
++ gpsdrive | [] [] [] | 11
++ gramadoir | [] [] [] | 11
++ grep | [] [] [] | 10
++ grub | [] [] [] | 14
++ gsasl | [] [] [] [] | 14
++ gss | [] [] [] | 11
++ gst-plugins-bad | [] [] [] [] | 22
++ gst-plugins-base | [] [] [] [] [] | 24
++ gst-plugins-good | [] [] [] [] [] | 25
++ gst-plugins-ugly | [] [] [] [] [] | 29
++ gstreamer | [] [] [] [] | 22
++ gtick | [] [] [] | 13
++ gtkam | [] [] [] | 20
++ gtkorphan | [] [] [] | 14
++ gtkspell | [] [] [] [] [] [] [] [] [] | 45
++ gutenprint | [] | 10
++ hello | [] [] [] [] [] [] | 21
++ help2man | [] [] | 7
++ hylafax | [] | 5
++ idutils | [] [] [] [] | 17
++ indent | [] [] [] [] [] [] | 30
++ iso_15924 | () [] () [] [] | 16
++ iso_3166 | [] [] () [] [] () [] [] [] () | 53
++ iso_3166_2 | () [] () [] | 9
++ iso_4217 | [] () [] [] () [] [] | 26
++ iso_639 | [] [] [] () [] () [] [] [] [] | 38
++ iso_639_3 | [] () | 8
++ jwhois | [] [] [] [] [] | 16
++ kbd | [] [] [] [] [] | 15
++ keytouch | [] [] [] | 16
++ keytouch-editor | [] [] [] | 14
++ keytouch-keyboa... | [] [] [] | 14
++ klavaro | [] | 11
++ latrine | [] [] [] | 10
++ ld | [] [] [] [] | 11
++ leafpad | [] [] [] [] [] [] | 33
++ libc | [] [] [] [] [] | 21
++ libexif | [] () | 6
++ libextractor | [] | 1
++ libgnutls | [] [] [] | 9
++ libgpewidget | [] [] [] | 14
++ libgpg-error | [] [] [] | 9
++ libgphoto2 | [] [] | 8
++ libgphoto2_port | [] [] [] [] | 13
++ libgsasl | [] [] [] | 13
++ libiconv | [] [] [] [] | 21
++ libidn | () [] [] | 11
++ lifelines | [] | 4
++ liferea | [] [] [] | 21
++ lilypond | [] | 7
++ linkdr | [] [] [] [] [] | 17
++ lordsawar | | 1
++ lprng | [] | 3
++ lynx | [] [] [] [] | 17
++ m4 | [] [] [] [] | 19
++ mailfromd | [] [] | 3
++ mailutils | [] | 5
++ make | [] [] [] [] | 21
++ man-db | [] [] [] | 8
++ man-db-manpages | | 4
++ minicom | [] [] | 16
++ mkisofs | [] [] | 9
++ myserver | | 0
++ nano | [] [] [] [] | 21
++ opcodes | [] [] [] | 11
++ parted | [] [] [] [] [] | 15
++ pies | [] [] | 3
++ popt | [] [] [] [] [] [] | 27
++ psmisc | [] [] | 11
++ pspp | | 4
++ pwdutils | [] [] | 6
++ radius | [] [] | 9
++ recode | [] [] [] [] | 28
++ rosegarden | () | 0
++ rpm | [] [] [] | 11
++ rush | [] [] | 4
++ sarg | | 1
++ screem | [] | 3
++ scrollkeeper | [] [] [] [] [] | 27
++ sed | [] [] [] [] [] | 30
++ sharutils | [] [] [] [] [] | 22
++ shishi | [] | 3
++ skencil | [] [] | 7
++ solfege | [] [] [] [] | 16
++ solfege-manual | [] | 8
++ soundtracker | [] [] [] | 9
++ sp | [] | 3
++ sysstat | [] [] | 15
++ tar | [] [] [] [] [] [] | 23
++ texinfo | [] [] [] [] | 16
++ tin | | 4
+ unicode-han-tra... | | 0
+ unicode-transla... | | 2
+- util-linux | [] [] [] | 20
+- util-linux-ng | [] [] [] | 20
+- vorbis-tools | [] [] | 4
+- wastesedge | | 1
+- wdiff | [] [] | 23
+- wget | [] [] [] | 20
+- xchat | [] [] [] [] | 29
+- xkeyboard-config | [] [] [] | 14
+- xpad | [] [] [] | 15
++ util-linux-ng | [] [] [] [] | 20
++ vice | () () | 1
++ vmm | [] | 4
++ vorbis-tools | [] | 6
++ wastesedge | | 2
++ wdiff | [] [] | 7
++ wget | [] [] [] [] [] | 26
++ wyslij-po | [] [] | 8
++ xchat | [] [] [] [] [] [] | 36
++ xdg-user-dirs | [] [] [] [] [] [] [] [] [] | 60
++ xkeyboard-config | [] [] [] [] | 25
+ +---------------------------------------------------+
+- 76 teams tg th tk tr uk ven vi wa xh zh_CN zh_HK zh_TW zu
+- 163 domains 0 3 1 74 51 0 143 21 1 57 7 45 0 2036
++ 84 teams sv sw ta te tg th tr uk vi wa zh_CN zh_HK zh_TW
++ 178 domains 119 1 3 2 0 10 66 50 155 17 97 7 41 2610
+
+ Some counters in the preceding matrix are higher than the number of
+ visible blocks let us expect. This is because a few extra PO files are
+@@ -1042,9 +1301,9 @@ distributed as such by its maintainer.
+ lag between the mere existence a PO file and its wide availability in a
+ distribution.
+
+- If November 2007 seems to be old, you may fetch a more recent copy
+-of this `ABOUT-NLS' file on most GNU archive sites. The most
+-up-to-date matrix with full percentage details can be found at
++ If May 2010 seems to be old, you may fetch a more recent copy of
++this `ABOUT-NLS' file on most GNU archive sites. The most up-to-date
++matrix with full percentage details can be found at
+ `http://translationproject.org/extra/matrix.html'.
+
+ 1.6 Using `gettext' in new packages
+diff -urp -x '*~' findutils-4.5.9.org/build-aux/config.rpath findutils-4.5.9/build-aux/config.rpath
+--- findutils-4.5.9.org/build-aux/config.rpath 2010-04-17 12:33:46.000000000 -0700
++++ findutils-4.5.9/build-aux/config.rpath 2010-05-23 09:08:51.835153877 -0700
+@@ -2,7 +2,7 @@
+ # Output a system dependent set of variables, describing how to set the
+ # run time search path of shared libraries in an executable.
+ #
+-# Copyright 1996-2007 Free Software Foundation, Inc.
++# Copyright 1996-2010 Free Software Foundation, Inc.
+ # Taken from GNU libtool, 2001
+ # Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
+ #
+@@ -47,7 +47,7 @@ for cc_temp in $CC""; do
+ done
+ cc_basename=`echo "$cc_temp" | sed -e 's%^.*/%%'`
+
+-# Code taken from libtool.m4's AC_LIBTOOL_PROG_COMPILER_PIC.
++# Code taken from libtool.m4's _LT_COMPILER_PIC.
+
+ wl=
+ if test "$GCC" = yes; then
+@@ -64,7 +64,7 @@ else
+ ;;
+ esac
+ ;;
+- mingw* | cygwin* | pw32* | os2*)
++ mingw* | cygwin* | pw32* | os2* | cegcc*)
+ ;;
+ hpux9* | hpux10* | hpux11*)
+ wl='-Wl,'
+@@ -76,7 +76,13 @@ else
+ ;;
+ linux* | k*bsd*-gnu)
+ case $cc_basename in
+- icc* | ecc*)
++ ecc*)
++ wl='-Wl,'
++ ;;
++ icc* | ifort*)
++ wl='-Wl,'
++ ;;
++ lf95*)
+ wl='-Wl,'
+ ;;
+ pgcc | pgf77 | pgf90)
+@@ -124,7 +130,7 @@ else
+ esac
+ fi
+
+-# Code taken from libtool.m4's AC_LIBTOOL_PROG_LD_SHLIBS.
++# Code taken from libtool.m4's _LT_LINKER_SHLIBS.
+
+ hardcode_libdir_flag_spec=
+ hardcode_libdir_separator=
+@@ -132,7 +138,7 @@ hardcode_direct=no
+ hardcode_minus_L=no
+
+ case "$host_os" in
+- cygwin* | mingw* | pw32*)
++ cygwin* | mingw* | pw32* | cegcc*)
+ # FIXME: the MSVC++ port hasn't been tested in a loooong time
+ # When not using gcc, we currently assume that we are using
+ # Microsoft Visual C++.
+@@ -158,7 +164,7 @@ if test "$with_gnu_ld" = yes; then
+ # option of GNU ld is called -rpath, not --rpath.
+ hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+ case "$host_os" in
+- aix3* | aix4* | aix5*)
++ aix[3-9]*)
+ # On AIX/PPC, the GNU linker is very broken
+ if test "$host_cpu" != ia64; then
+ ld_shlibs=no
+@@ -182,7 +188,7 @@ if test "$with_gnu_ld" = yes; then
+ ld_shlibs=no
+ fi
+ ;;
+- cygwin* | mingw* | pw32*)
++ cygwin* | mingw* | pw32* | cegcc*)
+ # hardcode_libdir_flag_spec is actually meaningless, as there is
+ # no search path for DLLs.
+ hardcode_libdir_flag_spec='-L$libdir'
+@@ -254,7 +260,7 @@ else
+ hardcode_direct=unsupported
+ fi
+ ;;
+- aix4* | aix5*)
++ aix[4-9]*)
+ if test "$host_cpu" = ia64; then
+ # On IA64, the linker does run time linking by default, so we don't
+ # have to do anything special.
+@@ -264,7 +270,7 @@ else
+ # Test if we are trying to use run time linking or normal
+ # AIX style linking. If -brtl is somewhere in LDFLAGS, we
+ # need to do runtime linking.
+- case $host_os in aix4.[23]|aix4.[23].*|aix5*)
++ case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
+ for ld_flag in $LDFLAGS; do
+ if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
+ aix_use_runtimelinking=yes
+@@ -326,7 +332,7 @@ else
+ ;;
+ bsdi[45]*)
+ ;;
+- cygwin* | mingw* | pw32*)
++ cygwin* | mingw* | pw32* | cegcc*)
+ # When not using gcc, we currently assume that we are using
+ # Microsoft Visual C++.
+ # hardcode_libdir_flag_spec is actually meaningless, as there is
+@@ -494,7 +500,7 @@ else
+ fi
+
+ # Check dynamic linker characteristics
+-# Code taken from libtool.m4's AC_LIBTOOL_SYS_DYNAMIC_LINKER.
++# Code taken from libtool.m4's _LT_SYS_DYNAMIC_LINKER.
+ # Unlike libtool.m4, here we don't care about _all_ names of the library, but
+ # only about the one the linker finds when passed -lNAME. This is the last
+ # element of library_names_spec in libtool.m4, or possibly two of them if the
+@@ -505,7 +511,7 @@ case "$host_os" in
+ aix3*)
+ library_names_spec='$libname.a'
+ ;;
+- aix4* | aix5*)
++ aix[4-9]*)
+ library_names_spec='$libname$shrext'
+ ;;
+ amigaos*)
+@@ -517,7 +523,7 @@ case "$host_os" in
+ bsdi[45]*)
+ library_names_spec='$libname$shrext'
+ ;;
+- cygwin* | mingw* | pw32*)
++ cygwin* | mingw* | pw32* | cegcc*)
+ shrext=.dll
+ library_names_spec='$libname.dll.a $libname.lib'
+ ;;
+diff -urp -x '*~' findutils-4.5.9.org/ChangeLog findutils-4.5.9/ChangeLog
+--- findutils-4.5.9.org/ChangeLog 2010-04-29 14:45:22.000000000 -0700
++++ findutils-4.5.9/ChangeLog 2010-05-23 09:08:52.645152214 -0700
+@@ -1,3 +1,15 @@
++2010-05-23 gettextize <bug-gnu-gettext@gnu.org>
++
++ * gnulib/m4/gettext.m4: Upgrade to gettext-0.18.
++ * gnulib/m4/iconv.m4: Upgrade to gettext-0.18.
++ * gnulib/m4/lib-ld.m4: Upgrade to gettext-0.18.
++ * gnulib/m4/lib-link.m4: Upgrade to gettext-0.18.
++ * gnulib/m4/lib-prefix.m4: Upgrade to gettext-0.18.
++ * gnulib/m4/nls.m4: Upgrade to gettext-0.18.
++ * gnulib/m4/po.m4: Upgrade to gettext-0.18.
++ * gnulib/m4/progtest.m4: Upgrade to gettext-0.18.
++ * configure.ac (AM_GNU_GETTEXT_VERSION): Bump to 0.18.
++
+ 2010-04-29 James Youngman <jay@gnu.org>
+
+ Prepare for the release of findutils version 4.5.9.
+diff -urp -x '*~' findutils-4.5.9.org/configure.ac findutils-4.5.9/configure.ac
+--- findutils-4.5.9.org/configure.ac 2010-04-29 14:19:30.000000000 -0700
++++ findutils-4.5.9/configure.ac 2010-05-23 09:08:52.635147870 -0700
+@@ -200,7 +200,7 @@ jy_AC_ATTRIBUTE_NORETURN
+
+ dnl internationalization macros
+ AM_GNU_GETTEXT([external])
+-AM_GNU_GETTEXT_VERSION([0.17])
++AM_GNU_GETTEXT_VERSION([0.18])
+
+ dnl regextype.c and regexprops.c are designed to be usable outside findutils,
+ dnl but findutils doesn't want to support all the regex types in gnulib,
+diff -urp -x '*~' findutils-4.5.9.org/gnulib/m4/gettext.m4 findutils-4.5.9/gnulib/m4/gettext.m4
+--- findutils-4.5.9.org/gnulib/m4/gettext.m4 2010-04-17 12:33:46.000000000 -0700
++++ findutils-4.5.9/gnulib/m4/gettext.m4 2010-05-23 09:08:52.475161618 -0700
+@@ -1,5 +1,5 @@
+-# gettext.m4 serial 60 (gettext-0.17)
+-dnl Copyright (C) 1995-2007 Free Software Foundation, Inc.
++# gettext.m4 serial 63 (gettext-0.18)
++dnl Copyright (C) 1995-2010 Free Software Foundation, Inc.
+ dnl This file is free software; the Free Software Foundation
+ dnl gives unlimited permission to copy and/or distribute it,
+ dnl with or without modifications, as long as this notice is preserved.
+@@ -15,7 +15,7 @@ dnl They are *not* in the public domain.
+
+ dnl Authors:
+ dnl Ulrich Drepper <drepper@cygnus.com>, 1995-2000.
+-dnl Bruno Haible <haible@clisp.cons.org>, 2000-2006.
++dnl Bruno Haible <haible@clisp.cons.org>, 2000-2006, 2008-2010.
+
+ dnl Macro to add for using GNU gettext.
+
+@@ -60,6 +60,8 @@ AC_DEFUN([AM_GNU_GETTEXT],
+ ifelse([$1], [], , [ifelse([$1], [external], , [ifelse([$1], [no-libtool], , [ifelse([$1], [use-libtool], ,
+ [errprint([ERROR: invalid first argument to AM_GNU_GETTEXT
+ ])])])])])
++ ifelse(ifelse([$1], [], [old])[]ifelse([$1], [no-libtool], [old]), [old],
++ [AC_DIAGNOSE([obsolete], [Use of AM_GNU_GETTEXT without [external] argument is deprecated.])])
+ ifelse([$2], [], , [ifelse([$2], [need-ngettext], , [ifelse([$2], [need-formatstring-macros], ,
+ [errprint([ERROR: invalid second argument to AM_GNU_GETTEXT
+ ])])])])
+@@ -123,11 +125,11 @@ AC_DEFUN([AM_GNU_GETTEXT],
+ gt_use_preinstalled_gnugettext=no
+ ifelse(gt_included_intl, yes, [
+ AC_MSG_CHECKING([whether included gettext is requested])
+- AC_ARG_WITH(included-gettext,
++ AC_ARG_WITH([included-gettext],
+ [ --with-included-gettext use the GNU gettext library included here],
+ nls_cv_force_use_gnu_gettext=$withval,
+ nls_cv_force_use_gnu_gettext=no)
+- AC_MSG_RESULT($nls_cv_force_use_gnu_gettext)
++ AC_MSG_RESULT([$nls_cv_force_use_gnu_gettext])
+
+ nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext"
+ if test "$nls_cv_force_use_gnu_gettext" != "yes"; then
+@@ -267,7 +269,7 @@ return * gettext ("")$gt_expression_test
+
+ if test "$gt_use_preinstalled_gnugettext" = "yes" \
+ || test "$nls_cv_use_gnu_gettext" = "yes"; then
+- AC_DEFINE(ENABLE_NLS, 1,
++ AC_DEFINE([ENABLE_NLS], [1],
+ [Define to 1 if translation of program messages to the user's native language
+ is requested.])
+ else
+@@ -301,9 +303,9 @@ return * gettext ("")$gt_expression_test
+ fi
+
+ dnl For backward compatibility. Some packages may be using this.
+- AC_DEFINE(HAVE_GETTEXT, 1,
++ AC_DEFINE([HAVE_GETTEXT], [1],
+ [Define if the GNU gettext() function is already present or preinstalled.])
+- AC_DEFINE(HAVE_DCGETTEXT, 1,
++ AC_DEFINE([HAVE_DCGETTEXT], [1],
+ [Define if the GNU dcgettext() function is already present or preinstalled.])
+ fi
+
+@@ -319,9 +321,9 @@ return * gettext ("")$gt_expression_test
+ fi
+
+ dnl Make all variables we use known to autoconf.
+- AC_SUBST(BUILD_INCLUDED_LIBINTL)
+- AC_SUBST(USE_INCLUDED_LIBINTL)
+- AC_SUBST(CATOBJEXT)
++ AC_SUBST([BUILD_INCLUDED_LIBINTL])
++ AC_SUBST([USE_INCLUDED_LIBINTL])
++ AC_SUBST([CATOBJEXT])
+
+ dnl For backward compatibility. Some configure.ins may be using this.
+ nls_cv_header_intl=
+@@ -329,36 +331,36 @@ return * gettext ("")$gt_expression_test
+
+ dnl For backward compatibility. Some Makefiles may be using this.
+ DATADIRNAME=share
+- AC_SUBST(DATADIRNAME)
++ AC_SUBST([DATADIRNAME])
+
+ dnl For backward compatibility. Some Makefiles may be using this.
+ INSTOBJEXT=.mo
+- AC_SUBST(INSTOBJEXT)
++ AC_SUBST([INSTOBJEXT])
+
+ dnl For backward compatibility. Some Makefiles may be using this.
+ GENCAT=gencat
+- AC_SUBST(GENCAT)
++ AC_SUBST([GENCAT])
+
+ dnl For backward compatibility. Some Makefiles may be using this.
+ INTLOBJS=
+ if test "$USE_INCLUDED_LIBINTL" = yes; then
+ INTLOBJS="\$(GETTOBJS)"
+ fi
+- AC_SUBST(INTLOBJS)
++ AC_SUBST([INTLOBJS])
+
+ dnl Enable libtool support if the surrounding package wishes it.
+ INTL_LIBTOOL_SUFFIX_PREFIX=gt_libtool_suffix_prefix
+- AC_SUBST(INTL_LIBTOOL_SUFFIX_PREFIX)
++ AC_SUBST([INTL_LIBTOOL_SUFFIX_PREFIX])
+ ])
+
+ dnl For backward compatibility. Some Makefiles may be using this.
+ INTLLIBS="$LIBINTL"
+- AC_SUBST(INTLLIBS)
++ AC_SUBST([INTLLIBS])
+
+ dnl Make all documented variables known to autoconf.
+- AC_SUBST(LIBINTL)
+- AC_SUBST(LTLIBINTL)
+- AC_SUBST(POSUB)
++ AC_SUBST([LIBINTL])
++ AC_SUBST([LTLIBINTL])
++ AC_SUBST([POSUB])
+ ])
+
+
+diff -urp -x '*~' findutils-4.5.9.org/gnulib/m4/iconv.m4 findutils-4.5.9/gnulib/m4/iconv.m4
+--- findutils-4.5.9.org/gnulib/m4/iconv.m4 2010-04-17 12:33:46.000000000 -0700
++++ findutils-4.5.9/gnulib/m4/iconv.m4 2010-05-23 09:08:52.485168547 -0700
+@@ -1,5 +1,5 @@
+-# iconv.m4 serial AM6 (gettext-0.17)
+-dnl Copyright (C) 2000-2002, 2007 Free Software Foundation, Inc.
++# iconv.m4 serial 9 (gettext-0.18)
++dnl Copyright (C) 2000-2002, 2007-2010 Free Software Foundation, Inc.
+ dnl This file is free software; the Free Software Foundation
+ dnl gives unlimited permission to copy and/or distribute it,
+ dnl with or without modifications, as long as this notice is preserved.
+@@ -34,7 +34,7 @@ AC_DEFUN([AM_ICONV_LINK],
+ am_save_CPPFLAGS="$CPPFLAGS"
+ AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCICONV])
+
+- AC_CACHE_CHECK([for iconv], am_cv_func_iconv, [
++ AC_CACHE_CHECK([for iconv], [am_cv_func_iconv], [
+ am_cv_func_iconv="no, consider installing GNU libiconv"
+ am_cv_lib_iconv=no
+ AC_TRY_LINK([#include <stdlib.h>
+@@ -42,7 +42,7 @@ AC_DEFUN([AM_ICONV_LINK],
+ [iconv_t cd = iconv_open("","");
+ iconv(cd,NULL,NULL,NULL,NULL);
+ iconv_close(cd);],
+- am_cv_func_iconv=yes)
++ [am_cv_func_iconv=yes])
+ if test "$am_cv_func_iconv" != yes; then
+ am_save_LIBS="$LIBS"
+ LIBS="$LIBS $LIBICONV"
+@@ -51,14 +51,14 @@ AC_DEFUN([AM_ICONV_LINK],
+ [iconv_t cd = iconv_open("","");
+ iconv(cd,NULL,NULL,NULL,NULL);
+ iconv_close(cd);],
+- am_cv_lib_iconv=yes
+- am_cv_func_iconv=yes)
++ [am_cv_lib_iconv=yes]
++ [am_cv_func_iconv=yes])
+ LIBS="$am_save_LIBS"
+ fi
+ ])
+ if test "$am_cv_func_iconv" = yes; then
+- AC_CACHE_CHECK([for working iconv], am_cv_func_iconv_works, [
+- dnl This tests against bugs in AIX 5.1 and HP-UX 11.11.
++ AC_CACHE_CHECK([for working iconv], [am_cv_func_iconv_works], [
++ dnl This tests against bugs in AIX 5.1, HP-UX 11.11, Solaris 10.
+ am_save_LIBS="$LIBS"
+ if test $am_cv_lib_iconv = yes; then
+ LIBS="$LIBS $LIBICONV"
+@@ -87,6 +87,25 @@ int main ()
+ return 1;
+ }
+ }
++ /* Test against Solaris 10 bug: Failures are not distinguishable from
++ successful returns. */
++ {
++ iconv_t cd_ascii_to_88591 = iconv_open ("ISO8859-1", "646");
++ if (cd_ascii_to_88591 != (iconv_t)(-1))
++ {
++ static const char input[] = "\263";
++ char buf[10];
++ const char *inptr = input;
++ size_t inbytesleft = strlen (input);
++ char *outptr = buf;
++ size_t outbytesleft = sizeof (buf);
++ size_t res = iconv (cd_ascii_to_88591,
++ (char **) &inptr, &inbytesleft,
++ &outptr, &outbytesleft);
++ if (res == 0)
++ return 1;
++ }
++ }
+ #if 0 /* This bug could be worked around by the caller. */
+ /* Test against HP-UX 11.11 bug: Positive return value instead of 0. */
+ {
+@@ -134,7 +153,7 @@ int main ()
+ am_func_iconv=no am_cv_lib_iconv=no
+ fi
+ if test "$am_func_iconv" = yes; then
+- AC_DEFINE(HAVE_ICONV, 1,
++ AC_DEFINE([HAVE_ICONV], [1],
+ [Define if you have the iconv() function and it works.])
+ fi
+ if test "$am_cv_lib_iconv" = yes; then
+@@ -147,8 +166,8 @@ int main ()
+ LIBICONV=
+ LTLIBICONV=
+ fi
+- AC_SUBST(LIBICONV)
+- AC_SUBST(LTLIBICONV)
++ AC_SUBST([LIBICONV])
++ AC_SUBST([LTLIBICONV])
+ ])
+
+ AC_DEFUN([AM_ICONV],
+@@ -156,7 +175,7 @@ AC_DEFUN([AM_ICONV],
+ AM_ICONV_LINK
+ if test "$am_cv_func_iconv" = yes; then
+ AC_MSG_CHECKING([for iconv declaration])
+- AC_CACHE_VAL(am_cv_proto_iconv, [
++ AC_CACHE_VAL([am_cv_proto_iconv], [
+ AC_TRY_COMPILE([
+ #include <stdlib.h>
+ #include <iconv.h>
+@@ -169,12 +188,12 @@ size_t iconv (iconv_t cd, char * *inbuf,
+ #else
+ size_t iconv();
+ #endif
+-], [], am_cv_proto_iconv_arg1="", am_cv_proto_iconv_arg1="const")
++], [], [am_cv_proto_iconv_arg1=""], [am_cv_proto_iconv_arg1="const"])
+ am_cv_proto_iconv="extern size_t iconv (iconv_t cd, $am_cv_proto_iconv_arg1 char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);"])
+ am_cv_proto_iconv=`echo "[$]am_cv_proto_iconv" | tr -s ' ' | sed -e 's/( /(/'`
+- AC_MSG_RESULT([$]{ac_t:-
+- }[$]am_cv_proto_iconv)
+- AC_DEFINE_UNQUOTED(ICONV_CONST, $am_cv_proto_iconv_arg1,
++ AC_MSG_RESULT([
++ $am_cv_proto_iconv])
++ AC_DEFINE_UNQUOTED([ICONV_CONST], [$am_cv_proto_iconv_arg1],
+ [Define as const if the declaration of iconv() needs const.])
+ fi
+ ])
+diff -urp -x '*~' findutils-4.5.9.org/gnulib/m4/lib-ld.m4 findutils-4.5.9/gnulib/m4/lib-ld.m4
+--- findutils-4.5.9.org/gnulib/m4/lib-ld.m4 2010-04-17 12:33:47.000000000 -0700
++++ findutils-4.5.9/gnulib/m4/lib-ld.m4 2010-05-23 09:08:52.505155095 -0700
+@@ -1,5 +1,5 @@
+-# lib-ld.m4 serial 3 (gettext-0.13)
+-dnl Copyright (C) 1996-2003 Free Software Foundation, Inc.
++# lib-ld.m4 serial 4 (gettext-0.18)
++dnl Copyright (C) 1996-2003, 2009-2010 Free Software Foundation, Inc.
+ dnl This file is free software; the Free Software Foundation
+ dnl gives unlimited permission to copy and/or distribute it,
+ dnl with or without modifications, as long as this notice is preserved.
+@@ -10,7 +10,7 @@ dnl with libtool.m4.
+
+ dnl From libtool-1.4. Sets the variable with_gnu_ld to yes or no.
+ AC_DEFUN([AC_LIB_PROG_LD_GNU],
+-[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], acl_cv_prog_gnu_ld,
++[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], [acl_cv_prog_gnu_ld],
+ [# I'd rather use --version here, but apparently some GNU ld's only accept -v.
+ case `$LD -v 2>&1 </dev/null` in
+ *GNU* | *'with BFD'*)
+@@ -23,7 +23,7 @@ with_gnu_ld=$acl_cv_prog_gnu_ld
+
+ dnl From libtool-1.4. Sets the variable LD.
+ AC_DEFUN([AC_LIB_PROG_LD],
+-[AC_ARG_WITH(gnu-ld,
++[AC_ARG_WITH([gnu-ld],
+ [ --with-gnu-ld assume the C compiler uses GNU ld [default=no]],
+ test "$withval" = no || with_gnu_ld=yes, with_gnu_ld=no)
+ AC_REQUIRE([AC_PROG_CC])dnl
+@@ -59,7 +59,7 @@ if test "$GCC" = yes; then
+ # Canonicalize the path of ld
+ ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'`
+ while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
+- ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`
++ ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`
+ done
+ test -z "$LD" && LD="$ac_prog"
+ ;;
+@@ -77,7 +77,7 @@ elif test "$with_gnu_ld" = yes; then
+ else
+ AC_MSG_CHECKING([for non-GNU ld])
+ fi
+-AC_CACHE_VAL(acl_cv_path_LD,
++AC_CACHE_VAL([acl_cv_path_LD],
+ [if test -z "$LD"; then
+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
+ for ac_dir in $PATH; do
+@@ -89,9 +89,9 @@ AC_CACHE_VAL(acl_cv_path_LD,
+ # Break only if it was the GNU/non-GNU ld that we prefer.
+ case `"$acl_cv_path_LD" -v 2>&1 < /dev/null` in
+ *GNU* | *'with BFD'*)
+- test "$with_gnu_ld" != no && break ;;
++ test "$with_gnu_ld" != no && break ;;
+ *)
+- test "$with_gnu_ld" != yes && break ;;
++ test "$with_gnu_ld" != yes && break ;;
+ esac
+ fi
+ done
+@@ -101,9 +101,9 @@ else
+ fi])
+ LD="$acl_cv_path_LD"
+ if test -n "$LD"; then
+- AC_MSG_RESULT($LD)
++ AC_MSG_RESULT([$LD])
+ else
+- AC_MSG_RESULT(no)
++ AC_MSG_RESULT([no])
+ fi
+ test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
+ AC_LIB_PROG_LD_GNU
+diff -urp -x '*~' findutils-4.5.9.org/gnulib/m4/lib-link.m4 findutils-4.5.9/gnulib/m4/lib-link.m4
+--- findutils-4.5.9.org/gnulib/m4/lib-link.m4 2010-04-17 12:33:47.000000000 -0700
++++ findutils-4.5.9/gnulib/m4/lib-link.m4 2010-05-23 09:08:52.525149605 -0700
+@@ -1,12 +1,12 @@
+-# lib-link.m4 serial 13 (gettext-0.17)
+-dnl Copyright (C) 2001-2007 Free Software Foundation, Inc.
++# lib-link.m4 serial 21 (gettext-0.18)
++dnl Copyright (C) 2001-2010 Free Software Foundation, Inc.
+ dnl This file is free software; the Free Software Foundation
+ dnl gives unlimited permission to copy and/or distribute it,
+ dnl with or without modifications, as long as this notice is preserved.
+
+ dnl From Bruno Haible.
+
+-AC_PREREQ(2.54)
++AC_PREREQ([2.54])
+
+ dnl AC_LIB_LINKFLAGS(name [, dependencies]) searches for libname and
+ dnl the libraries corresponding to explicit and implicit dependencies.
+@@ -18,9 +18,9 @@ AC_DEFUN([AC_LIB_LINKFLAGS],
+ [
+ AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
+ AC_REQUIRE([AC_LIB_RPATH])
+- define([Name],[translit([$1],[./-], [___])])
+- define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
+- [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
++ pushdef([Name],[translit([$1],[./-], [___])])
++ pushdef([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
++ [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
+ AC_CACHE_CHECK([how to link with lib[]$1], [ac_cv_lib[]Name[]_libs], [
+ AC_LIB_LINKFLAGS_BODY([$1], [$2])
+ ac_cv_lib[]Name[]_libs="$LIB[]NAME"
+@@ -39,16 +39,17 @@ AC_DEFUN([AC_LIB_LINKFLAGS],
+ dnl Also set HAVE_LIB[]NAME so that AC_LIB_HAVE_LINKFLAGS can reuse the
+ dnl results of this search when this library appears as a dependency.
+ HAVE_LIB[]NAME=yes
+- undefine([Name])
+- undefine([NAME])
++ popdef([NAME])
++ popdef([Name])
+ ])
+
+-dnl AC_LIB_HAVE_LINKFLAGS(name, dependencies, includes, testcode)
++dnl AC_LIB_HAVE_LINKFLAGS(name, dependencies, includes, testcode, [missing-message])
+ dnl searches for libname and the libraries corresponding to explicit and
+ dnl implicit dependencies, together with the specified include files and
+-dnl the ability to compile and link the specified testcode. If found, it
+-dnl sets and AC_SUBSTs HAVE_LIB${NAME}=yes and the LIB${NAME} and
+-dnl LTLIB${NAME} variables and augments the CPPFLAGS variable, and
++dnl the ability to compile and link the specified testcode. The missing-message
++dnl defaults to 'no' and may contain additional hints for the user.
++dnl If found, it sets and AC_SUBSTs HAVE_LIB${NAME}=yes and the LIB${NAME}
++dnl and LTLIB${NAME} variables and augments the CPPFLAGS variable, and
+ dnl #defines HAVE_LIB${NAME} to 1. Otherwise, it sets and AC_SUBSTs
+ dnl HAVE_LIB${NAME}=no and LIB${NAME} and LTLIB${NAME} to empty.
+ dnl Sets and AC_SUBSTs the LIB${NAME}_PREFIX variable to nonempty if libname
+@@ -57,9 +58,9 @@ AC_DEFUN([AC_LIB_HAVE_LINKFLAGS],
+ [
+ AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
+ AC_REQUIRE([AC_LIB_RPATH])
+- define([Name],[translit([$1],[./-], [___])])
+- define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
+- [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
++ pushdef([Name],[translit([$1],[./-], [___])])
++ pushdef([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
++ [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
+
+ dnl Search for lib[]Name and define LIB[]NAME, LTLIB[]NAME and INC[]NAME
+ dnl accordingly.
+@@ -73,13 +74,25 @@ AC_DEFUN([AC_LIB_HAVE_LINKFLAGS],
+
+ AC_CACHE_CHECK([for lib[]$1], [ac_cv_lib[]Name], [
+ ac_save_LIBS="$LIBS"
+- LIBS="$LIBS $LIB[]NAME"
+- AC_TRY_LINK([$3], [$4], [ac_cv_lib[]Name=yes], [ac_cv_lib[]Name=no])
++ dnl If $LIB[]NAME contains some -l options, add it to the end of LIBS,
++ dnl because these -l options might require -L options that are present in
++ dnl LIBS. -l options benefit only from the -L options listed before it.
++ dnl Otherwise, add it to the front of LIBS, because it may be a static
++ dnl library that depends on another static library that is present in LIBS.
++ dnl Static libraries benefit only from the static libraries listed after
++ dnl it.
++ case " $LIB[]NAME" in
++ *" -l"*) LIBS="$LIBS $LIB[]NAME" ;;
++ *) LIBS="$LIB[]NAME $LIBS" ;;
++ esac
++ AC_TRY_LINK([$3], [$4],
++ [ac_cv_lib[]Name=yes],
++ [ac_cv_lib[]Name='m4_if([$5], [], [no], [[$5]])'])
+ LIBS="$ac_save_LIBS"
+ ])
+ if test "$ac_cv_lib[]Name" = yes; then
+ HAVE_LIB[]NAME=yes
+- AC_DEFINE([HAVE_LIB]NAME, 1, [Define if you have the $1 library.])
++ AC_DEFINE([HAVE_LIB]NAME, 1, [Define if you have the lib][$1 library.])
+ AC_MSG_CHECKING([how to link with lib[]$1])
+ AC_MSG_RESULT([$LIB[]NAME])
+ else
+@@ -95,8 +108,8 @@ AC_DEFUN([AC_LIB_HAVE_LINKFLAGS],
+ AC_SUBST([LIB]NAME)
+ AC_SUBST([LTLIB]NAME)
+ AC_SUBST([LIB]NAME[_PREFIX])
+- undefine([Name])
+- undefine([NAME])
++ popdef([NAME])
++ popdef([Name])
+ ])
+
+ dnl Determine the platform dependent parameters needed to use rpath:
+@@ -114,7 +127,7 @@ AC_DEFUN([AC_LIB_RPATH],
+ AC_REQUIRE([AC_LIB_PROG_LD]) dnl we use $LD, $with_gnu_ld
+ AC_REQUIRE([AC_CANONICAL_HOST]) dnl we use $host
+ AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT]) dnl we use $ac_aux_dir
+- AC_CACHE_CHECK([for shared library run path origin], acl_cv_rpath, [
++ AC_CACHE_CHECK([for shared library run path origin], [acl_cv_rpath], [
+ CC="$CC" GCC="$GCC" LDFLAGS="$LDFLAGS" LD="$LD" with_gnu_ld="$with_gnu_ld" \
+ ${CONFIG_SHELL-/bin/sh} "$ac_aux_dir/config.rpath" "$host" > conftest.sh
+ . ./conftest.sh
+@@ -131,11 +144,32 @@ AC_DEFUN([AC_LIB_RPATH],
+ acl_hardcode_direct="$acl_cv_hardcode_direct"
+ acl_hardcode_minus_L="$acl_cv_hardcode_minus_L"
+ dnl Determine whether the user wants rpath handling at all.
+- AC_ARG_ENABLE(rpath,
++ AC_ARG_ENABLE([rpath],
+ [ --disable-rpath do not hardcode runtime library paths],
+ :, enable_rpath=yes)
+ ])
+
++dnl AC_LIB_FROMPACKAGE(name, package)
++dnl declares that libname comes from the given package. The configure file
++dnl will then not have a --with-libname-prefix option but a
++dnl --with-package-prefix option. Several libraries can come from the same
++dnl package. This declaration must occur before an AC_LIB_LINKFLAGS or similar
++dnl macro call that searches for libname.
++AC_DEFUN([AC_LIB_FROMPACKAGE],
++[
++ pushdef([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
++ [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
++ define([acl_frompackage_]NAME, [$2])
++ popdef([NAME])
++ pushdef([PACK],[$2])
++ pushdef([PACKUP],[translit(PACK,[abcdefghijklmnopqrstuvwxyz./-],
++ [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
++ define([acl_libsinpackage_]PACKUP,
++ m4_ifdef([acl_libsinpackage_]PACKUP, [acl_libsinpackage_]PACKUP[[, ]],)[lib$1])
++ popdef([PACKUP])
++ popdef([PACK])
++])
++
+ dnl AC_LIB_LINKFLAGS_BODY(name [, dependencies]) searches for libname and
+ dnl the libraries corresponding to explicit and implicit dependencies.
+ dnl Sets the LIB${NAME}, LTLIB${NAME} and INC${NAME} variables.
+@@ -144,19 +178,23 @@ dnl in ${LIB${NAME}_PREFIX}/$acl_libdirs
+ AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
+ [
+ AC_REQUIRE([AC_LIB_PREPARE_MULTILIB])
+- define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
+- [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
++ pushdef([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
++ [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
++ pushdef([PACK],[m4_ifdef([acl_frompackage_]NAME, [acl_frompackage_]NAME, lib[$1])])
++ pushdef([PACKUP],[translit(PACK,[abcdefghijklmnopqrstuvwxyz./-],
++ [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
++ pushdef([PACKLIBS],[m4_ifdef([acl_frompackage_]NAME, [acl_libsinpackage_]PACKUP, lib[$1])])
+ dnl Autoconf >= 2.61 supports dots in --with options.
+- define([N_A_M_E],[m4_if(m4_version_compare(m4_defn([m4_PACKAGE_VERSION]),[2.61]),[-1],[translit([$1],[.],[_])],[$1])])
++ pushdef([P_A_C_K],[m4_if(m4_version_compare(m4_defn([m4_PACKAGE_VERSION]),[2.61]),[-1],[translit(PACK,[.],[_])],PACK)])
+ dnl By default, look in $includedir and $libdir.
+ use_additional=yes
+ AC_LIB_WITH_FINAL_PREFIX([
+ eval additional_includedir=\"$includedir\"
+ eval additional_libdir=\"$libdir\"
+ ])
+- AC_LIB_ARG_WITH([lib]N_A_M_E[-prefix],
+-[ --with-lib]N_A_M_E[-prefix[=DIR] search for lib$1 in DIR/include and DIR/lib
+- --without-lib]N_A_M_E[-prefix don't search for lib$1 in includedir and libdir],
++ AC_ARG_WITH(P_A_C_K[-prefix],
++[[ --with-]]P_A_C_K[[-prefix[=DIR] search for ]PACKLIBS[ in DIR/include and DIR/lib
++ --without-]]P_A_C_K[[-prefix don't search for ]PACKLIBS[ in includedir and libdir]],
+ [
+ if test "X$withval" = "Xno"; then
+ use_additional=no
+@@ -169,6 +207,10 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
+ else
+ additional_includedir="$withval/include"
+ additional_libdir="$withval/$acl_libdirstem"
++ if test "$acl_libdirstem2" != "$acl_libdirstem" \
++ && ! test -d "$withval/$acl_libdirstem"; then
++ additional_libdir="$withval/$acl_libdirstem2"
++ fi
+ fi
+ fi
+ ])
+@@ -178,6 +220,9 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
+ LTLIB[]NAME=
+ INC[]NAME=
+ LIB[]NAME[]_PREFIX=
++ dnl HAVE_LIB${NAME} is an indicator that LIB${NAME}, LTLIB${NAME} have been
++ dnl computed. So it has to be reset here.
++ HAVE_LIB[]NAME=
+ rpathdirs=
+ ltrpathdirs=
+ names_already_handled=
+@@ -267,6 +312,9 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
+ fi
+ fi
+ fi
++ dnl Just let the compiler find the library, the compiler and user are smarter then this script
++ dnl when cross compiling and working with a relocated install.
++ found_dir=""
+ if test "X$found_dir" = "X"; then
+ for x in $LDFLAGS $LTLIB[]NAME; do
+ AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
+@@ -327,7 +375,9 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
+ dnl Linking with a shared library. We attempt to hardcode its
+ dnl directory into the executable's runpath, unless it's the
+ dnl standard /usr/lib.
+- if test "$enable_rpath" = no || test "X$found_dir" = "X/usr/$acl_libdirstem"; then
++ if test "$enable_rpath" = no \
++ || test "X$found_dir" = "X/usr/$acl_libdirstem" \
++ || test "X$found_dir" = "X/usr/$acl_libdirstem2"; then
+ dnl No hardcoding is needed.
+ LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
+ else
+@@ -415,7 +465,16 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
+ case "$found_dir" in
+ */$acl_libdirstem | */$acl_libdirstem/)
+ basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem/"'*$,,'`
+- LIB[]NAME[]_PREFIX="$basedir"
++ if test "$name" = '$1'; then
++ LIB[]NAME[]_PREFIX="$basedir"
++ fi
++ additional_includedir="$basedir/include"
++ ;;
++ */$acl_libdirstem2 | */$acl_libdirstem2/)
++ basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem2/"'*$,,'`
++ if test "$name" = '$1'; then
++ LIB[]NAME[]_PREFIX="$basedir"
++ fi
+ additional_includedir="$basedir/include"
+ ;;
+ esac
+@@ -476,9 +535,11 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
+ dnl 3. if it's already present in $LDFLAGS or the already
+ dnl constructed $LIBNAME,
+ dnl 4. if it doesn't exist as a directory.
+- if test "X$additional_libdir" != "X/usr/$acl_libdirstem"; then
++ if test "X$additional_libdir" != "X/usr/$acl_libdirstem" \
++ && test "X$additional_libdir" != "X/usr/$acl_libdirstem2"; then
+ haveit=
+- if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem"; then
++ if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem" \
++ || test "X$additional_libdir" = "X/usr/local/$acl_libdirstem2"; then
+ if test -n "$GCC"; then
+ case $host_os in
+ linux* | gnu* | k*bsd*-gnu) haveit=yes;;
+@@ -609,6 +670,11 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
+ LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-R$found_dir"
+ done
+ fi
++ popdef([P_A_C_K])
++ popdef([PACKLIBS])
++ popdef([PACKUP])
++ popdef([PACK])
++ popdef([NAME])
+ ])
+
+ dnl AC_LIB_APPENDTOVAR(VAR, CONTENTS) appends the elements of CONTENTS to VAR,
+@@ -654,7 +720,8 @@ AC_DEFUN([AC_LIB_LINKFLAGS_FROM_LIBS],
+ if test -n "$next"; then
+ dir="$next"
+ dnl No need to hardcode the standard /usr/lib.
+- if test "X$dir" != "X/usr/$acl_libdirstem"; then
++ if test "X$dir" != "X/usr/$acl_libdirstem" \
++ && test "X$dir" != "X/usr/$acl_libdirstem2"; then
+ rpathdirs="$rpathdirs $dir"
+ fi
+ next=
+@@ -663,7 +730,8 @@ AC_DEFUN([AC_LIB_LINKFLAGS_FROM_LIBS],
+ -L) next=yes ;;
+ -L*) dir=`echo "X$opt" | sed -e 's,^X-L,,'`
+ dnl No need to hardcode the standard /usr/lib.
+- if test "X$dir" != "X/usr/$acl_libdirstem"; then
++ if test "X$dir" != "X/usr/$acl_libdirstem" \
++ && test "X$dir" != "X/usr/$acl_libdirstem2"; then
+ rpathdirs="$rpathdirs $dir"
+ fi
+ next= ;;
+diff -urp -x '*~' findutils-4.5.9.org/gnulib/m4/lib-prefix.m4 findutils-4.5.9/gnulib/m4/lib-prefix.m4
+--- findutils-4.5.9.org/gnulib/m4/lib-prefix.m4 2010-04-17 12:33:47.000000000 -0700
++++ findutils-4.5.9/gnulib/m4/lib-prefix.m4 2010-05-23 09:08:52.535152831 -0700
+@@ -1,5 +1,5 @@
+-# lib-prefix.m4 serial 5 (gettext-0.15)
+-dnl Copyright (C) 2001-2005 Free Software Foundation, Inc.
++# lib-prefix.m4 serial 7 (gettext-0.18)
++dnl Copyright (C) 2001-2005, 2008-2010 Free Software Foundation, Inc.
+ dnl This file is free software; the Free Software Foundation
+ dnl gives unlimited permission to copy and/or distribute it,
+ dnl with or without modifications, as long as this notice is preserved.
+@@ -153,33 +153,72 @@ AC_DEFUN([AC_LIB_WITH_FINAL_PREFIX],
+ prefix="$acl_save_prefix"
+ ])
+
+-dnl AC_LIB_PREPARE_MULTILIB creates a variable acl_libdirstem, containing
+-dnl the basename of the libdir, either "lib" or "lib64".
++dnl AC_LIB_PREPARE_MULTILIB creates
++dnl - a variable acl_libdirstem, containing the basename of the libdir, either
++dnl "lib" or "lib64" or "lib/64",
++dnl - a variable acl_libdirstem2, as a secondary possible value for
++dnl acl_libdirstem, either the same as acl_libdirstem or "lib/sparcv9" or
++dnl "lib/amd64".
+ AC_DEFUN([AC_LIB_PREPARE_MULTILIB],
+ [
+- dnl There is no formal standard regarding lib and lib64. The current
+- dnl practice is that on a system supporting 32-bit and 64-bit instruction
+- dnl sets or ABIs, 64-bit libraries go under $prefix/lib64 and 32-bit
+- dnl libraries go under $prefix/lib. We determine the compiler's default
+- dnl mode by looking at the compiler's library search path. If at least
+- dnl of its elements ends in /lib64 or points to a directory whose absolute
+- dnl pathname ends in /lib64, we assume a 64-bit ABI. Otherwise we use the
+- dnl default, namely "lib".
++ dnl There is no formal standard regarding lib and lib64.
++ dnl On glibc systems, the current practice is that on a system supporting
++ dnl 32-bit and 64-bit instruction sets or ABIs, 64-bit libraries go under
++ dnl $prefix/lib64 and 32-bit libraries go under $prefix/lib. We determine
++ dnl the compiler's default mode by looking at the compiler's library search
++ dnl path. If at least one of its elements ends in /lib64 or points to a
++ dnl directory whose absolute pathname ends in /lib64, we assume a 64-bit ABI.
++ dnl Otherwise we use the default, namely "lib".
++ dnl On Solaris systems, the current practice is that on a system supporting
++ dnl 32-bit and 64-bit instruction sets or ABIs, 64-bit libraries go under
++ dnl $prefix/lib/64 (which is a symlink to either $prefix/lib/sparcv9 or
++ dnl $prefix/lib/amd64) and 32-bit libraries go under $prefix/lib.
++ AC_REQUIRE([AC_CANONICAL_HOST])
+ acl_libdirstem=lib
+- searchpath=`(LC_ALL=C $CC -print-search-dirs) 2>/dev/null | sed -n -e 's,^libraries: ,,p' | sed -e 's,^=,,'`
+- if test -n "$searchpath"; then
+- acl_save_IFS="${IFS= }"; IFS=":"
+- for searchdir in $searchpath; do
+- if test -d "$searchdir"; then
+- case "$searchdir" in
+- */lib64/ | */lib64 ) acl_libdirstem=lib64 ;;
+- *) searchdir=`cd "$searchdir" && pwd`
+- case "$searchdir" in
+- */lib64 ) acl_libdirstem=lib64 ;;
+- esac ;;
++ acl_libdirstem2=
++ case "$host_os" in
++ solaris*)
++ dnl See Solaris 10 Software Developer Collection > Solaris 64-bit Developer's Guide > The Development Environment
++ dnl <http://docs.sun.com/app/docs/doc/816-5138/dev-env?l=en&a=view>.
++ dnl "Portable Makefiles should refer to any library directories using the 64 symbolic link."
++ dnl But we want to recognize the sparcv9 or amd64 subdirectory also if the
++ dnl symlink is missing, so we set acl_libdirstem2 too.
++ AC_CACHE_CHECK([for 64-bit host], [gl_cv_solaris_64bit],
++ [AC_EGREP_CPP([sixtyfour bits], [
++#ifdef _LP64
++sixtyfour bits
++#endif
++ ], [gl_cv_solaris_64bit=yes], [gl_cv_solaris_64bit=no])
++ ])
++ if test $gl_cv_solaris_64bit = yes; then
++ acl_libdirstem=lib/64
++ case "$host_cpu" in
++ sparc*) acl_libdirstem2=lib/sparcv9 ;;
++ i*86 | x86_64) acl_libdirstem2=lib/amd64 ;;
+ esac
+ fi
+- done
+- IFS="$acl_save_IFS"
+- fi
++ ;;
++ *)
++ searchpath=`(LC_ALL=C $CC -print-search-dirs) 2>/dev/null | sed -n -e 's,^libraries: ,,p' | sed -e 's,^=,,'`
++ if test -n "$searchpath"; then
++ acl_save_IFS="${IFS= }"; IFS=":"
++ for searchdir in $searchpath; do
++ if test -d "$searchdir"; then
++ case "$searchdir" in
++ */lib64/ | */lib64 ) acl_libdirstem=lib64 ;;
++ */../ | */.. )
++ # Better ignore directories of this form. They are misleading.
++ ;;
++ *) searchdir=`cd "$searchdir" && pwd`
++ case "$searchdir" in
++ */lib64 ) acl_libdirstem=lib64 ;;
++ esac ;;
++ esac
++ fi
++ done
++ IFS="$acl_save_IFS"
++ fi
++ ;;
++ esac
++ test -n "$acl_libdirstem2" || acl_libdirstem2="$acl_libdirstem"
+ ])
+diff -urp -x '*~' findutils-4.5.9.org/gnulib/m4/nls.m4 findutils-4.5.9/gnulib/m4/nls.m4
+--- findutils-4.5.9.org/gnulib/m4/nls.m4 2010-04-17 12:33:47.000000000 -0700
++++ findutils-4.5.9/gnulib/m4/nls.m4 2010-05-23 09:08:52.555148389 -0700
+@@ -1,5 +1,6 @@
+-# nls.m4 serial 3 (gettext-0.15)
+-dnl Copyright (C) 1995-2003, 2005-2006 Free Software Foundation, Inc.
++# nls.m4 serial 5 (gettext-0.18)
++dnl Copyright (C) 1995-2003, 2005-2006, 2008-2010 Free Software Foundation,
++dnl Inc.
+ dnl This file is free software; the Free Software Foundation
+ dnl gives unlimited permission to copy and/or distribute it,
+ dnl with or without modifications, as long as this notice is preserved.
+@@ -17,15 +18,15 @@ dnl Authors:
+ dnl Ulrich Drepper <drepper@cygnus.com>, 1995-2000.
+ dnl Bruno Haible <haible@clisp.cons.org>, 2000-2003.
+
+-AC_PREREQ(2.50)
++AC_PREREQ([2.50])
+
+ AC_DEFUN([AM_NLS],
+ [
+ AC_MSG_CHECKING([whether NLS is requested])
+ dnl Default is enabled NLS
+- AC_ARG_ENABLE(nls,
++ AC_ARG_ENABLE([nls],
+ [ --disable-nls do not use Native Language Support],
+ USE_NLS=$enableval, USE_NLS=yes)
+- AC_MSG_RESULT($USE_NLS)
+- AC_SUBST(USE_NLS)
++ AC_MSG_RESULT([$USE_NLS])
++ AC_SUBST([USE_NLS])
+ ])
+diff -urp -x '*~' findutils-4.5.9.org/gnulib/m4/po.m4 findutils-4.5.9/gnulib/m4/po.m4
+--- findutils-4.5.9.org/gnulib/m4/po.m4 2010-04-17 12:33:47.000000000 -0700
++++ findutils-4.5.9/gnulib/m4/po.m4 2010-05-23 09:08:52.585147521 -0700
+@@ -1,5 +1,5 @@
+-# po.m4 serial 15 (gettext-0.17)
+-dnl Copyright (C) 1995-2007 Free Software Foundation, Inc.
++# po.m4 serial 17 (gettext-0.18)
++dnl Copyright (C) 1995-2010 Free Software Foundation, Inc.
+ dnl This file is free software; the Free Software Foundation
+ dnl gives unlimited permission to copy and/or distribute it,
+ dnl with or without modifications, as long as this notice is preserved.
+@@ -17,7 +17,7 @@ dnl Authors:
+ dnl Ulrich Drepper <drepper@cygnus.com>, 1995-2000.
+ dnl Bruno Haible <haible@clisp.cons.org>, 2000-2003.
+
+-AC_PREREQ(2.50)
++AC_PREREQ([2.50])
+
+ dnl Checks for all prerequisites of the po subdirectory.
+ AC_DEFUN([AM_PO_SUBDIRS],
+@@ -29,7 +29,7 @@ AC_DEFUN([AM_PO_SUBDIRS],
+
+ dnl Release version of the gettext macros. This is used to ensure that
+ dnl the gettext macros and po/Makefile.in.in are in sync.
+- AC_SUBST([GETTEXT_MACRO_VERSION], [0.17])
++ AC_SUBST([GETTEXT_MACRO_VERSION], [0.18])
+
+ dnl Perform the following tests also if --disable-nls has been given,
+ dnl because they are needed for "make dist" to work.
+@@ -41,7 +41,7 @@ AC_DEFUN([AM_PO_SUBDIRS],
+ [$ac_dir/$ac_word --statistics /dev/null >&]AS_MESSAGE_LOG_FD[ 2>&1 &&
+ (if $ac_dir/$ac_word --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi)],
+ :)
+- AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
++ AC_PATH_PROG([GMSGFMT], [gmsgfmt], [$MSGFMT])
+
+ dnl Test whether it is GNU msgfmt >= 0.15.
+ changequote(,)dnl
+diff -urp -x '*~' findutils-4.5.9.org/gnulib/m4/progtest.m4 findutils-4.5.9/gnulib/m4/progtest.m4
+--- findutils-4.5.9.org/gnulib/m4/progtest.m4 2010-04-17 12:33:47.000000000 -0700
++++ findutils-4.5.9/gnulib/m4/progtest.m4 2010-05-23 09:08:52.595148583 -0700
+@@ -1,5 +1,5 @@
+-# progtest.m4 serial 4 (gettext-0.14.2)
+-dnl Copyright (C) 1996-2003, 2005 Free Software Foundation, Inc.
++# progtest.m4 serial 6 (gettext-0.18)
++dnl Copyright (C) 1996-2003, 2005, 2008-2010 Free Software Foundation, Inc.
+ dnl This file is free software; the Free Software Foundation
+ dnl gives unlimited permission to copy and/or distribute it,
+ dnl with or without modifications, as long as this notice is preserved.
+@@ -16,7 +16,7 @@ dnl They are *not* in the public domain.
+ dnl Authors:
+ dnl Ulrich Drepper <drepper@cygnus.com>, 1996.
+
+-AC_PREREQ(2.50)
++AC_PREREQ([2.50])
+
+ # Search path for a program which passes the given test.
+
+@@ -55,7 +55,7 @@ rm -f conf$$.file
+ # Extract the first word of "$2", so it can be a program name with args.
+ set dummy $2; ac_word=[$]2
+ AC_MSG_CHECKING([for $ac_word])
+-AC_CACHE_VAL(ac_cv_path_$1,
++AC_CACHE_VAL([ac_cv_path_$1],
+ [case "[$]$1" in
+ [[\\/]]* | ?:[[\\/]]*)
+ ac_cv_path_$1="[$]$1" # Let the user override the test with a path.
+@@ -84,9 +84,9 @@ ifelse([$4], , , [ test -z "[$]ac_cv_pa
+ esac])dnl
+ $1="$ac_cv_path_$1"
+ if test ifelse([$4], , [-n "[$]$1"], ["[$]$1" != "$4"]); then
+- AC_MSG_RESULT([$]$1)
++ AC_MSG_RESULT([$][$1])
+ else
+- AC_MSG_RESULT(no)
++ AC_MSG_RESULT([no])
+ fi
+-AC_SUBST($1)dnl
++AC_SUBST([$1])dnl
+ ])
+Only in findutils-4.5.9/po: ChangeLog
+diff -urp -x '*~' findutils-4.5.9.org/po/Makefile.in.in findutils-4.5.9/po/Makefile.in.in
+--- findutils-4.5.9.org/po/Makefile.in.in 2010-04-29 14:26:12.000000000 -0700
++++ findutils-4.5.9/po/Makefile.in.in 2010-05-23 09:08:51.885149549 -0700
+@@ -1,5 +1,5 @@
+ # Makefile for PO directory in any package using GNU gettext.
+-# Copyright (C) 1995-1997, 2000-2007 by Ulrich Drepper <drepper@gnu.ai.mit.edu>
++# Copyright (C) 1995-1997, 2000-2007, 2009-2010 by Ulrich Drepper <drepper@gnu.ai.mit.edu>
+ #
+ # This file can be copied and used freely without restrictions. It can
+ # be used in projects which are not available under the GNU General Public
+@@ -8,8 +8,8 @@
+ # Please note that the actual code of GNU gettext is covered by the GNU
+ # General Public License and is *not* in the public domain.
+ #
+-# Origin: gettext-0.17
+-GETTEXT_MACRO_VERSION = 0.17
++# Origin: gettext-0.18
++GETTEXT_MACRO_VERSION = 0.18
+
+ PACKAGE = @PACKAGE@
+ VERSION = @VERSION@
+@@ -88,8 +88,8 @@ CATALOGS = @CATALOGS@
+ .po.gmo:
+ @lang=`echo $* | sed -e 's,.*/,,'`; \
+ test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \
+- echo "$${cdcmd}rm -f $${lang}.gmo && $(GMSGFMT) -c --statistics -o $${lang}.gmo $${lang}.po"; \
+- cd $(srcdir) && rm -f $${lang}.gmo && $(GMSGFMT) -c --statistics -o t-$${lang}.gmo $${lang}.po && mv t-$${lang}.gmo $${lang}.gmo
++ echo "$${cdcmd}rm -f $${lang}.gmo && $(GMSGFMT) -c --statistics --verbose -o $${lang}.gmo $${lang}.po"; \
++ cd $(srcdir) && rm -f $${lang}.gmo && $(GMSGFMT) -c --statistics --verbose -o t-$${lang}.gmo $${lang}.po && mv t-$${lang}.gmo $${lang}.gmo
+
+ .sin.sed:
+ sed -e '/^#/d' $< > t-$@
+@@ -193,8 +193,15 @@ $(POFILES): $(srcdir)/$(DOMAIN).pot
+ @lang=`echo $@ | sed -e 's,.*/,,' -e 's/\.po$$//'`; \
+ if test -f "$(srcdir)/$${lang}.po"; then \
+ test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \
+- echo "$${cdcmd}$(MSGMERGE_UPDATE) $${lang}.po $(DOMAIN).pot"; \
+- cd $(srcdir) && $(MSGMERGE_UPDATE) $${lang}.po $(DOMAIN).pot; \
++ echo "$${cdcmd}$(MSGMERGE_UPDATE) $(MSGMERGE_OPTIONS) --lang=$${lang} $${lang}.po $(DOMAIN).pot"; \
++ cd $(srcdir) \
++ && { case `$(MSGMERGE_UPDATE) --version | sed 1q | sed -e 's,^[^0-9]*,,'` in \
++ '' | 0.[0-9] | 0.[0-9].* | 0.1[0-7] | 0.1[0-7].*) \
++ $(MSGMERGE_UPDATE) $(MSGMERGE_OPTIONS) $${lang}.po $(DOMAIN).pot;; \
++ *) \
++ $(MSGMERGE_UPDATE) $(MSGMERGE_OPTIONS) --lang=$${lang} $${lang}.po $(DOMAIN).pot;; \
++ esac; \
++ }; \
+ else \
+ $(MAKE) $${lang}.po-create; \
+ fi
+@@ -217,7 +224,6 @@ install-data: install-data-@USE_NLS@
+ fi
+ install-data-no: all
+ install-data-yes: all
+- $(mkdir_p) $(DESTDIR)$(datadir)
+ @catalogs='$(CATALOGS)'; \
+ for cat in $$catalogs; do \
+ cat=`basename $$cat`; \
+@@ -269,7 +275,6 @@ installdirs-data: installdirs-data-@USE_
+ fi
+ installdirs-data-no:
+ installdirs-data-yes:
+- $(mkdir_p) $(DESTDIR)$(datadir)
+ @catalogs='$(CATALOGS)'; \
+ for cat in $$catalogs; do \
+ cat=`basename $$cat`; \
+@@ -395,9 +400,15 @@ update-po: Makefile
+ tmpdir=`pwd`; \
+ echo "$$lang:"; \
+ test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \
+- echo "$${cdcmd}$(MSGMERGE) $$lang.po $(DOMAIN).pot -o $$lang.new.po"; \
++ echo "$${cdcmd}$(MSGMERGE) $(MSGMERGE_OPTIONS) --lang=$$lang $$lang.po $(DOMAIN).pot -o $$lang.new.po"; \
+ cd $(srcdir); \
+- if $(MSGMERGE) $$lang.po $(DOMAIN).pot -o $$tmpdir/$$lang.new.po; then \
++ if { case `$(MSGMERGE) --version | sed 1q | sed -e 's,^[^0-9]*,,'` in \
++ '' | 0.[0-9] | 0.[0-9].* | 0.1[0-7] | 0.1[0-7].*) \
++ $(MSGMERGE) $(MSGMERGE_OPTIONS) -o $$tmpdir/$$lang.new.po $$lang.po $(DOMAIN).pot;; \
++ *) \
++ $(MSGMERGE) $(MSGMERGE_OPTIONS) --lang=$$lang -o $$tmpdir/$$lang.new.po $$lang.po $(DOMAIN).pot;; \
++ esac; \
++ }; then \
+ if cmp $$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \
+ rm -f $$tmpdir/$$lang.new.po; \
+ else \
+@@ -418,9 +429,13 @@ $(DUMMYPOFILES):
+ update-gmo: Makefile $(GMOFILES)
+ @:
+
++# Recreate Makefile by invoking config.status. Explicitly invoke the shell,
++# because execution permission bits may not work on the current file system.
++# Use @SHELL@, which is the shell determined by autoconf for the use by its
++# scripts, not $(SHELL) which is hardwired to /bin/sh and may be deficient.
+ Makefile: Makefile.in.in Makevars $(top_builddir)/config.status @POMAKEFILEDEPS@
+ cd $(top_builddir) \
+- && $(SHELL) ./config.status $(subdir)/$@.in po-directories
++ && @SHELL@ ./config.status $(subdir)/$@.in po-directories
+
+ force:
+
+Only in findutils-4.5.9/po: Makevars.template
+diff -urp -x '*~' findutils-4.5.9.org/po/Rules-quot findutils-4.5.9/po/Rules-quot
+--- findutils-4.5.9.org/po/Rules-quot 2009-07-11 13:19:27.000000000 -0700
++++ findutils-4.5.9/po/Rules-quot 2010-05-23 09:08:52.035152971 -0700
+@@ -20,7 +20,7 @@ en@boldquot.po-update: en@boldquot.po-up
+ ll=`echo $$lang | sed -e 's/@.*//'`; \
+ LC_ALL=C; export LC_ALL; \
+ cd $(srcdir); \
+- if $(MSGINIT) -i $(DOMAIN).pot --no-translator -l $$ll -o - 2>/dev/null | sed -f $$tmpdir/$$lang.insert-header | $(MSGCONV) -t UTF-8 | $(MSGFILTER) sed -f `echo $$lang | sed -e 's/.*@//'`.sed 2>/dev/null > $$tmpdir/$$lang.new.po; then \
++ if $(MSGINIT) -i $(DOMAIN).pot --no-translator -l $$lang -o - 2>/dev/null | sed -f $$tmpdir/$$lang.insert-header | $(MSGCONV) -t UTF-8 | $(MSGFILTER) sed -f `echo $$lang | sed -e 's/.*@//'`.sed 2>/dev/null > $$tmpdir/$$lang.new.po; then \
+ if cmp $$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \
+ rm -f $$tmpdir/$$lang.new.po; \
+ else \
diff --git a/recipes/findutils/findutils_4.5.9.bb b/recipes/findutils/findutils_4.5.9.bb
new file mode 100644
index 0000000..aa4fc38
--- /dev/null
+++ b/recipes/findutils/findutils_4.5.9.bb
@@ -0,0 +1,12 @@
+require findutils.inc
+
+PR = "${INC_PR}.0"
+
+# newer version is not available on GNU_MIRROR from .inc file, and old 4.2.29 is not available on alpha.gnu.org
+SRC_URI = "ftp://alpha.gnu.org/gnu/${BPN}/${BPN}-${PV}.tar.gz \
+ file://gettext-0.18-update.patch \
+ "
+
+SRC_URI[md5sum] = "f0276639a824f57e78916d3c207ee618"
+SRC_URI[sha256sum] = "ee7fad47a8ee62f335f8415e48d3836052b2d00c4df568cac808e25cd42653cc"
+
--
1.7.0.4
^ permalink raw reply related [flat|nested] 45+ messages in thread
* [PATCH 12/16] gstreamer_0.10.28.bb: Fix to build with gettext 0.18
2010-06-02 20:34 [PATCH 00/16] Upgrade gettext, GNU utilities, fix general build issues with uclibc distros Khem Raj
` (10 preceding siblings ...)
2010-06-02 20:34 ` [PATCH 11/16] findutils_4.5.9.bb: " Khem Raj
@ 2010-06-02 20:34 ` Khem Raj
2010-06-04 7:41 ` Martin Jansa
2010-06-02 20:34 ` [PATCH 13/16] ncurses: Add -fforward-propagate on arm Khem Raj
` (5 subsequent siblings)
17 siblings, 1 reply; 45+ messages in thread
From: Khem Raj @ 2010-06-02 20:34 UTC (permalink / raw)
To: openembedded-devel
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain, Size: 47514 bytes --]
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
recipes/gstreamer/gstreamer/use-gettext-0.18.patch | 1012 ++++++++++++++++++++
recipes/gstreamer/gstreamer_0.10.28.bb | 5 +
2 files changed, 1017 insertions(+), 0 deletions(-)
create mode 100644 recipes/gstreamer/gstreamer/use-gettext-0.18.patch
diff --git a/recipes/gstreamer/gstreamer/use-gettext-0.18.patch b/recipes/gstreamer/gstreamer/use-gettext-0.18.patch
new file mode 100644
index 0000000..504caa8
--- /dev/null
+++ b/recipes/gstreamer/gstreamer/use-gettext-0.18.patch
@@ -0,0 +1,1012 @@
+This patch it needed to get gstreamer upgraded to use gettext 0.18
+
+-Khem
+
+diff -Nurp -x '*.o' -x '*.gmo' -x '*.po' -x '*~' gstreamer-0.10.28.org/common/m4/gettext.m4 gstreamer-0.10.28/common/m4/gettext.m4
+--- gstreamer-0.10.28.org/common/m4/gettext.m4 2010-03-08 08:58:16.000000000 -0800
++++ gstreamer-0.10.28/common/m4/gettext.m4 2010-05-22 08:37:17.713880839 -0700
+@@ -1,5 +1,5 @@
+-# gettext.m4 serial 60 (gettext-0.17)
+-dnl Copyright (C) 1995-2007 Free Software Foundation, Inc.
++# gettext.m4 serial 63 (gettext-0.18)
++dnl Copyright (C) 1995-2010 Free Software Foundation, Inc.
+ dnl This file is free software; the Free Software Foundation
+ dnl gives unlimited permission to copy and/or distribute it,
+ dnl with or without modifications, as long as this notice is preserved.
+@@ -15,7 +15,7 @@ dnl They are *not* in the public domain.
+
+ dnl Authors:
+ dnl Ulrich Drepper <drepper@cygnus.com>, 1995-2000.
+-dnl Bruno Haible <haible@clisp.cons.org>, 2000-2006.
++dnl Bruno Haible <haible@clisp.cons.org>, 2000-2006, 2008-2010.
+
+ dnl Macro to add for using GNU gettext.
+
+@@ -60,6 +60,8 @@ AC_DEFUN([AM_GNU_GETTEXT],
+ ifelse([$1], [], , [ifelse([$1], [external], , [ifelse([$1], [no-libtool], , [ifelse([$1], [use-libtool], ,
+ [errprint([ERROR: invalid first argument to AM_GNU_GETTEXT
+ ])])])])])
++ ifelse(ifelse([$1], [], [old])[]ifelse([$1], [no-libtool], [old]), [old],
++ [AC_DIAGNOSE([obsolete], [Use of AM_GNU_GETTEXT without [external] argument is deprecated.])])
+ ifelse([$2], [], , [ifelse([$2], [need-ngettext], , [ifelse([$2], [need-formatstring-macros], ,
+ [errprint([ERROR: invalid second argument to AM_GNU_GETTEXT
+ ])])])])
+@@ -123,11 +125,11 @@ AC_DEFUN([AM_GNU_GETTEXT],
+ gt_use_preinstalled_gnugettext=no
+ ifelse(gt_included_intl, yes, [
+ AC_MSG_CHECKING([whether included gettext is requested])
+- AC_ARG_WITH(included-gettext,
++ AC_ARG_WITH([included-gettext],
+ [ --with-included-gettext use the GNU gettext library included here],
+ nls_cv_force_use_gnu_gettext=$withval,
+ nls_cv_force_use_gnu_gettext=no)
+- AC_MSG_RESULT($nls_cv_force_use_gnu_gettext)
++ AC_MSG_RESULT([$nls_cv_force_use_gnu_gettext])
+
+ nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext"
+ if test "$nls_cv_force_use_gnu_gettext" != "yes"; then
+@@ -267,7 +269,7 @@ return * gettext ("")$gt_expression_test
+
+ if test "$gt_use_preinstalled_gnugettext" = "yes" \
+ || test "$nls_cv_use_gnu_gettext" = "yes"; then
+- AC_DEFINE(ENABLE_NLS, 1,
++ AC_DEFINE([ENABLE_NLS], [1],
+ [Define to 1 if translation of program messages to the user's native language
+ is requested.])
+ else
+@@ -301,9 +303,9 @@ return * gettext ("")$gt_expression_test
+ fi
+
+ dnl For backward compatibility. Some packages may be using this.
+- AC_DEFINE(HAVE_GETTEXT, 1,
++ AC_DEFINE([HAVE_GETTEXT], [1],
+ [Define if the GNU gettext() function is already present or preinstalled.])
+- AC_DEFINE(HAVE_DCGETTEXT, 1,
++ AC_DEFINE([HAVE_DCGETTEXT], [1],
+ [Define if the GNU dcgettext() function is already present or preinstalled.])
+ fi
+
+@@ -319,9 +321,9 @@ return * gettext ("")$gt_expression_test
+ fi
+
+ dnl Make all variables we use known to autoconf.
+- AC_SUBST(BUILD_INCLUDED_LIBINTL)
+- AC_SUBST(USE_INCLUDED_LIBINTL)
+- AC_SUBST(CATOBJEXT)
++ AC_SUBST([BUILD_INCLUDED_LIBINTL])
++ AC_SUBST([USE_INCLUDED_LIBINTL])
++ AC_SUBST([CATOBJEXT])
+
+ dnl For backward compatibility. Some configure.ins may be using this.
+ nls_cv_header_intl=
+@@ -329,36 +331,36 @@ return * gettext ("")$gt_expression_test
+
+ dnl For backward compatibility. Some Makefiles may be using this.
+ DATADIRNAME=share
+- AC_SUBST(DATADIRNAME)
++ AC_SUBST([DATADIRNAME])
+
+ dnl For backward compatibility. Some Makefiles may be using this.
+ INSTOBJEXT=.mo
+- AC_SUBST(INSTOBJEXT)
++ AC_SUBST([INSTOBJEXT])
+
+ dnl For backward compatibility. Some Makefiles may be using this.
+ GENCAT=gencat
+- AC_SUBST(GENCAT)
++ AC_SUBST([GENCAT])
+
+ dnl For backward compatibility. Some Makefiles may be using this.
+ INTLOBJS=
+ if test "$USE_INCLUDED_LIBINTL" = yes; then
+ INTLOBJS="\$(GETTOBJS)"
+ fi
+- AC_SUBST(INTLOBJS)
++ AC_SUBST([INTLOBJS])
+
+ dnl Enable libtool support if the surrounding package wishes it.
+ INTL_LIBTOOL_SUFFIX_PREFIX=gt_libtool_suffix_prefix
+- AC_SUBST(INTL_LIBTOOL_SUFFIX_PREFIX)
++ AC_SUBST([INTL_LIBTOOL_SUFFIX_PREFIX])
+ ])
+
+ dnl For backward compatibility. Some Makefiles may be using this.
+ INTLLIBS="$LIBINTL"
+- AC_SUBST(INTLLIBS)
++ AC_SUBST([INTLLIBS])
+
+ dnl Make all documented variables known to autoconf.
+- AC_SUBST(LIBINTL)
+- AC_SUBST(LTLIBINTL)
+- AC_SUBST(POSUB)
++ AC_SUBST([LIBINTL])
++ AC_SUBST([LTLIBINTL])
++ AC_SUBST([POSUB])
+ ])
+
+
+diff -Nurp -x '*.o' -x '*.gmo' -x '*.po' -x '*~' gstreamer-0.10.28.org/common/m4/iconv.m4 gstreamer-0.10.28/common/m4/iconv.m4
+--- gstreamer-0.10.28.org/common/m4/iconv.m4 2010-03-08 08:58:16.000000000 -0800
++++ gstreamer-0.10.28/common/m4/iconv.m4 2010-05-22 08:37:17.733798944 -0700
+@@ -1,5 +1,5 @@
+-# iconv.m4 serial AM6 (gettext-0.17)
+-dnl Copyright (C) 2000-2002, 2007 Free Software Foundation, Inc.
++# iconv.m4 serial 9 (gettext-0.18)
++dnl Copyright (C) 2000-2002, 2007-2010 Free Software Foundation, Inc.
+ dnl This file is free software; the Free Software Foundation
+ dnl gives unlimited permission to copy and/or distribute it,
+ dnl with or without modifications, as long as this notice is preserved.
+@@ -34,7 +34,7 @@ AC_DEFUN([AM_ICONV_LINK],
+ am_save_CPPFLAGS="$CPPFLAGS"
+ AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCICONV])
+
+- AC_CACHE_CHECK([for iconv], am_cv_func_iconv, [
++ AC_CACHE_CHECK([for iconv], [am_cv_func_iconv], [
+ am_cv_func_iconv="no, consider installing GNU libiconv"
+ am_cv_lib_iconv=no
+ AC_TRY_LINK([#include <stdlib.h>
+@@ -42,7 +42,7 @@ AC_DEFUN([AM_ICONV_LINK],
+ [iconv_t cd = iconv_open("","");
+ iconv(cd,NULL,NULL,NULL,NULL);
+ iconv_close(cd);],
+- am_cv_func_iconv=yes)
++ [am_cv_func_iconv=yes])
+ if test "$am_cv_func_iconv" != yes; then
+ am_save_LIBS="$LIBS"
+ LIBS="$LIBS $LIBICONV"
+@@ -51,14 +51,14 @@ AC_DEFUN([AM_ICONV_LINK],
+ [iconv_t cd = iconv_open("","");
+ iconv(cd,NULL,NULL,NULL,NULL);
+ iconv_close(cd);],
+- am_cv_lib_iconv=yes
+- am_cv_func_iconv=yes)
++ [am_cv_lib_iconv=yes]
++ [am_cv_func_iconv=yes])
+ LIBS="$am_save_LIBS"
+ fi
+ ])
+ if test "$am_cv_func_iconv" = yes; then
+- AC_CACHE_CHECK([for working iconv], am_cv_func_iconv_works, [
+- dnl This tests against bugs in AIX 5.1 and HP-UX 11.11.
++ AC_CACHE_CHECK([for working iconv], [am_cv_func_iconv_works], [
++ dnl This tests against bugs in AIX 5.1, HP-UX 11.11, Solaris 10.
+ am_save_LIBS="$LIBS"
+ if test $am_cv_lib_iconv = yes; then
+ LIBS="$LIBS $LIBICONV"
+@@ -87,6 +87,25 @@ int main ()
+ return 1;
+ }
+ }
++ /* Test against Solaris 10 bug: Failures are not distinguishable from
++ successful returns. */
++ {
++ iconv_t cd_ascii_to_88591 = iconv_open ("ISO8859-1", "646");
++ if (cd_ascii_to_88591 != (iconv_t)(-1))
++ {
++ static const char input[] = "\263";
++ char buf[10];
++ const char *inptr = input;
++ size_t inbytesleft = strlen (input);
++ char *outptr = buf;
++ size_t outbytesleft = sizeof (buf);
++ size_t res = iconv (cd_ascii_to_88591,
++ (char **) &inptr, &inbytesleft,
++ &outptr, &outbytesleft);
++ if (res == 0)
++ return 1;
++ }
++ }
+ #if 0 /* This bug could be worked around by the caller. */
+ /* Test against HP-UX 11.11 bug: Positive return value instead of 0. */
+ {
+@@ -134,7 +153,7 @@ int main ()
+ am_func_iconv=no am_cv_lib_iconv=no
+ fi
+ if test "$am_func_iconv" = yes; then
+- AC_DEFINE(HAVE_ICONV, 1,
++ AC_DEFINE([HAVE_ICONV], [1],
+ [Define if you have the iconv() function and it works.])
+ fi
+ if test "$am_cv_lib_iconv" = yes; then
+@@ -147,8 +166,8 @@ int main ()
+ LIBICONV=
+ LTLIBICONV=
+ fi
+- AC_SUBST(LIBICONV)
+- AC_SUBST(LTLIBICONV)
++ AC_SUBST([LIBICONV])
++ AC_SUBST([LTLIBICONV])
+ ])
+
+ AC_DEFUN([AM_ICONV],
+@@ -156,7 +175,7 @@ AC_DEFUN([AM_ICONV],
+ AM_ICONV_LINK
+ if test "$am_cv_func_iconv" = yes; then
+ AC_MSG_CHECKING([for iconv declaration])
+- AC_CACHE_VAL(am_cv_proto_iconv, [
++ AC_CACHE_VAL([am_cv_proto_iconv], [
+ AC_TRY_COMPILE([
+ #include <stdlib.h>
+ #include <iconv.h>
+@@ -169,12 +188,12 @@ size_t iconv (iconv_t cd, char * *inbuf,
+ #else
+ size_t iconv();
+ #endif
+-], [], am_cv_proto_iconv_arg1="", am_cv_proto_iconv_arg1="const")
++], [], [am_cv_proto_iconv_arg1=""], [am_cv_proto_iconv_arg1="const"])
+ am_cv_proto_iconv="extern size_t iconv (iconv_t cd, $am_cv_proto_iconv_arg1 char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);"])
+ am_cv_proto_iconv=`echo "[$]am_cv_proto_iconv" | tr -s ' ' | sed -e 's/( /(/'`
+- AC_MSG_RESULT([$]{ac_t:-
+- }[$]am_cv_proto_iconv)
+- AC_DEFINE_UNQUOTED(ICONV_CONST, $am_cv_proto_iconv_arg1,
++ AC_MSG_RESULT([
++ $am_cv_proto_iconv])
++ AC_DEFINE_UNQUOTED([ICONV_CONST], [$am_cv_proto_iconv_arg1],
+ [Define as const if the declaration of iconv() needs const.])
+ fi
+ ])
+diff -Nurp -x '*.o' -x '*.gmo' -x '*.po' -x '*~' gstreamer-0.10.28.org/common/m4/lib-ld.m4 gstreamer-0.10.28/common/m4/lib-ld.m4
+--- gstreamer-0.10.28.org/common/m4/lib-ld.m4 2010-03-08 08:58:16.000000000 -0800
++++ gstreamer-0.10.28/common/m4/lib-ld.m4 2010-05-22 08:37:17.753795900 -0700
+@@ -1,5 +1,5 @@
+-# lib-ld.m4 serial 3 (gettext-0.13)
+-dnl Copyright (C) 1996-2003 Free Software Foundation, Inc.
++# lib-ld.m4 serial 4 (gettext-0.18)
++dnl Copyright (C) 1996-2003, 2009-2010 Free Software Foundation, Inc.
+ dnl This file is free software; the Free Software Foundation
+ dnl gives unlimited permission to copy and/or distribute it,
+ dnl with or without modifications, as long as this notice is preserved.
+@@ -10,7 +10,7 @@ dnl with libtool.m4.
+
+ dnl From libtool-1.4. Sets the variable with_gnu_ld to yes or no.
+ AC_DEFUN([AC_LIB_PROG_LD_GNU],
+-[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], acl_cv_prog_gnu_ld,
++[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], [acl_cv_prog_gnu_ld],
+ [# I'd rather use --version here, but apparently some GNU ld's only accept -v.
+ case `$LD -v 2>&1 </dev/null` in
+ *GNU* | *'with BFD'*)
+@@ -23,7 +23,7 @@ with_gnu_ld=$acl_cv_prog_gnu_ld
+
+ dnl From libtool-1.4. Sets the variable LD.
+ AC_DEFUN([AC_LIB_PROG_LD],
+-[AC_ARG_WITH(gnu-ld,
++[AC_ARG_WITH([gnu-ld],
+ [ --with-gnu-ld assume the C compiler uses GNU ld [default=no]],
+ test "$withval" = no || with_gnu_ld=yes, with_gnu_ld=no)
+ AC_REQUIRE([AC_PROG_CC])dnl
+@@ -59,7 +59,7 @@ if test "$GCC" = yes; then
+ # Canonicalize the path of ld
+ ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'`
+ while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
+- ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`
++ ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`
+ done
+ test -z "$LD" && LD="$ac_prog"
+ ;;
+@@ -77,7 +77,7 @@ elif test "$with_gnu_ld" = yes; then
+ else
+ AC_MSG_CHECKING([for non-GNU ld])
+ fi
+-AC_CACHE_VAL(acl_cv_path_LD,
++AC_CACHE_VAL([acl_cv_path_LD],
+ [if test -z "$LD"; then
+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
+ for ac_dir in $PATH; do
+@@ -89,9 +89,9 @@ AC_CACHE_VAL(acl_cv_path_LD,
+ # Break only if it was the GNU/non-GNU ld that we prefer.
+ case `"$acl_cv_path_LD" -v 2>&1 < /dev/null` in
+ *GNU* | *'with BFD'*)
+- test "$with_gnu_ld" != no && break ;;
++ test "$with_gnu_ld" != no && break ;;
+ *)
+- test "$with_gnu_ld" != yes && break ;;
++ test "$with_gnu_ld" != yes && break ;;
+ esac
+ fi
+ done
+@@ -101,9 +101,9 @@ else
+ fi])
+ LD="$acl_cv_path_LD"
+ if test -n "$LD"; then
+- AC_MSG_RESULT($LD)
++ AC_MSG_RESULT([$LD])
+ else
+- AC_MSG_RESULT(no)
++ AC_MSG_RESULT([no])
+ fi
+ test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
+ AC_LIB_PROG_LD_GNU
+diff -Nurp -x '*.o' -x '*.gmo' -x '*.po' -x '*~' gstreamer-0.10.28.org/common/m4/lib-link.m4 gstreamer-0.10.28/common/m4/lib-link.m4
+--- gstreamer-0.10.28.org/common/m4/lib-link.m4 2010-03-08 08:58:16.000000000 -0800
++++ gstreamer-0.10.28/common/m4/lib-link.m4 2010-05-22 08:37:17.763792911 -0700
+@@ -1,12 +1,12 @@
+-# lib-link.m4 serial 13 (gettext-0.17)
+-dnl Copyright (C) 2001-2007 Free Software Foundation, Inc.
++# lib-link.m4 serial 21 (gettext-0.18)
++dnl Copyright (C) 2001-2010 Free Software Foundation, Inc.
+ dnl This file is free software; the Free Software Foundation
+ dnl gives unlimited permission to copy and/or distribute it,
+ dnl with or without modifications, as long as this notice is preserved.
+
+ dnl From Bruno Haible.
+
+-AC_PREREQ(2.54)
++AC_PREREQ([2.54])
+
+ dnl AC_LIB_LINKFLAGS(name [, dependencies]) searches for libname and
+ dnl the libraries corresponding to explicit and implicit dependencies.
+@@ -18,9 +18,9 @@ AC_DEFUN([AC_LIB_LINKFLAGS],
+ [
+ AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
+ AC_REQUIRE([AC_LIB_RPATH])
+- define([Name],[translit([$1],[./-], [___])])
+- define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
+- [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
++ pushdef([Name],[translit([$1],[./-], [___])])
++ pushdef([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
++ [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
+ AC_CACHE_CHECK([how to link with lib[]$1], [ac_cv_lib[]Name[]_libs], [
+ AC_LIB_LINKFLAGS_BODY([$1], [$2])
+ ac_cv_lib[]Name[]_libs="$LIB[]NAME"
+@@ -39,16 +39,17 @@ AC_DEFUN([AC_LIB_LINKFLAGS],
+ dnl Also set HAVE_LIB[]NAME so that AC_LIB_HAVE_LINKFLAGS can reuse the
+ dnl results of this search when this library appears as a dependency.
+ HAVE_LIB[]NAME=yes
+- undefine([Name])
+- undefine([NAME])
++ popdef([NAME])
++ popdef([Name])
+ ])
+
+-dnl AC_LIB_HAVE_LINKFLAGS(name, dependencies, includes, testcode)
++dnl AC_LIB_HAVE_LINKFLAGS(name, dependencies, includes, testcode, [missing-message])
+ dnl searches for libname and the libraries corresponding to explicit and
+ dnl implicit dependencies, together with the specified include files and
+-dnl the ability to compile and link the specified testcode. If found, it
+-dnl sets and AC_SUBSTs HAVE_LIB${NAME}=yes and the LIB${NAME} and
+-dnl LTLIB${NAME} variables and augments the CPPFLAGS variable, and
++dnl the ability to compile and link the specified testcode. The missing-message
++dnl defaults to 'no' and may contain additional hints for the user.
++dnl If found, it sets and AC_SUBSTs HAVE_LIB${NAME}=yes and the LIB${NAME}
++dnl and LTLIB${NAME} variables and augments the CPPFLAGS variable, and
+ dnl #defines HAVE_LIB${NAME} to 1. Otherwise, it sets and AC_SUBSTs
+ dnl HAVE_LIB${NAME}=no and LIB${NAME} and LTLIB${NAME} to empty.
+ dnl Sets and AC_SUBSTs the LIB${NAME}_PREFIX variable to nonempty if libname
+@@ -57,9 +58,9 @@ AC_DEFUN([AC_LIB_HAVE_LINKFLAGS],
+ [
+ AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
+ AC_REQUIRE([AC_LIB_RPATH])
+- define([Name],[translit([$1],[./-], [___])])
+- define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
+- [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
++ pushdef([Name],[translit([$1],[./-], [___])])
++ pushdef([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
++ [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
+
+ dnl Search for lib[]Name and define LIB[]NAME, LTLIB[]NAME and INC[]NAME
+ dnl accordingly.
+@@ -73,13 +74,25 @@ AC_DEFUN([AC_LIB_HAVE_LINKFLAGS],
+
+ AC_CACHE_CHECK([for lib[]$1], [ac_cv_lib[]Name], [
+ ac_save_LIBS="$LIBS"
+- LIBS="$LIBS $LIB[]NAME"
+- AC_TRY_LINK([$3], [$4], [ac_cv_lib[]Name=yes], [ac_cv_lib[]Name=no])
++ dnl If $LIB[]NAME contains some -l options, add it to the end of LIBS,
++ dnl because these -l options might require -L options that are present in
++ dnl LIBS. -l options benefit only from the -L options listed before it.
++ dnl Otherwise, add it to the front of LIBS, because it may be a static
++ dnl library that depends on another static library that is present in LIBS.
++ dnl Static libraries benefit only from the static libraries listed after
++ dnl it.
++ case " $LIB[]NAME" in
++ *" -l"*) LIBS="$LIBS $LIB[]NAME" ;;
++ *) LIBS="$LIB[]NAME $LIBS" ;;
++ esac
++ AC_TRY_LINK([$3], [$4],
++ [ac_cv_lib[]Name=yes],
++ [ac_cv_lib[]Name='m4_if([$5], [], [no], [[$5]])'])
+ LIBS="$ac_save_LIBS"
+ ])
+ if test "$ac_cv_lib[]Name" = yes; then
+ HAVE_LIB[]NAME=yes
+- AC_DEFINE([HAVE_LIB]NAME, 1, [Define if you have the $1 library.])
++ AC_DEFINE([HAVE_LIB]NAME, 1, [Define if you have the lib][$1 library.])
+ AC_MSG_CHECKING([how to link with lib[]$1])
+ AC_MSG_RESULT([$LIB[]NAME])
+ else
+@@ -95,8 +108,8 @@ AC_DEFUN([AC_LIB_HAVE_LINKFLAGS],
+ AC_SUBST([LIB]NAME)
+ AC_SUBST([LTLIB]NAME)
+ AC_SUBST([LIB]NAME[_PREFIX])
+- undefine([Name])
+- undefine([NAME])
++ popdef([NAME])
++ popdef([Name])
+ ])
+
+ dnl Determine the platform dependent parameters needed to use rpath:
+@@ -114,7 +127,7 @@ AC_DEFUN([AC_LIB_RPATH],
+ AC_REQUIRE([AC_LIB_PROG_LD]) dnl we use $LD, $with_gnu_ld
+ AC_REQUIRE([AC_CANONICAL_HOST]) dnl we use $host
+ AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT]) dnl we use $ac_aux_dir
+- AC_CACHE_CHECK([for shared library run path origin], acl_cv_rpath, [
++ AC_CACHE_CHECK([for shared library run path origin], [acl_cv_rpath], [
+ CC="$CC" GCC="$GCC" LDFLAGS="$LDFLAGS" LD="$LD" with_gnu_ld="$with_gnu_ld" \
+ ${CONFIG_SHELL-/bin/sh} "$ac_aux_dir/config.rpath" "$host" > conftest.sh
+ . ./conftest.sh
+@@ -131,11 +144,32 @@ AC_DEFUN([AC_LIB_RPATH],
+ acl_hardcode_direct="$acl_cv_hardcode_direct"
+ acl_hardcode_minus_L="$acl_cv_hardcode_minus_L"
+ dnl Determine whether the user wants rpath handling at all.
+- AC_ARG_ENABLE(rpath,
++ AC_ARG_ENABLE([rpath],
+ [ --disable-rpath do not hardcode runtime library paths],
+ :, enable_rpath=yes)
+ ])
+
++dnl AC_LIB_FROMPACKAGE(name, package)
++dnl declares that libname comes from the given package. The configure file
++dnl will then not have a --with-libname-prefix option but a
++dnl --with-package-prefix option. Several libraries can come from the same
++dnl package. This declaration must occur before an AC_LIB_LINKFLAGS or similar
++dnl macro call that searches for libname.
++AC_DEFUN([AC_LIB_FROMPACKAGE],
++[
++ pushdef([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
++ [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
++ define([acl_frompackage_]NAME, [$2])
++ popdef([NAME])
++ pushdef([PACK],[$2])
++ pushdef([PACKUP],[translit(PACK,[abcdefghijklmnopqrstuvwxyz./-],
++ [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
++ define([acl_libsinpackage_]PACKUP,
++ m4_ifdef([acl_libsinpackage_]PACKUP, [acl_libsinpackage_]PACKUP[[, ]],)[lib$1])
++ popdef([PACKUP])
++ popdef([PACK])
++])
++
+ dnl AC_LIB_LINKFLAGS_BODY(name [, dependencies]) searches for libname and
+ dnl the libraries corresponding to explicit and implicit dependencies.
+ dnl Sets the LIB${NAME}, LTLIB${NAME} and INC${NAME} variables.
+@@ -144,19 +178,23 @@ dnl in ${LIB${NAME}_PREFIX}/$acl_libdirs
+ AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
+ [
+ AC_REQUIRE([AC_LIB_PREPARE_MULTILIB])
+- define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
+- [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
++ pushdef([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
++ [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
++ pushdef([PACK],[m4_ifdef([acl_frompackage_]NAME, [acl_frompackage_]NAME, lib[$1])])
++ pushdef([PACKUP],[translit(PACK,[abcdefghijklmnopqrstuvwxyz./-],
++ [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
++ pushdef([PACKLIBS],[m4_ifdef([acl_frompackage_]NAME, [acl_libsinpackage_]PACKUP, lib[$1])])
+ dnl Autoconf >= 2.61 supports dots in --with options.
+- define([N_A_M_E],[m4_if(m4_version_compare(m4_defn([m4_PACKAGE_VERSION]),[2.61]),[-1],[translit([$1],[.],[_])],[$1])])
++ pushdef([P_A_C_K],[m4_if(m4_version_compare(m4_defn([m4_PACKAGE_VERSION]),[2.61]),[-1],[translit(PACK,[.],[_])],PACK)])
+ dnl By default, look in $includedir and $libdir.
+ use_additional=yes
+ AC_LIB_WITH_FINAL_PREFIX([
+ eval additional_includedir=\"$includedir\"
+ eval additional_libdir=\"$libdir\"
+ ])
+- AC_LIB_ARG_WITH([lib]N_A_M_E[-prefix],
+-[ --with-lib]N_A_M_E[-prefix[=DIR] search for lib$1 in DIR/include and DIR/lib
+- --without-lib]N_A_M_E[-prefix don't search for lib$1 in includedir and libdir],
++ AC_ARG_WITH(P_A_C_K[-prefix],
++[[ --with-]]P_A_C_K[[-prefix[=DIR] search for ]PACKLIBS[ in DIR/include and DIR/lib
++ --without-]]P_A_C_K[[-prefix don't search for ]PACKLIBS[ in includedir and libdir]],
+ [
+ if test "X$withval" = "Xno"; then
+ use_additional=no
+@@ -169,6 +207,10 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
+ else
+ additional_includedir="$withval/include"
+ additional_libdir="$withval/$acl_libdirstem"
++ if test "$acl_libdirstem2" != "$acl_libdirstem" \
++ && ! test -d "$withval/$acl_libdirstem"; then
++ additional_libdir="$withval/$acl_libdirstem2"
++ fi
+ fi
+ fi
+ ])
+@@ -178,6 +220,9 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
+ LTLIB[]NAME=
+ INC[]NAME=
+ LIB[]NAME[]_PREFIX=
++ dnl HAVE_LIB${NAME} is an indicator that LIB${NAME}, LTLIB${NAME} have been
++ dnl computed. So it has to be reset here.
++ HAVE_LIB[]NAME=
+ rpathdirs=
+ ltrpathdirs=
+ names_already_handled=
+@@ -267,6 +312,9 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
+ fi
+ fi
+ fi
++ dnl Just let the compiler find the library, the compiler and user are smarter then this script
++ dnl when cross compiling and working with a relocated install.
++ found_dir=""
+ if test "X$found_dir" = "X"; then
+ for x in $LDFLAGS $LTLIB[]NAME; do
+ AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
+@@ -327,7 +375,9 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
+ dnl Linking with a shared library. We attempt to hardcode its
+ dnl directory into the executable's runpath, unless it's the
+ dnl standard /usr/lib.
+- if test "$enable_rpath" = no || test "X$found_dir" = "X/usr/$acl_libdirstem"; then
++ if test "$enable_rpath" = no \
++ || test "X$found_dir" = "X/usr/$acl_libdirstem" \
++ || test "X$found_dir" = "X/usr/$acl_libdirstem2"; then
+ dnl No hardcoding is needed.
+ LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
+ else
+@@ -415,7 +465,16 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
+ case "$found_dir" in
+ */$acl_libdirstem | */$acl_libdirstem/)
+ basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem/"'*$,,'`
+- LIB[]NAME[]_PREFIX="$basedir"
++ if test "$name" = '$1'; then
++ LIB[]NAME[]_PREFIX="$basedir"
++ fi
++ additional_includedir="$basedir/include"
++ ;;
++ */$acl_libdirstem2 | */$acl_libdirstem2/)
++ basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem2/"'*$,,'`
++ if test "$name" = '$1'; then
++ LIB[]NAME[]_PREFIX="$basedir"
++ fi
+ additional_includedir="$basedir/include"
+ ;;
+ esac
+@@ -476,9 +535,11 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
+ dnl 3. if it's already present in $LDFLAGS or the already
+ dnl constructed $LIBNAME,
+ dnl 4. if it doesn't exist as a directory.
+- if test "X$additional_libdir" != "X/usr/$acl_libdirstem"; then
++ if test "X$additional_libdir" != "X/usr/$acl_libdirstem" \
++ && test "X$additional_libdir" != "X/usr/$acl_libdirstem2"; then
+ haveit=
+- if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem"; then
++ if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem" \
++ || test "X$additional_libdir" = "X/usr/local/$acl_libdirstem2"; then
+ if test -n "$GCC"; then
+ case $host_os in
+ linux* | gnu* | k*bsd*-gnu) haveit=yes;;
+@@ -609,6 +670,11 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
+ LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-R$found_dir"
+ done
+ fi
++ popdef([P_A_C_K])
++ popdef([PACKLIBS])
++ popdef([PACKUP])
++ popdef([PACK])
++ popdef([NAME])
+ ])
+
+ dnl AC_LIB_APPENDTOVAR(VAR, CONTENTS) appends the elements of CONTENTS to VAR,
+@@ -654,7 +720,8 @@ AC_DEFUN([AC_LIB_LINKFLAGS_FROM_LIBS],
+ if test -n "$next"; then
+ dir="$next"
+ dnl No need to hardcode the standard /usr/lib.
+- if test "X$dir" != "X/usr/$acl_libdirstem"; then
++ if test "X$dir" != "X/usr/$acl_libdirstem" \
++ && test "X$dir" != "X/usr/$acl_libdirstem2"; then
+ rpathdirs="$rpathdirs $dir"
+ fi
+ next=
+@@ -663,7 +730,8 @@ AC_DEFUN([AC_LIB_LINKFLAGS_FROM_LIBS],
+ -L) next=yes ;;
+ -L*) dir=`echo "X$opt" | sed -e 's,^X-L,,'`
+ dnl No need to hardcode the standard /usr/lib.
+- if test "X$dir" != "X/usr/$acl_libdirstem"; then
++ if test "X$dir" != "X/usr/$acl_libdirstem" \
++ && test "X$dir" != "X/usr/$acl_libdirstem2"; then
+ rpathdirs="$rpathdirs $dir"
+ fi
+ next= ;;
+diff -Nurp -x '*.o' -x '*.gmo' -x '*.po' -x '*~' gstreamer-0.10.28.org/common/m4/lib-prefix.m4 gstreamer-0.10.28/common/m4/lib-prefix.m4
+--- gstreamer-0.10.28.org/common/m4/lib-prefix.m4 2010-03-08 08:58:16.000000000 -0800
++++ gstreamer-0.10.28/common/m4/lib-prefix.m4 2010-05-22 08:37:17.773783356 -0700
+@@ -1,5 +1,5 @@
+-# lib-prefix.m4 serial 5 (gettext-0.15)
+-dnl Copyright (C) 2001-2005 Free Software Foundation, Inc.
++# lib-prefix.m4 serial 7 (gettext-0.18)
++dnl Copyright (C) 2001-2005, 2008-2010 Free Software Foundation, Inc.
+ dnl This file is free software; the Free Software Foundation
+ dnl gives unlimited permission to copy and/or distribute it,
+ dnl with or without modifications, as long as this notice is preserved.
+@@ -153,33 +153,72 @@ AC_DEFUN([AC_LIB_WITH_FINAL_PREFIX],
+ prefix="$acl_save_prefix"
+ ])
+
+-dnl AC_LIB_PREPARE_MULTILIB creates a variable acl_libdirstem, containing
+-dnl the basename of the libdir, either "lib" or "lib64".
++dnl AC_LIB_PREPARE_MULTILIB creates
++dnl - a variable acl_libdirstem, containing the basename of the libdir, either
++dnl "lib" or "lib64" or "lib/64",
++dnl - a variable acl_libdirstem2, as a secondary possible value for
++dnl acl_libdirstem, either the same as acl_libdirstem or "lib/sparcv9" or
++dnl "lib/amd64".
+ AC_DEFUN([AC_LIB_PREPARE_MULTILIB],
+ [
+- dnl There is no formal standard regarding lib and lib64. The current
+- dnl practice is that on a system supporting 32-bit and 64-bit instruction
+- dnl sets or ABIs, 64-bit libraries go under $prefix/lib64 and 32-bit
+- dnl libraries go under $prefix/lib. We determine the compiler's default
+- dnl mode by looking at the compiler's library search path. If at least
+- dnl of its elements ends in /lib64 or points to a directory whose absolute
+- dnl pathname ends in /lib64, we assume a 64-bit ABI. Otherwise we use the
+- dnl default, namely "lib".
++ dnl There is no formal standard regarding lib and lib64.
++ dnl On glibc systems, the current practice is that on a system supporting
++ dnl 32-bit and 64-bit instruction sets or ABIs, 64-bit libraries go under
++ dnl $prefix/lib64 and 32-bit libraries go under $prefix/lib. We determine
++ dnl the compiler's default mode by looking at the compiler's library search
++ dnl path. If at least one of its elements ends in /lib64 or points to a
++ dnl directory whose absolute pathname ends in /lib64, we assume a 64-bit ABI.
++ dnl Otherwise we use the default, namely "lib".
++ dnl On Solaris systems, the current practice is that on a system supporting
++ dnl 32-bit and 64-bit instruction sets or ABIs, 64-bit libraries go under
++ dnl $prefix/lib/64 (which is a symlink to either $prefix/lib/sparcv9 or
++ dnl $prefix/lib/amd64) and 32-bit libraries go under $prefix/lib.
++ AC_REQUIRE([AC_CANONICAL_HOST])
+ acl_libdirstem=lib
+- searchpath=`(LC_ALL=C $CC -print-search-dirs) 2>/dev/null | sed -n -e 's,^libraries: ,,p' | sed -e 's,^=,,'`
+- if test -n "$searchpath"; then
+- acl_save_IFS="${IFS= }"; IFS=":"
+- for searchdir in $searchpath; do
+- if test -d "$searchdir"; then
+- case "$searchdir" in
+- */lib64/ | */lib64 ) acl_libdirstem=lib64 ;;
+- *) searchdir=`cd "$searchdir" && pwd`
+- case "$searchdir" in
+- */lib64 ) acl_libdirstem=lib64 ;;
+- esac ;;
++ acl_libdirstem2=
++ case "$host_os" in
++ solaris*)
++ dnl See Solaris 10 Software Developer Collection > Solaris 64-bit Developer's Guide > The Development Environment
++ dnl <http://docs.sun.com/app/docs/doc/816-5138/dev-env?l=en&a=view>.
++ dnl "Portable Makefiles should refer to any library directories using the 64 symbolic link."
++ dnl But we want to recognize the sparcv9 or amd64 subdirectory also if the
++ dnl symlink is missing, so we set acl_libdirstem2 too.
++ AC_CACHE_CHECK([for 64-bit host], [gl_cv_solaris_64bit],
++ [AC_EGREP_CPP([sixtyfour bits], [
++#ifdef _LP64
++sixtyfour bits
++#endif
++ ], [gl_cv_solaris_64bit=yes], [gl_cv_solaris_64bit=no])
++ ])
++ if test $gl_cv_solaris_64bit = yes; then
++ acl_libdirstem=lib/64
++ case "$host_cpu" in
++ sparc*) acl_libdirstem2=lib/sparcv9 ;;
++ i*86 | x86_64) acl_libdirstem2=lib/amd64 ;;
+ esac
+ fi
+- done
+- IFS="$acl_save_IFS"
+- fi
++ ;;
++ *)
++ searchpath=`(LC_ALL=C $CC -print-search-dirs) 2>/dev/null | sed -n -e 's,^libraries: ,,p' | sed -e 's,^=,,'`
++ if test -n "$searchpath"; then
++ acl_save_IFS="${IFS= }"; IFS=":"
++ for searchdir in $searchpath; do
++ if test -d "$searchdir"; then
++ case "$searchdir" in
++ */lib64/ | */lib64 ) acl_libdirstem=lib64 ;;
++ */../ | */.. )
++ # Better ignore directories of this form. They are misleading.
++ ;;
++ *) searchdir=`cd "$searchdir" && pwd`
++ case "$searchdir" in
++ */lib64 ) acl_libdirstem=lib64 ;;
++ esac ;;
++ esac
++ fi
++ done
++ IFS="$acl_save_IFS"
++ fi
++ ;;
++ esac
++ test -n "$acl_libdirstem2" || acl_libdirstem2="$acl_libdirstem"
+ ])
+diff -Nurp -x '*.o' -x '*.gmo' -x '*.po' -x '*~' gstreamer-0.10.28.org/common/m4/nls.m4 gstreamer-0.10.28/common/m4/nls.m4
+--- gstreamer-0.10.28.org/common/m4/nls.m4 2010-03-08 08:58:16.000000000 -0800
++++ gstreamer-0.10.28/common/m4/nls.m4 2010-05-22 08:37:17.793786388 -0700
+@@ -1,5 +1,6 @@
+-# nls.m4 serial 3 (gettext-0.15)
+-dnl Copyright (C) 1995-2003, 2005-2006 Free Software Foundation, Inc.
++# nls.m4 serial 5 (gettext-0.18)
++dnl Copyright (C) 1995-2003, 2005-2006, 2008-2010 Free Software Foundation,
++dnl Inc.
+ dnl This file is free software; the Free Software Foundation
+ dnl gives unlimited permission to copy and/or distribute it,
+ dnl with or without modifications, as long as this notice is preserved.
+@@ -17,15 +18,15 @@ dnl Authors:
+ dnl Ulrich Drepper <drepper@cygnus.com>, 1995-2000.
+ dnl Bruno Haible <haible@clisp.cons.org>, 2000-2003.
+
+-AC_PREREQ(2.50)
++AC_PREREQ([2.50])
+
+ AC_DEFUN([AM_NLS],
+ [
+ AC_MSG_CHECKING([whether NLS is requested])
+ dnl Default is enabled NLS
+- AC_ARG_ENABLE(nls,
++ AC_ARG_ENABLE([nls],
+ [ --disable-nls do not use Native Language Support],
+ USE_NLS=$enableval, USE_NLS=yes)
+- AC_MSG_RESULT($USE_NLS)
+- AC_SUBST(USE_NLS)
++ AC_MSG_RESULT([$USE_NLS])
++ AC_SUBST([USE_NLS])
+ ])
+diff -Nurp -x '*.o' -x '*.gmo' -x '*.po' -x '*~' gstreamer-0.10.28.org/common/m4/po.m4 gstreamer-0.10.28/common/m4/po.m4
+--- gstreamer-0.10.28.org/common/m4/po.m4 2010-03-08 08:58:16.000000000 -0800
++++ gstreamer-0.10.28/common/m4/po.m4 2010-05-22 08:37:17.803788218 -0700
+@@ -1,5 +1,5 @@
+-# po.m4 serial 15 (gettext-0.17)
+-dnl Copyright (C) 1995-2007 Free Software Foundation, Inc.
++# po.m4 serial 17 (gettext-0.18)
++dnl Copyright (C) 1995-2010 Free Software Foundation, Inc.
+ dnl This file is free software; the Free Software Foundation
+ dnl gives unlimited permission to copy and/or distribute it,
+ dnl with or without modifications, as long as this notice is preserved.
+@@ -17,7 +17,7 @@ dnl Authors:
+ dnl Ulrich Drepper <drepper@cygnus.com>, 1995-2000.
+ dnl Bruno Haible <haible@clisp.cons.org>, 2000-2003.
+
+-AC_PREREQ(2.50)
++AC_PREREQ([2.50])
+
+ dnl Checks for all prerequisites of the po subdirectory.
+ AC_DEFUN([AM_PO_SUBDIRS],
+@@ -29,7 +29,7 @@ AC_DEFUN([AM_PO_SUBDIRS],
+
+ dnl Release version of the gettext macros. This is used to ensure that
+ dnl the gettext macros and po/Makefile.in.in are in sync.
+- AC_SUBST([GETTEXT_MACRO_VERSION], [0.17])
++ AC_SUBST([GETTEXT_MACRO_VERSION], [0.18])
+
+ dnl Perform the following tests also if --disable-nls has been given,
+ dnl because they are needed for "make dist" to work.
+@@ -41,7 +41,7 @@ AC_DEFUN([AM_PO_SUBDIRS],
+ [$ac_dir/$ac_word --statistics /dev/null >&]AS_MESSAGE_LOG_FD[ 2>&1 &&
+ (if $ac_dir/$ac_word --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi)],
+ :)
+- AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
++ AC_PATH_PROG([GMSGFMT], [gmsgfmt], [$MSGFMT])
+
+ dnl Test whether it is GNU msgfmt >= 0.15.
+ changequote(,)dnl
+diff -Nurp -x '*.o' -x '*.gmo' -x '*.po' -x '*~' gstreamer-0.10.28.org/common/m4/progtest.m4 gstreamer-0.10.28/common/m4/progtest.m4
+--- gstreamer-0.10.28.org/common/m4/progtest.m4 2010-03-08 08:58:16.000000000 -0800
++++ gstreamer-0.10.28/common/m4/progtest.m4 2010-05-22 08:37:17.833809771 -0700
+@@ -1,5 +1,5 @@
+-# progtest.m4 serial 4 (gettext-0.14.2)
+-dnl Copyright (C) 1996-2003, 2005 Free Software Foundation, Inc.
++# progtest.m4 serial 6 (gettext-0.18)
++dnl Copyright (C) 1996-2003, 2005, 2008-2010 Free Software Foundation, Inc.
+ dnl This file is free software; the Free Software Foundation
+ dnl gives unlimited permission to copy and/or distribute it,
+ dnl with or without modifications, as long as this notice is preserved.
+@@ -16,7 +16,7 @@ dnl They are *not* in the public domain.
+ dnl Authors:
+ dnl Ulrich Drepper <drepper@cygnus.com>, 1996.
+
+-AC_PREREQ(2.50)
++AC_PREREQ([2.50])
+
+ # Search path for a program which passes the given test.
+
+@@ -55,7 +55,7 @@ rm -f conf$$.file
+ # Extract the first word of "$2", so it can be a program name with args.
+ set dummy $2; ac_word=[$]2
+ AC_MSG_CHECKING([for $ac_word])
+-AC_CACHE_VAL(ac_cv_path_$1,
++AC_CACHE_VAL([ac_cv_path_$1],
+ [case "[$]$1" in
+ [[\\/]]* | ?:[[\\/]]*)
+ ac_cv_path_$1="[$]$1" # Let the user override the test with a path.
+@@ -84,9 +84,9 @@ ifelse([$4], , , [ test -z "[$]ac_cv_pa
+ esac])dnl
+ $1="$ac_cv_path_$1"
+ if test ifelse([$4], , [-n "[$]$1"], ["[$]$1" != "$4"]); then
+- AC_MSG_RESULT([$]$1)
++ AC_MSG_RESULT([$][$1])
+ else
+- AC_MSG_RESULT(no)
++ AC_MSG_RESULT([no])
+ fi
+-AC_SUBST($1)dnl
++AC_SUBST([$1])dnl
+ ])
+diff -Nurp -x '*.o' -x '*.gmo' -x '*.po' -x '*~' gstreamer-0.10.28.org/configure.ac gstreamer-0.10.28/configure.ac
+--- gstreamer-0.10.28.org/configure.ac 2010-03-08 14:52:43.000000000 -0800
++++ gstreamer-0.10.28/configure.ac 2010-05-22 08:37:17.873785452 -0700
+@@ -63,7 +63,7 @@ AC_SUBST(ACLOCAL_AMFLAGS, "-I common/m4
+
+ dnl set up gettext
+ dnl the version check needs to stay here because autopoint greps for it
+-AM_GNU_GETTEXT_VERSION([0.17])
++AM_GNU_GETTEXT_VERSION([0.18])
+ AM_GNU_GETTEXT([external])
+ AG_GST_GETTEXT([gstreamer-$GST_MAJORMINOR])
+
+diff -Nurp -x '*.o' -x '*.gmo' -x '*.po' -x '*~' gstreamer-0.10.28.org/gst-element-check-0.10.m4 gstreamer-0.10.28/gst-element-check-0.10.m4
+--- gstreamer-0.10.28.org/gst-element-check-0.10.m4 1969-12-31 16:00:00.000000000 -0800
++++ gstreamer-0.10.28/gst-element-check-0.10.m4 2010-05-22 08:38:27.301286153 -0700
+@@ -0,0 +1,23 @@
++dnl Perform a check for a GStreamer element using gst-inspect
++dnl Thomas Vander Stichele <thomas at apestaart dot org>
++dnl Last modification: 25/01/2005
++
++dnl AM_GST_ELEMENT_CHECK(ELEMENT-NAME, ACTION-IF-FOUND, ACTION-IF-NOT-FOUND)
++
++AC_DEFUN([AM_GST_ELEMENT_CHECK],
++[
++ if test "x$GST_INSPECT" == "x"; then
++ AC_CHECK_PROG(GST_INSPECT, gst-inspect-0.10, gst-inspect-0.10, [])
++ fi
++
++ if test "x$GST_INSPECT" != "x"; then
++ AC_MSG_CHECKING(GStreamer 0.10 element $1)
++ if [ $GST_INSPECT $1 > /dev/null 2> /dev/null ]; then
++ AC_MSG_RESULT(found.)
++ $2
++ else
++ AC_MSG_RESULT(not found.)
++ $3
++ fi
++ fi
++])
+Binary files gstreamer-0.10.28.org/libs/gst/check/.libs/libgstcheck-0.10.a and gstreamer-0.10.28/libs/gst/check/.libs/libgstcheck-0.10.a differ
+diff -Nurp -x '*.o' -x '*.gmo' -x '*.po' -x '*~' gstreamer-0.10.28.org/po/ChangeLog gstreamer-0.10.28/po/ChangeLog
+--- gstreamer-0.10.28.org/po/ChangeLog 1969-12-31 16:00:00.000000000 -0800
++++ gstreamer-0.10.28/po/ChangeLog 2010-05-22 08:37:16.941476173 -0700
+@@ -0,0 +1,5 @@
++2010-05-22 gettextize <bug-gnu-gettext@gnu.org>
++
++ * Makefile.in.in: Upgrade to gettext-0.18.
++ * Rules-quot: Upgrade to gettext-0.18.
++
+diff -Nurp -x '*.o' -x '*.gmo' -x '*.po' -x '*~' gstreamer-0.10.28.org/po/Makefile.in.in gstreamer-0.10.28/po/Makefile.in.in
+--- gstreamer-0.10.28.org/po/Makefile.in.in 2010-03-08 13:31:23.000000000 -0800
++++ gstreamer-0.10.28/po/Makefile.in.in 2010-05-22 08:37:16.801299560 -0700
+@@ -1,5 +1,5 @@
+ # Makefile for PO directory in any package using GNU gettext.
+-# Copyright (C) 1995-1997, 2000-2007 by Ulrich Drepper <drepper@gnu.ai.mit.edu>
++# Copyright (C) 1995-1997, 2000-2007, 2009-2010 by Ulrich Drepper <drepper@gnu.ai.mit.edu>
+ #
+ # This file can be copied and used freely without restrictions. It can
+ # be used in projects which are not available under the GNU General Public
+@@ -8,16 +8,13 @@
+ # Please note that the actual code of GNU gettext is covered by the GNU
+ # General Public License and is *not* in the public domain.
+ #
+-# Origin: gettext-0.17
+-GETTEXT_MACRO_VERSION = 0.17
++# Origin: gettext-0.18
++GETTEXT_MACRO_VERSION = 0.18
+
+ PACKAGE = @PACKAGE@
+ VERSION = @VERSION@
+ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+
+-# thomas: add GETTEXT_PACKAGE substitution as used in Makevars
+-GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+-
+ SHELL = /bin/sh
+ @SET_MAKE@
+
+@@ -91,8 +88,8 @@ CATALOGS = @CATALOGS@
+ .po.gmo:
+ @lang=`echo $* | sed -e 's,.*/,,'`; \
+ test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \
+- echo "$${cdcmd}rm -f $${lang}.gmo && $(GMSGFMT) -c --statistics -o $${lang}.gmo $${lang}.po"; \
+- cd $(srcdir) && rm -f $${lang}.gmo && $(GMSGFMT) -c --statistics -o t-$${lang}.gmo $${lang}.po && mv t-$${lang}.gmo $${lang}.gmo
++ echo "$${cdcmd}rm -f $${lang}.gmo && $(GMSGFMT) -c --statistics --verbose -o $${lang}.gmo $${lang}.po"; \
++ cd $(srcdir) && rm -f $${lang}.gmo && $(GMSGFMT) -c --statistics --verbose -o t-$${lang}.gmo $${lang}.po && mv t-$${lang}.gmo $${lang}.gmo
+
+ .sin.sed:
+ sed -e '/^#/d' $< > t-$@
+@@ -196,8 +193,15 @@ $(POFILES): $(srcdir)/$(DOMAIN).pot
+ @lang=`echo $@ | sed -e 's,.*/,,' -e 's/\.po$$//'`; \
+ if test -f "$(srcdir)/$${lang}.po"; then \
+ test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \
+- echo "$${cdcmd}$(MSGMERGE_UPDATE) $${lang}.po $(DOMAIN).pot"; \
+- cd $(srcdir) && $(MSGMERGE_UPDATE) $${lang}.po $(DOMAIN).pot; \
++ echo "$${cdcmd}$(MSGMERGE_UPDATE) $(MSGMERGE_OPTIONS) --lang=$${lang} $${lang}.po $(DOMAIN).pot"; \
++ cd $(srcdir) \
++ && { case `$(MSGMERGE_UPDATE) --version | sed 1q | sed -e 's,^[^0-9]*,,'` in \
++ '' | 0.[0-9] | 0.[0-9].* | 0.1[0-7] | 0.1[0-7].*) \
++ $(MSGMERGE_UPDATE) $(MSGMERGE_OPTIONS) $${lang}.po $(DOMAIN).pot;; \
++ *) \
++ $(MSGMERGE_UPDATE) $(MSGMERGE_OPTIONS) --lang=$${lang} $${lang}.po $(DOMAIN).pot;; \
++ esac; \
++ }; \
+ else \
+ $(MAKE) $${lang}.po-create; \
+ fi
+@@ -220,7 +224,6 @@ install-data: install-data-@USE_NLS@
+ fi
+ install-data-no: all
+ install-data-yes: all
+- $(mkdir_p) $(DESTDIR)$(datadir)
+ @catalogs='$(CATALOGS)'; \
+ for cat in $$catalogs; do \
+ cat=`basename $$cat`; \
+@@ -272,7 +275,6 @@ installdirs-data: installdirs-data-@USE_
+ fi
+ installdirs-data-no:
+ installdirs-data-yes:
+- $(mkdir_p) $(DESTDIR)$(datadir)
+ @catalogs='$(CATALOGS)'; \
+ for cat in $$catalogs; do \
+ cat=`basename $$cat`; \
+@@ -398,9 +400,15 @@ update-po: Makefile
+ tmpdir=`pwd`; \
+ echo "$$lang:"; \
+ test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \
+- echo "$${cdcmd}$(MSGMERGE) $$lang.po $(DOMAIN).pot -o $$lang.new.po"; \
++ echo "$${cdcmd}$(MSGMERGE) $(MSGMERGE_OPTIONS) --lang=$$lang $$lang.po $(DOMAIN).pot -o $$lang.new.po"; \
+ cd $(srcdir); \
+- if $(MSGMERGE) $$lang.po $(DOMAIN).pot -o $$tmpdir/$$lang.new.po; then \
++ if { case `$(MSGMERGE) --version | sed 1q | sed -e 's,^[^0-9]*,,'` in \
++ '' | 0.[0-9] | 0.[0-9].* | 0.1[0-7] | 0.1[0-7].*) \
++ $(MSGMERGE) $(MSGMERGE_OPTIONS) -o $$tmpdir/$$lang.new.po $$lang.po $(DOMAIN).pot;; \
++ *) \
++ $(MSGMERGE) $(MSGMERGE_OPTIONS) --lang=$$lang -o $$tmpdir/$$lang.new.po $$lang.po $(DOMAIN).pot;; \
++ esac; \
++ }; then \
+ if cmp $$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \
+ rm -f $$tmpdir/$$lang.new.po; \
+ else \
+@@ -421,9 +429,13 @@ $(DUMMYPOFILES):
+ update-gmo: Makefile $(GMOFILES)
+ @:
+
++# Recreate Makefile by invoking config.status. Explicitly invoke the shell,
++# because execution permission bits may not work on the current file system.
++# Use @SHELL@, which is the shell determined by autoconf for the use by its
++# scripts, not $(SHELL) which is hardwired to /bin/sh and may be deficient.
+ Makefile: Makefile.in.in Makevars $(top_builddir)/config.status @POMAKEFILEDEPS@
+ cd $(top_builddir) \
+- && $(SHELL) ./config.status $(subdir)/$@.in po-directories
++ && @SHELL@ ./config.status $(subdir)/$@.in po-directories
+
+ force:
+
+diff -Nurp -x '*.o' -x '*.gmo' -x '*.po' -x '*~' gstreamer-0.10.28.org/po/Rules-quot gstreamer-0.10.28/po/Rules-quot
+--- gstreamer-0.10.28.org/po/Rules-quot 2010-03-08 08:58:17.000000000 -0800
++++ gstreamer-0.10.28/po/Rules-quot 2010-05-22 08:37:16.941476173 -0700
+@@ -20,7 +20,7 @@ en@boldquot.po-update: en@boldquot.po-up
+ ll=`echo $$lang | sed -e 's/@.*//'`; \
+ LC_ALL=C; export LC_ALL; \
+ cd $(srcdir); \
+- if $(MSGINIT) -i $(DOMAIN).pot --no-translator -l $$ll -o - 2>/dev/null | sed -f $$tmpdir/$$lang.insert-header | $(MSGCONV) -t UTF-8 | $(MSGFILTER) sed -f `echo $$lang | sed -e 's/.*@//'`.sed 2>/dev/null > $$tmpdir/$$lang.new.po; then \
++ if $(MSGINIT) -i $(DOMAIN).pot --no-translator -l $$lang -o - 2>/dev/null | sed -f $$tmpdir/$$lang.insert-header | $(MSGCONV) -t UTF-8 | $(MSGFILTER) sed -f `echo $$lang | sed -e 's/.*@//'`.sed 2>/dev/null > $$tmpdir/$$lang.new.po; then \
+ if cmp $$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \
+ rm -f $$tmpdir/$$lang.new.po; \
+ else \
+--- gstreamer-0.10.28.org/ChangeLog 2010-03-08 14:54:29.000000000 -0800
++++ gstreamer-0.10.28/ChangeLog 2010-05-22 09:06:29.863813510 -0700
+@@ -1,3 +1,15 @@
++2010-05-22 Khem Raj <raj.khem@gmail.com>
++
++ * common/m4/gettext.m4: Upgrade to gettext-0.18.
++ * common/m4/iconv.m4: Upgrade to gettext-0.18.
++ * common/m4/lib-ld.m4: Upgrade to gettext-0.18.
++ * common/m4/lib-link.m4: Upgrade to gettext-0.18.
++ * common/m4/lib-prefix.m4: Upgrade to gettext-0.18.
++ * common/m4/nls.m4: Upgrade to gettext-0.18.
++ * common/m4/po.m4: Upgrade to gettext-0.18.
++ * common/m4/progtest.m4: Upgrade to gettext-0.18.
++ * configure.ac (AM_GNU_GETTEXT_VERSION): Bump to 0.18.
++
+ === release 0.10.28 ===
+
+ 2010-03-08 Tim-Philipp Müller <tim.muller@collabora.co.uk>
diff --git a/recipes/gstreamer/gstreamer_0.10.28.bb b/recipes/gstreamer/gstreamer_0.10.28.bb
index c44646c..ababa47 100644
--- a/recipes/gstreamer/gstreamer_0.10.28.bb
+++ b/recipes/gstreamer/gstreamer_0.10.28.bb
@@ -1,5 +1,10 @@
require gstreamer.inc
+PR = "r1"
+
+SRC_URI += "file://use-gettext-0.18.patch \
+ "
+
SRC_URI[archive.md5sum] = "1c7accac718fe211ff91323c27d4ae02"
SRC_URI[archive.sha256sum] = "61613ec7574d22230e8cc893f91b66faec6b21288a22d2f21c9d9eeb7667eb2c"
--
1.7.0.4
^ permalink raw reply related [flat|nested] 45+ messages in thread
* [PATCH 13/16] ncurses: Add -fforward-propagate on arm.
2010-06-02 20:34 [PATCH 00/16] Upgrade gettext, GNU utilities, fix general build issues with uclibc distros Khem Raj
` (11 preceding siblings ...)
2010-06-02 20:34 ` [PATCH 12/16] gstreamer_0.10.28.bb: Fix to build with gettext 0.18 Khem Raj
@ 2010-06-02 20:34 ` Khem Raj
2010-06-04 7:41 ` Martin Jansa
2010-06-02 20:34 ` [PATCH 14/16] zlib.inc: " Khem Raj
` (4 subsequent siblings)
17 siblings, 1 reply; 45+ messages in thread
From: Khem Raj @ 2010-06-02 20:34 UTC (permalink / raw)
To: openembedded-devel
* Needed on -O1 compile. Generally we use -Os where
this option is already enabled. But we enable is anyway
so it gets picked at -O1 too which we use with DEBUG builds.
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
recipes/ncurses/ncurses.inc | 11 ++++++-----
recipes/ncurses/ncurses_5.4.bb | 2 +-
2 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/recipes/ncurses/ncurses.inc b/recipes/ncurses/ncurses.inc
index bfecfff..337d670 100644
--- a/recipes/ncurses/ncurses.inc
+++ b/recipes/ncurses/ncurses.inc
@@ -30,6 +30,12 @@ export BUILD_CCFLAGS = "-I${S}/ncurses -I${S}/include ${BUILD_CFLAGS}"
export BUILD_LDFLAGS = ""
export EXTRA_OEMAKE = '"BUILD_LDFLAGS=" "BUILD_CCFLAGS=${BUILD_CCFLAGS}"'
+# Below option is added to overcome the GCC bug on ARM
+# see http://gcc.gnu.org/PR42981 for further details.
+# We could potentially take it off when its fixed in gcc 4.5
+
+CFLAGS_append_arm = " -fforward-propagate "
+
# This is necessary so that the "tic" command executed during the install can
# link with the correct libary in staging.
export LD_LIBRARY_PATH = "${STAGING_LIBDIR_NATIVE}"
@@ -70,16 +76,12 @@ do_install() {
mv ${D}${bindir}/reset ${D}${bindir}/reset.${PN}
fi
}
-
-
pkg_postinst_ncurses-tools () {
if [ "${PN}" = "ncurses" ]; then
update-alternatives --install ${bindir}/clear clear clear.${PN} 100
update-alternatives --install ${bindir}/reset reset reset.${PN} 100
fi
}
-
-
pkg_prerm_ncurses-tools () {
if [ "${PN}" = "ncurses" ]; then
update-alternatives --remove clear clear.${PN}
@@ -110,7 +112,6 @@ FILES_${PN}-tools = "\
FILES_${PN}-terminfo = "\
${datadir}/terminfo \
"
-
RSUGGESTS_${PN} = "ncurses-terminfo"
RPROVIDES_${PN} = "libncurses5"
RCONFLICTS_${PN} = "libncurses5"
diff --git a/recipes/ncurses/ncurses_5.4.bb b/recipes/ncurses/ncurses_5.4.bb
index a6aed6d..8c0f62c 100644
--- a/recipes/ncurses/ncurses_5.4.bb
+++ b/recipes/ncurses/ncurses_5.4.bb
@@ -1,4 +1,4 @@
-PR = "r19"
+PR = "r20"
SRC_URI = "${GNU_MIRROR}/ncurses/ncurses-${PV}.tar.gz \
file://makefile_tweak.patch \
--
1.7.0.4
^ permalink raw reply related [flat|nested] 45+ messages in thread
* [PATCH 14/16] zlib.inc: Add -fforward-propagate on arm.
2010-06-02 20:34 [PATCH 00/16] Upgrade gettext, GNU utilities, fix general build issues with uclibc distros Khem Raj
` (12 preceding siblings ...)
2010-06-02 20:34 ` [PATCH 13/16] ncurses: Add -fforward-propagate on arm Khem Raj
@ 2010-06-02 20:34 ` Khem Raj
2010-06-04 7:42 ` Martin Jansa
2010-06-02 20:34 ` [PATCH 15/16] libx11_1.3.2.bb: " Khem Raj
` (3 subsequent siblings)
17 siblings, 1 reply; 45+ messages in thread
From: Khem Raj @ 2010-06-02 20:34 UTC (permalink / raw)
To: openembedded-devel
* Needed on -O1 compile. Generally we use -Os where
this option is already enabled. But we enable is anyway
so it gets picked at -O1 too which we use with DEBUG builds.
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
recipes/zlib/zlib.inc | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/recipes/zlib/zlib.inc b/recipes/zlib/zlib.inc
index 0f7bea0..5b00ccf 100644
--- a/recipes/zlib/zlib.inc
+++ b/recipes/zlib/zlib.inc
@@ -3,7 +3,13 @@ SECTION = "libs"
PRIORITY = "required"
HOMEPAGE = "http://www.gzip.org/zlib/"
LICENSE = "zlib"
-INC_PR ="r6"
+INC_PR ="r7"
+
+# Below option is added to overcome the GCC bug on ARM
+# see http://gcc.gnu.org/PR42981 for further details.
+# We could potentially take it off when its fixed in gcc 4.5
+
+CFLAGS_append_arm = " -fforward-propagate "
BBCLASSEXTEND = "native sdk"
--
1.7.0.4
^ permalink raw reply related [flat|nested] 45+ messages in thread
* [PATCH 15/16] libx11_1.3.2.bb: Add -fforward-propagate on arm.
2010-06-02 20:34 [PATCH 00/16] Upgrade gettext, GNU utilities, fix general build issues with uclibc distros Khem Raj
` (13 preceding siblings ...)
2010-06-02 20:34 ` [PATCH 14/16] zlib.inc: " Khem Raj
@ 2010-06-02 20:34 ` Khem Raj
2010-06-04 7:42 ` Martin Jansa
2010-06-02 20:34 ` [PATCH 16/16] shadow_4.1.4.2.bb: add --with-nscd=no when compiling for uclibc Khem Raj
` (2 subsequent siblings)
17 siblings, 1 reply; 45+ messages in thread
From: Khem Raj @ 2010-06-02 20:34 UTC (permalink / raw)
To: openembedded-devel
* Needed on -O1 compile. Generally we use -Os where
this option is already enabled. But we enable is anyway
so it gets picked at -O1 too which we use with DEBUG builds.
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
recipes/xorg-lib/libx11_1.3.2.bb | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/recipes/xorg-lib/libx11_1.3.2.bb b/recipes/xorg-lib/libx11_1.3.2.bb
index 855dfa2..291486b 100644
--- a/recipes/xorg-lib/libx11_1.3.2.bb
+++ b/recipes/xorg-lib/libx11_1.3.2.bb
@@ -5,7 +5,7 @@ DEPENDS += "bigreqsproto xproto xextproto xtrans libxau xcmiscproto \
libxdmcp xf86bigfontproto kbproto inputproto xproto-native"
PROVIDES = "virtual/libx11"
PE = "1"
-PR = "r3"
+PR = "r4"
XORG_PN = "libX11"
@@ -15,6 +15,12 @@ SRC_URI += "file://x11_disable_makekeys.1.6.3.patch \
EXTRA_OECONF += "--without-xcb --with-keysymdef=${STAGING_INCDIR}/X11/keysymdef.h"
+# Below option is added to overcome the GCC bug on ARM
+# see http://gcc.gnu.org/PR42981 for further details.
+# We could potentially take it off when its fixed in gcc 4.5
+
+CFLAGS_append_arm = " -fforward-propagate "
+
do_compile() {
(
unset CC LD CXX CCLD CFLAGS CPPFLAGS LDFLAGS CXXFLAGS
--
1.7.0.4
^ permalink raw reply related [flat|nested] 45+ messages in thread
* [PATCH 16/16] shadow_4.1.4.2.bb: add --with-nscd=no when compiling for uclibc
2010-06-02 20:34 [PATCH 00/16] Upgrade gettext, GNU utilities, fix general build issues with uclibc distros Khem Raj
` (14 preceding siblings ...)
2010-06-02 20:34 ` [PATCH 15/16] libx11_1.3.2.bb: " Khem Raj
@ 2010-06-02 20:34 ` Khem Raj
2010-06-04 7:45 ` [PATCH 00/16] Upgrade gettext, GNU utilities, fix general build issues with uclibc distros Martin Jansa
2010-06-05 18:15 ` Koen Kooi
17 siblings, 0 replies; 45+ messages in thread
From: Khem Raj @ 2010-06-02 20:34 UTC (permalink / raw)
To: openembedded-devel
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
recipes/shadow/shadow_4.1.4.2.bb | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/recipes/shadow/shadow_4.1.4.2.bb b/recipes/shadow/shadow_4.1.4.2.bb
index 05b3279..ebf54a7 100644
--- a/recipes/shadow/shadow_4.1.4.2.bb
+++ b/recipes/shadow/shadow_4.1.4.2.bb
@@ -1,8 +1,11 @@
require shadow.inc
-SRC_URI += " file://shadow.automake-1.11.patch"
+SRC_URI += "file://shadow.automake-1.11.patch \
+ "
PR = "${INC_PR}.1"
+EXTRA_OECONF_libc-uclibc += " --with-nscd=no "
+
SRC_URI[md5sum] = "d593a9cab93c48ee0a6ba056db8c1997"
SRC_URI[sha256sum] = "97987f6a7967a85e6aa0dba2a1d52db8bd69af5a717391de5693db768fb78990"
--
1.7.0.4
^ permalink raw reply related [flat|nested] 45+ messages in thread
* Re: [PATCH 06/16] db_5.0.21: Add recipes for target and native packages.
2010-06-02 20:34 ` [PATCH 06/16] db_5.0.21: Add recipes for target and native packages Khem Raj
@ 2010-06-02 20:41 ` Koen Kooi
2010-06-04 0:29 ` Khem Raj
0 siblings, 1 reply; 45+ messages in thread
From: Koen Kooi @ 2010-06-02 20:41 UTC (permalink / raw)
To: openembedded-devel
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
On 02-06-10 22:34, Khem Raj wrote:
> * Get rid of old style staging.
>
> Signed-off-by: Khem Raj <raj.khem@gmail.com>
> ---
> recipes/db/db-native_4.2.52.bb | 1 -
> recipes/db/db-native_5.0.21.bb | 2 +
Can these get converted to BBCLASSEXTEND?
regards,
Koen
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)
iD8DBQFMBsIIMkyGM64RGpERAqLBAJ9T1EGUDygy/NfaND/5EO0hSebLqgCfUPHo
7eD81HjkwQFLTl3APVx7mFg=
=mMkU
-----END PGP SIGNATURE-----
^ permalink raw reply [flat|nested] 45+ messages in thread
* Re: [PATCH 06/16] db_5.0.21: Add recipes for target and native packages.
2010-06-02 20:41 ` Koen Kooi
@ 2010-06-04 0:29 ` Khem Raj
2010-06-04 7:38 ` Martin Jansa
0 siblings, 1 reply; 45+ messages in thread
From: Khem Raj @ 2010-06-04 0:29 UTC (permalink / raw)
To: openembedded-devel
On (02/06/10 22:41), Koen Kooi wrote:
> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA1
>
> On 02-06-10 22:34, Khem Raj wrote:
> > * Get rid of old style staging.
> >
> > Signed-off-by: Khem Raj <raj.khem@gmail.com>
> > ---
> > recipes/db/db-native_4.2.52.bb | 1 -
> > recipes/db/db-native_5.0.21.bb | 2 +
>
> Can these get converted to BBCLASSEXTEND?
Yes. I have intended to do that afterwards
>
> regards,
>
> Koen
> -----BEGIN PGP SIGNATURE-----
> Version: GnuPG v1.4.5 (Darwin)
>
> iD8DBQFMBsIIMkyGM64RGpERAqLBAJ9T1EGUDygy/NfaND/5EO0hSebLqgCfUPHo
> 7eD81HjkwQFLTl3APVx7mFg=
> =mMkU
> -----END PGP SIGNATURE-----
>
>
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
^ permalink raw reply [flat|nested] 45+ messages in thread
* Re: [PATCH 01/16] classes/autotools.bbclass: Dont bail out if gettext/config.rpath does not exist.
2010-06-02 20:34 ` [PATCH 01/16] classes/autotools.bbclass: Dont bail out if gettext/config.rpath does not exist Khem Raj
@ 2010-06-04 7:35 ` Martin Jansa
0 siblings, 0 replies; 45+ messages in thread
From: Martin Jansa @ 2010-06-04 7:35 UTC (permalink / raw)
To: openembedded-devel
On Wed, Jun 2, 2010 at 10:34 PM, Khem Raj <raj.khem@gmail.com> wrote:
> * Add a note if this file does not exist. The reason is that gettext can
> needs libiconv and libiconv needs gettext so we need to solve this
> catch 22
>
> Signed-off-by: Khem Raj <raj.khem@gmail.com>
Acked-by: Martin Jansa <Martin.Jansa@gmail.com>
> ---
> classes/autotools.bbclass | 6 +++++-
> 1 files changed, 5 insertions(+), 1 deletions(-)
>
> diff --git a/classes/autotools.bbclass b/classes/autotools.bbclass
> index df2c114..8a5b982 100644
> --- a/classes/autotools.bbclass
> +++ b/classes/autotools.bbclass
> @@ -125,7 +125,11 @@ autotools_do_configure() {
> echo "no" | glib-gettextize --force --copy
> fi
> else if grep "^[[:space:]]*AM_GNU_GETTEXT" $CONFIGURE_AC >/dev/null; then
> - cp ${STAGING_DATADIR}/gettext/config.rpath ${S}/
> + if [ -e ${STAGING_DATADIR}/gettext/config.rpath ]; then
> + cp ${STAGING_DATADIR}/gettext/config.rpath ${S}/
> + else
> + oenote ${STAGING_DATADIR}/gettext/config.rpath not found. gettext is not installed.
> + fi
> fi
>
> fi
> --
> 1.7.0.4
>
>
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
>
^ permalink raw reply [flat|nested] 45+ messages in thread
* Re: [PATCH 02/16] classes/gettext.bbclass: Account for libiconv and libintl too.
2010-06-02 20:34 ` [PATCH 02/16] classes/gettext.bbclass: Account for libiconv and libintl too Khem Raj
@ 2010-06-04 7:36 ` Martin Jansa
0 siblings, 0 replies; 45+ messages in thread
From: Martin Jansa @ 2010-06-04 7:36 UTC (permalink / raw)
To: openembedded-devel
On Wed, Jun 2, 2010 at 10:34 PM, Khem Raj <raj.khem@gmail.com> wrote:
> Signed-off-by: Khem Raj <raj.khem@gmail.com>
Acked-by: Martin Jansa <Martin.Jansa@gmail.com>
> ---
> classes/gettext.bbclass | 4 ++--
> 1 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/classes/gettext.bbclass b/classes/gettext.bbclass
> index a40e74f..d0578b0 100644
> --- a/classes/gettext.bbclass
> +++ b/classes/gettext.bbclass
> @@ -4,14 +4,14 @@ def gettext_after_parse(d):
> cfg = oe_filter_out('^--(dis|en)able-nls$', bb.data.getVar('EXTRA_OECONF', d, 1) or "", d)
> cfg += " --disable-nls"
> depends = bb.data.getVar('DEPENDS', d, 1) or ""
> - bb.data.setVar('DEPENDS', oe_filter_out('^(virtual/libiconv|virtual/libintl)$', depends, d), d)
> + bb.data.setVar('DEPENDS', oe_filter_out('^(virtual/libiconv|virtual/libintl|gettext|gettext-native)$', depends, d), d)
> bb.data.setVar('EXTRA_OECONF', cfg, d)
>
> python () {
> gettext_after_parse(d)
> }
>
> -DEPENDS_GETTEXT = "gettext gettext-native"
> +DEPENDS_GETTEXT = "gettext gettext-native virtual/libiconv virtual/libintl"
>
> DEPENDS =+ "${DEPENDS_GETTEXT}"
> EXTRA_OECONF += "--enable-nls"
> --
> 1.7.0.4
>
>
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
>
^ permalink raw reply [flat|nested] 45+ messages in thread
* Re: [PATCH 03/16] gettext-0.18: Add recipe for 0.18
2010-06-02 20:34 ` [PATCH 03/16] gettext-0.18: Add recipe for 0.18 Khem Raj
@ 2010-06-04 7:37 ` Martin Jansa
2010-06-04 9:41 ` Martin Jansa
0 siblings, 1 reply; 45+ messages in thread
From: Martin Jansa @ 2010-06-04 7:37 UTC (permalink / raw)
To: openembedded-devel
On Wed, Jun 2, 2010 at 10:34 PM, Khem Raj <raj.khem@gmail.com> wrote:
> * gl_cv_func_unsetenv_works is not computed correctly in cross
> environment so cache it.
>
> Signed-off-by: Khem Raj <raj.khem@gmail.com>
Acked-by: Martin Jansa <Martin.Jansa@gmail.com>
> ---
> recipes/gettext/gettext-0.18/autotools.patch | 28 ++++++++++
> .../gettext-autoconf-lib-link-no-L.patch | 28 ++++++++++
> .../gettext-error_print_progname.patch | 13 +++++
> .../gnulib-uclibc-sched_param-def.patch | 19 +++++++
> recipes/gettext/gettext_0.18.bb | 57 ++++++++++++++++++++
> site/common-glibc | 3 +
> 6 files changed, 148 insertions(+), 0 deletions(-)
> create mode 100644 recipes/gettext/gettext-0.18/autotools.patch
> create mode 100644 recipes/gettext/gettext-0.18/gettext-autoconf-lib-link-no-L.patch
> create mode 100644 recipes/gettext/gettext-0.18/gettext-error_print_progname.patch
> create mode 100644 recipes/gettext/gettext-0.18/gnulib-uclibc-sched_param-def.patch
> create mode 100644 recipes/gettext/gettext_0.18.bb
>
> diff --git a/recipes/gettext/gettext-0.18/autotools.patch b/recipes/gettext/gettext-0.18/autotools.patch
> new file mode 100644
> index 0000000..8302b34
> --- /dev/null
> +++ b/recipes/gettext/gettext-0.18/autotools.patch
> @@ -0,0 +1,28 @@
> +Index: gettext-0.18/gettext-runtime/man/Makefile.am
> +===================================================================
> +--- gettext-0.18.orig/gettext-runtime/man/Makefile.am 2009-06-28 12:44:04.000000000 -0700
> ++++ gettext-0.18/gettext-runtime/man/Makefile.am 2010-05-18 16:58:51.130518057 -0700
> +@@ -159,8 +159,7 @@ bind_textdomain_codeset.3.html: bind_tex
> + $(MAN2HTML) $(srcdir)/bind_textdomain_codeset.3.in | sed -e '/CreationDate:/d' > t-$@
> + mv t-$@ $@
> +
> +-install-html-local:
> +- $(mkdir_p) $(DESTDIR)$(htmldir)
> ++install-html: installdirs-html
> + for file in $(man_HTML); do \
> + if test -f $$file; then dir=.; else dir=$(srcdir); fi; \
> + $(INSTALL_DATA) $$dir/$$file $(DESTDIR)$(htmldir)/$$file; \
> +Index: gettext-0.18/gettext-tools/man/Makefile.am
> +===================================================================
> +--- gettext-0.18.orig/gettext-tools/man/Makefile.am 2009-06-28 12:44:04.000000000 -0700
> ++++ gettext-0.18/gettext-tools/man/Makefile.am 2010-05-18 16:58:51.130518057 -0700
> +@@ -186,8 +186,7 @@ autopoint.1.html: autopoint.1
> + $(MAN2HTML) `if test -f autopoint.1; then echo .; else echo $(srcdir); fi`/autopoint.1 | sed -e '/CreationDate:/d' > t-$@
> + mv t-$@ $@
> +
> +-install-html-local:
> +- $(mkdir_p) $(DESTDIR)$(htmldir)
> ++install-html: installdirs-html
> + for file in $(man_HTML); do \
> + if test -f $$file; then dir=.; else dir=$(srcdir); fi; \
> + $(INSTALL_DATA) $$dir/$$file $(DESTDIR)$(htmldir)/$$file; \
> diff --git a/recipes/gettext/gettext-0.18/gettext-autoconf-lib-link-no-L.patch b/recipes/gettext/gettext-0.18/gettext-autoconf-lib-link-no-L.patch
> new file mode 100644
> index 0000000..d2063b0
> --- /dev/null
> +++ b/recipes/gettext/gettext-0.18/gettext-autoconf-lib-link-no-L.patch
> @@ -0,0 +1,28 @@
> +Index: gettext-0.18/gettext-runtime/gnulib-m4/lib-link.m4
> +===================================================================
> +--- gettext-0.18.orig/gettext-runtime/gnulib-m4/lib-link.m4 2010-05-18 17:12:12.593014616 -0700
> ++++ gettext-0.18/gettext-runtime/gnulib-m4/lib-link.m4 2010-05-18 17:12:58.631176939 -0700
> +@@ -312,6 +312,9 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
> + fi
> + fi
> + fi
> ++ dnl Just let the compiler find the library, the compiler and user are smarter then this script
> ++ dnl when cross compiling and working with a relocated install.
> ++ found_dir=""
> + if test "X$found_dir" = "X"; then
> + for x in $LDFLAGS $LTLIB[]NAME; do
> + AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
> +Index: gettext-0.18/gettext-tools/gnulib-m4/lib-link.m4
> +===================================================================
> +--- gettext-0.18.orig/gettext-tools/gnulib-m4/lib-link.m4 2010-05-18 17:12:12.633052946 -0700
> ++++ gettext-0.18/gettext-tools/gnulib-m4/lib-link.m4 2010-05-18 17:13:35.020559106 -0700
> +@@ -312,6 +312,9 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
> + fi
> + fi
> + fi
> ++ dnl Just let the compiler find the library, the compiler and user are smarter then this script
> ++ dnl when cross compiling and working with a relocated install.
> ++ found_dir=""
> + if test "X$found_dir" = "X"; then
> + for x in $LDFLAGS $LTLIB[]NAME; do
> + AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
> diff --git a/recipes/gettext/gettext-0.18/gettext-error_print_progname.patch b/recipes/gettext/gettext-0.18/gettext-error_print_progname.patch
> new file mode 100644
> index 0000000..0f67cd0
> --- /dev/null
> +++ b/recipes/gettext/gettext-0.18/gettext-error_print_progname.patch
> @@ -0,0 +1,13 @@
> +Index: gettext-0.17/gettext-tools/libgettextpo/error.h
> +===================================================================
> +--- gettext-0.17.orig/gettext-tools/libgettextpo/error.h 2008-07-27 21:16:25.561115527 +0200
> ++++ gettext-0.17/gettext-tools/libgettextpo/error.h 2008-07-27 21:16:52.454440505 +0200
> +@@ -49,7 +49,7 @@
> + /* If NULL, error will flush stdout, then print on stderr the program
> + name, a colon and a space. Otherwise, error will call this
> + function without parameters instead. */
> +-extern DLL_VARIABLE void (*error_print_progname) (void);
> ++void (*error_print_progname) (void);
> +
> + /* This variable is incremented each time `error' is called. */
> + extern DLL_VARIABLE unsigned int error_message_count;
> diff --git a/recipes/gettext/gettext-0.18/gnulib-uclibc-sched_param-def.patch b/recipes/gettext/gettext-0.18/gnulib-uclibc-sched_param-def.patch
> new file mode 100644
> index 0000000..074723a
> --- /dev/null
> +++ b/recipes/gettext/gettext-0.18/gnulib-uclibc-sched_param-def.patch
> @@ -0,0 +1,19 @@
> +uclibc defines __GLIBC__ but it does not expose struct shed_param as much as glibc
> +and is not needed too per standard. gnulib attempts to use it but we have to account
> +for it because in this case uclibc does not behave like glibc.
> +
> +-Khem
> +
> +Index: gettext-0.18/gettext-tools/gnulib-lib/spawn.in.h
> +===================================================================
> +--- gettext-0.18.orig/gettext-tools/gnulib-lib/spawn.in.h 2010-06-01 17:20:09.036427575 -0700
> ++++ gettext-0.18/gettext-tools/gnulib-lib/spawn.in.h 2010-06-01 17:20:38.856613943 -0700
> +@@ -31,7 +31,7 @@
> +
> + /* Get definitions of 'struct sched_param' and 'sigset_t'.
> + But avoid namespace pollution on glibc systems. */
> +-#ifndef __GLIBC__
> ++#if !defined __GLIBC__ || defined __UCLIBC__
> + # include <sched.h>
> + # include <signal.h>
> + #endif
> diff --git a/recipes/gettext/gettext_0.18.bb b/recipes/gettext/gettext_0.18.bb
> new file mode 100644
> index 0000000..5e22b5a
> --- /dev/null
> +++ b/recipes/gettext/gettext_0.18.bb
> @@ -0,0 +1,57 @@
> +DESCRIPTION = "The GNU internationalization library."
> +HOMEPAGE = "http://www.gnu.org/software/gettext/gettext.html"
> +SECTION = "libs"
> +LICENSE = "GPLv3"
> +PR = "r0"
> +DEPENDS = "gettext-native virtual/libiconv ncurses expat"
> +DEPENDS_virtclass-native = "libxml2-native"
> +PROVIDES = "virtual/libintl"
> +PROVIDES_virtclass-native = ""
> +RCONFLICTS_gettext-libintl = "proxy-libintl"
> +
> +BBCLASSEXTEND = "native nativesdk"
> +
> +SRC_URI = "${GNU_MIRROR}/gettext/gettext-${PV}.tar.gz \
> + file://autotools.patch \
> + file://gettext-autoconf-lib-link-no-L.patch \
> + file://gnulib-uclibc-sched_param-def.patch \
> + "
> +
> +SRC_URI_append_libc-uclibc = " file://gettext-error_print_progname.patch"
> +
> +PARALLEL_MAKE = ""
> +
> +inherit autotools
> +
> +EXTRA_OECONF += "--without-lispdir \
> + --disable-csharp \
> + --disable-libasprintf \
> + --disable-java \
> + --disable-native-java \
> + --disable-openmp \
> + --with-included-glib \
> + --without-emacs \
> + "
> +acpaths = '-I ${S}/gnulib-local/m4/ \
> + -I ${S}/gettext-runtime/m4 \
> + -I ${S}/gettext-tools/m4'
> +
> +
> +# these lack the .x behind the .so, but shouldn't be in the -dev package
> +# Otherwise you get the following results:
> +# 7.4M glibc/images/ep93xx/Angstrom-console-image-glibc-ipk-2008.1-test-20080104-ep93xx.rootfs.tar.gz
> +# 25M uclibc/images/ep93xx/Angstrom-console-image-uclibc-ipk-2008.1-test-20080104-ep93xx.rootfs.tar.gz
> +# because gettext depends on gettext-dev, which pulls in more -dev packages:
> +# 15228 KiB /ep93xx/libstdc++-dev_4.2.2-r2_ep93xx.ipk
> +# 1300 KiB /ep93xx/uclibc-dev_0.9.29-r8_ep93xx.ipk
> +# 140 KiB /armv4t/gettext-dev_0.14.1-r6_armv4t.ipk
> +# 4 KiB /ep93xx/libgcc-s-dev_4.2.2-r2_ep93xx.ipk
> +
> +PACKAGES =+ "gettext-libintl libgettextlib libgettextsrc"
> +
> +FILES_gettext-libintl = "${libdir}/libintl*.so.*"
> +FILES_libgettextlib = "${libdir}/libgettextlib-*.so*"
> +FILES_libgettextsrc = "${libdir}/libgettextsrc-*.so*"
> +
> +SRC_URI[md5sum] = "d52a3e061032a1ed13856d42fc86f0fd"
> +SRC_URI[sha256sum] = "02342c1de18c03c601f8b91cbd896b70486a4b945bd816f34541e0d7b5a96fe5"
> diff --git a/site/common-glibc b/site/common-glibc
> index b298e46..6dc2363 100644
> --- a/site/common-glibc
> +++ b/site/common-glibc
> @@ -22,6 +22,9 @@ ac_cv_func_vsnprintf_c99=${ac_cv_func_vsnprintf_c99=yes}
> glib_cv_compliant_posix_memalign=${glib_cv_compliant_posix_memalign=1}
> glib_cv_long_long_format=${glib_cv_long_long_format=ll}
>
> +# gettext
> +gl_cv_func_unsetenv_works=${gl_cv_func_unsetenv_works=yes}
> +
> #dbus-glib
> ac_cv_have_abstract_sockets=${ac_cv_have_abstract_sockets=yes}
>
> --
> 1.7.0.4
>
>
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
>
^ permalink raw reply [flat|nested] 45+ messages in thread
* Re: [PATCH 04/16] coreutils-8.5: Add recipes for version 8.5
2010-06-02 20:34 ` [PATCH 04/16] coreutils-8.5: Add recipes for version 8.5 Khem Raj
@ 2010-06-04 7:37 ` Martin Jansa
0 siblings, 0 replies; 45+ messages in thread
From: Martin Jansa @ 2010-06-04 7:37 UTC (permalink / raw)
To: openembedded-devel
On Wed, Jun 2, 2010 at 10:34 PM, Khem Raj <raj.khem@gmail.com> wrote:
> Signed-off-by: Khem Raj <raj.khem@gmail.com>
Acked-by: Martin Jansa <Martin.Jansa@gmail.com>
> ---
> recipes/coreutils/coreutils-8.5.inc | 7 +++
> recipes/coreutils/coreutils-8.5/onceonly.m4 | 63 +++++++++++++++++++++++++++
> recipes/coreutils/coreutils-native_8.5.bb | 4 ++
> recipes/coreutils/coreutils_8.5.bb | 4 ++
> 4 files changed, 78 insertions(+), 0 deletions(-)
> create mode 100644 recipes/coreutils/coreutils-8.5.inc
> create mode 100644 recipes/coreutils/coreutils-8.5/onceonly.m4
> create mode 100644 recipes/coreutils/coreutils-native_8.5.bb
> create mode 100644 recipes/coreutils/coreutils_8.5.bb
>
> diff --git a/recipes/coreutils/coreutils-8.5.inc b/recipes/coreutils/coreutils-8.5.inc
> new file mode 100644
> index 0000000..da57745
> --- /dev/null
> +++ b/recipes/coreutils/coreutils-8.5.inc
> @@ -0,0 +1,7 @@
> +require coreutils.inc
> +
> +SRC_URI = "ftp://ftp.gnu.org/gnu/coreutils/coreutils-${PV}.tar.gz \
> + "
> +SRC_URI[md5sum] = "c1ffe586d001e87d66cd80c4536ee823"
> +SRC_URI[sha256sum] = "dd243e2ac7d0ed203b170ecfb8299643779e7501fec2b45ae1cea8a450fa8ca0"
> +
> diff --git a/recipes/coreutils/coreutils-8.5/onceonly.m4 b/recipes/coreutils/coreutils-8.5/onceonly.m4
> new file mode 100644
> index 0000000..f6fec37
> --- /dev/null
> +++ b/recipes/coreutils/coreutils-8.5/onceonly.m4
> @@ -0,0 +1,63 @@
> +# onceonly.m4 serial 3
> +dnl Copyright (C) 2002, 2003 Free Software Foundation, Inc.
> +dnl This file is free software, distributed under the terms of the GNU
> +dnl General Public License. As a special exception to the GNU General
> +dnl Public License, this file may be distributed as part of a program
> +dnl that contains a configuration script generated by Autoconf, under
> +dnl the same distribution terms as the rest of that program.
> +
> +dnl This file defines some "once only" variants of standard autoconf macros.
> +dnl AC_CHECK_HEADERS_ONCE like AC_CHECK_HEADERS
> +dnl AC_CHECK_FUNCS_ONCE like AC_CHECK_FUNCS
> +dnl AC_CHECK_DECLS_ONCE like AC_CHECK_DECLS
> +dnl AC_REQUIRE([AC_HEADER_STDC]) like AC_HEADER_STDC
> +dnl The advantage is that the check for each of the headers/functions/decls
> +dnl will be put only once into the 'configure' file. It keeps the size of
> +dnl the 'configure' file down, and avoids redundant output when 'configure'
> +dnl is run.
> +dnl The drawback is that the checks cannot be conditionalized. If you write
> +dnl if some_condition; then gl_CHECK_HEADERS(stdlib.h); fi
> +dnl inside an AC_DEFUNed function, the gl_CHECK_HEADERS macro call expands to
> +dnl empty, and the check will be inserted before the body of the AC_DEFUNed
> +dnl function.
> +
> +dnl Autoconf version 2.57 or newer is recommended.
> +AC_PREREQ(2.54)
> +
> +# AC_CHECK_HEADERS_ONCE(HEADER1 HEADER2 ...) is a once-only variant of
> +# AC_CHECK_HEADERS(HEADER1 HEADER2 ...).
> +AC_DEFUN([AC_CHECK_HEADERS_ONCE], [
> + :
> + AC_FOREACH([gl_HEADER_NAME], [$1], [
> + AC_DEFUN([gl_CHECK_HEADER_]m4_quote(translit(defn([gl_HEADER_NAME]),
> + [-./], [___])), [
> + AC_CHECK_HEADERS(gl_HEADER_NAME)
> + ])
> + AC_REQUIRE([gl_CHECK_HEADER_]m4_quote(translit(gl_HEADER_NAME,
> + [-./], [___])))
> + ])
> +])
> +
> +# AC_CHECK_FUNCS_ONCE(FUNC1 FUNC2 ...) is a once-only variant of
> +# AC_CHECK_FUNCS(FUNC1 FUNC2 ...).
> +AC_DEFUN([AC_CHECK_FUNCS_ONCE], [
> + :
> + AC_FOREACH([gl_FUNC_NAME], [$1], [
> + AC_DEFUN([gl_CHECK_FUNC_]defn([gl_FUNC_NAME]), [
> + AC_CHECK_FUNCS(defn([gl_FUNC_NAME]))
> + ])
> + AC_REQUIRE([gl_CHECK_FUNC_]defn([gl_FUNC_NAME]))
> + ])
> +])
> +
> +# AC_CHECK_DECLS_ONCE(DECL1 DECL2 ...) is a once-only variant of
> +# AC_CHECK_DECLS(DECL1, DECL2, ...).
> +AC_DEFUN([AC_CHECK_DECLS_ONCE], [
> + :
> + AC_FOREACH([gl_DECL_NAME], [$1], [
> + AC_DEFUN([gl_CHECK_DECL_]defn([gl_DECL_NAME]), [
> + AC_CHECK_DECLS(defn([gl_DECL_NAME]))
> + ])
> + AC_REQUIRE([gl_CHECK_DECL_]defn([gl_DECL_NAME]))
> + ])
> +])
> diff --git a/recipes/coreutils/coreutils-native_8.5.bb b/recipes/coreutils/coreutils-native_8.5.bb
> new file mode 100644
> index 0000000..fbf416e
> --- /dev/null
> +++ b/recipes/coreutils/coreutils-native_8.5.bb
> @@ -0,0 +1,4 @@
> +require coreutils-${PV}.inc
> +require coreutils-native.inc
> +
> +PR = "r0"
> diff --git a/recipes/coreutils/coreutils_8.5.bb b/recipes/coreutils/coreutils_8.5.bb
> new file mode 100644
> index 0000000..b4025c2
> --- /dev/null
> +++ b/recipes/coreutils/coreutils_8.5.bb
> @@ -0,0 +1,4 @@
> +require coreutils-${PV}.inc
> +require coreutils-target.inc
> +
> +PR = "r0"
> --
> 1.7.0.4
>
>
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
>
^ permalink raw reply [flat|nested] 45+ messages in thread
* Re: [PATCH 05/16] libiconv-1.13.1: Add recipes
2010-06-02 20:34 ` [PATCH 05/16] libiconv-1.13.1: Add recipes Khem Raj
@ 2010-06-04 7:38 ` Martin Jansa
0 siblings, 0 replies; 45+ messages in thread
From: Martin Jansa @ 2010-06-04 7:38 UTC (permalink / raw)
To: openembedded-devel
On Wed, Jun 2, 2010 at 10:34 PM, Khem Raj <raj.khem@gmail.com> wrote:
> * Get rid of old style staging.
>
> Signed-off-by: Khem Raj <raj.khem@gmail.com>
Acked-by: Martin Jansa <Martin.Jansa@gmail.com>
> ---
> recipes/libiconv/libiconv-1.13.1/autoconf.patch | 834 +++++++++++++++++++++++
> recipes/libiconv/libiconv.inc | 15 +-
> recipes/libiconv/libiconv_1.12.bb | 10 +
> recipes/libiconv/libiconv_1.13.1.bb | 24 +
> 4 files changed, 870 insertions(+), 13 deletions(-)
> create mode 100644 recipes/libiconv/libiconv-1.13.1/autoconf.patch
> create mode 100644 recipes/libiconv/libiconv_1.13.1.bb
>
> diff --git a/recipes/libiconv/libiconv-1.13.1/autoconf.patch b/recipes/libiconv/libiconv-1.13.1/autoconf.patch
> new file mode 100644
> index 0000000..1c0efbf
> --- /dev/null
> +++ b/recipes/libiconv/libiconv-1.13.1/autoconf.patch
> @@ -0,0 +1,834 @@
> +Index: libiconv-1.13.1/configure.ac
> +===================================================================
> +--- libiconv-1.13.1.orig/configure.ac 2009-06-30 13:48:03.000000000 -0700
> ++++ libiconv-1.13.1/configure.ac 2010-06-01 02:57:31.301726190 -0700
> +@@ -23,7 +23,7 @@ AC_CONFIG_AUX_DIR([build-aux])
> + AM_INIT_AUTOMAKE([libiconv], [1.13.1])
> + AC_CONFIG_HEADERS([config.h lib/config.h])
> + AC_PROG_MAKE_SET
> +-
> ++AC_CONFIG_MACRO_DIR([m4])
> + dnl checks for basic programs
> +
> + AC_PROG_CC
> +Index: libiconv-1.13.1/libcharset/configure.ac
> +===================================================================
> +--- libiconv-1.13.1.orig/libcharset/configure.ac 2009-06-21 04:17:33.000000000 -0700
> ++++ libiconv-1.13.1/libcharset/configure.ac 2010-06-01 02:57:31.301726190 -0700
> +@@ -16,17 +16,17 @@ dnl along with the GNU CHARSET Library;
> + dnl write to the Free Software Foundation, Inc., 51 Franklin Street,
> + dnl Fifth Floor, Boston, MA 02110-1301, USA.
> +
> +-AC_PREREQ([2.13])
> ++AC_PREREQ(2.61)
> ++AC_INIT([libcharset],[1.4] )
> ++AC_CONFIG_SRCDIR([lib/localcharset.c])
> +
> +-PACKAGE=libcharset
> +-VERSION=1.4
> +-
> +-AC_INIT([lib/localcharset.c])
> + AC_CONFIG_AUX_DIR([build-aux])
> + AC_CONFIG_HEADER([config.h])
> + AC_PROG_MAKE_SET
> +-AC_SUBST([PACKAGE])
> +-AC_SUBST([VERSION])
> ++dnl AC_SUBST(PACKAGE)
> ++dnl AC_SUBST(VERSION)
> ++
> ++AC_CONFIG_MACRO_DIR([m4])
> +
> + dnl checks for basic programs
> +
> +Index: libiconv-1.13.1/libcharset/m4/libtool.m4
> +===================================================================
> +--- libiconv-1.13.1.orig/libcharset/m4/libtool.m4 2009-06-21 04:17:33.000000000 -0700
> ++++ libiconv-1.13.1/libcharset/m4/libtool.m4 2010-06-01 02:57:31.301726190 -0700
> +@@ -89,7 +89,8 @@ _LT_SET_OPTIONS([$0], [$1])
> + LIBTOOL_DEPS="$ltmain"
> +
> + # Always use our own libtool.
> +-LIBTOOL="${CONFIG_SHELL-$SHELL} "'$(top_builddir)/libtool'
> ++LIBTOOL='$(SHELL) $(top_builddir)'
> ++LIBTOOL="$LIBTOOL/$host_alias-libtool"
> + AC_SUBST(LIBTOOL)dnl
> +
> + _LT_SETUP
> +@@ -211,7 +212,7 @@ delay_single_quote_subst='s/'\''/'\'\\\\
> + no_glob_subst='s/\*/\\\*/g'
> +
> + # Global variables:
> +-ofile=libtool
> ++ofile=${host_alias}-libtool
> + can_build_shared=yes
> +
> + # All known linkers require a `.a' archive for static linking (except MSVC,
> +@@ -380,12 +381,12 @@ m4_define([lt_decl_dquote_varnames],
> + # lt_decl_varnames_tagged([SEPARATOR], [VARNAME1...])
> + # ---------------------------------------------------
> + m4_define([lt_decl_varnames_tagged],
> +-[m4_assert([$# <= 2])dnl
> +-_$0(m4_quote(m4_default([$1], [[, ]])),
> +- m4_ifval([$2], [[$2]], [m4_dquote(lt_decl_tag_varnames)]),
> +- m4_split(m4_normalize(m4_quote(_LT_TAGS)), [ ]))])
> +-m4_define([_lt_decl_varnames_tagged],
> +-[m4_ifval([$3], [lt_combine([$1], [$2], [_], $3)])])
> ++[_$0(m4_quote(m4_default([$1], [[, ]])),
> ++ m4_quote(m4_if([$2], [],
> ++ m4_quote(lt_decl_tag_varnames),
> ++ m4_quote(m4_shift($@)))),
> ++ m4_split(m4_normalize(m4_quote(_LT_TAGS))))])
> ++m4_define([_lt_decl_varnames_tagged], [lt_combine([$1], [$2], [_], $3)])
> +
> +
> + # lt_decl_all_varnames([SEPARATOR], [VARNAME1...])
> +@@ -990,11 +991,7 @@ m4_defun([_LT_DARWIN_LINKER_FEATURES],
> + _LT_TAGVAR(whole_archive_flag_spec, $1)=''
> + _LT_TAGVAR(link_all_deplibs, $1)=yes
> + _LT_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined"
> +- case $cc_basename in
> +- ifort*) _lt_dar_can_shared=yes ;;
> +- *) _lt_dar_can_shared=$GCC ;;
> +- esac
> +- if test "$_lt_dar_can_shared" = "yes"; then
> ++ if test "$GCC" = "yes"; then
> + output_verbose_link_cmd=echo
> + _LT_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
> + _LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
> +@@ -1516,7 +1513,7 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [d
> + lt_cv_sys_max_cmd_len=-1;
> + ;;
> +
> +- cygwin* | mingw* | cegcc*)
> ++ cygwin* | mingw*)
> + # On Win9x/ME, this test blows up -- it succeeds, but takes
> + # about 5 minutes as the teststring grows exponentially.
> + # Worse, since 9x/ME are not pre-emptively multitasking,
> +@@ -1684,6 +1681,10 @@ else
> + # endif
> + #endif
> +
> ++#ifdef __cplusplus
> ++extern "C" void exit (int);
> ++#endif
> ++
> + void fnord() { int i=42;}
> + int main ()
> + {
> +@@ -1699,7 +1700,7 @@ int main ()
> + else
> + puts (dlerror ());
> +
> +- return status;
> ++ exit (status);
> + }]
> + _LT_EOF
> + if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then
> +@@ -1738,7 +1739,7 @@ else
> + lt_cv_dlopen_self=yes
> + ;;
> +
> +- mingw* | pw32* | cegcc*)
> ++ mingw* | pw32*)
> + lt_cv_dlopen="LoadLibrary"
> + lt_cv_dlopen_libs=
> + ;;
> +@@ -2035,7 +2036,6 @@ m4_defun([_LT_SYS_DYNAMIC_LINKER],
> + [AC_REQUIRE([AC_CANONICAL_HOST])dnl
> + m4_require([_LT_DECL_EGREP])dnl
> + m4_require([_LT_FILEUTILS_DEFAULTS])dnl
> +-m4_require([_LT_DECL_OBJDUMP])dnl
> + m4_require([_LT_DECL_SED])dnl
> + AC_MSG_CHECKING([dynamic linker characteristics])
> + m4_if([$1],
> +@@ -2200,14 +2200,14 @@ bsdi[[45]]*)
> + # libtool to hard-code these into programs
> + ;;
> +
> +-cygwin* | mingw* | pw32* | cegcc*)
> ++cygwin* | mingw* | pw32*)
> + version_type=windows
> + shrext_cmds=".dll"
> + need_version=no
> + need_lib_prefix=no
> +
> + case $GCC,$host_os in
> +- yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
> ++ yes,cygwin* | yes,mingw* | yes,pw32*)
> + library_names_spec='$libname.dll.a'
> + # DLL is installed to $(libdir)/../bin by postinstall_cmds
> + postinstall_cmds='base_file=`basename \${file}`~
> +@@ -2230,7 +2230,7 @@ cygwin* | mingw* | pw32* | cegcc*)
> + soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
> + sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
> + ;;
> +- mingw* | cegcc*)
> ++ mingw*)
> + # MinGW DLLs use traditional 'lib' prefix
> + soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
> + sys_lib_search_path_spec=`$CC -print-search-dirs | $GREP "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
> +@@ -2656,7 +2656,7 @@ tpf*)
> + version_type=linux
> + need_lib_prefix=no
> + need_version=no
> +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
> ++ library_name_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
> + shlibpath_var=LD_LIBRARY_PATH
> + shlibpath_overrides_runpath=no
> + hardcode_into_libs=yes
> +@@ -2957,7 +2957,6 @@ _LT_DECL([], [reload_cmds], [2])dnl
> + # -- PORTME fill in with the dynamic library characteristics
> + m4_defun([_LT_CHECK_MAGIC_METHOD],
> + [m4_require([_LT_DECL_EGREP])
> +-m4_require([_LT_DECL_OBJDUMP])
> + AC_CACHE_CHECK([how to recognize dependent libraries],
> + lt_cv_deplibs_check_method,
> + [lt_cv_file_magic_cmd='$MAGIC_CMD'
> +@@ -3008,12 +3007,6 @@ mingw* | pw32*)
> + fi
> + ;;
> +
> +-cegcc)
> +- # use the weaker test based on 'objdump'. See mingw*.
> +- lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?'
> +- lt_cv_file_magic_cmd='$OBJDUMP -f'
> +- ;;
> +-
> + darwin* | rhapsody*)
> + lt_cv_deplibs_check_method=pass_all
> + ;;
> +@@ -3325,7 +3318,7 @@ case $host_os in
> + aix*)
> + symcode='[[BCDT]]'
> + ;;
> +-cygwin* | mingw* | pw32* | cegcc*)
> ++cygwin* | mingw* | pw32*)
> + symcode='[[ABCDGISTW]]'
> + ;;
> + hpux*)
> +@@ -3571,7 +3564,7 @@ m4_if([$1], [CXX], [
> + beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
> + # PIC is the default for these OSes.
> + ;;
> +- mingw* | cygwin* | os2* | pw32* | cegcc*)
> ++ mingw* | cygwin* | os2* | pw32*)
> + # This hack is so that the source file can tell whether it is being
> + # built for inclusion in a dll (and should export symbols for example).
> + # Although the cygwin gcc ignores -fPIC, still need this for old-style
> +@@ -3598,11 +3591,10 @@ m4_if([$1], [CXX], [
> + fi
> + ;;
> + hpux*)
> +- # PIC is the default for 64-bit PA HP-UX, but not for 32-bit
> +- # PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag
> +- # sets the default TLS model and affects inlining.
> ++ # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
> ++ # not for PA HP-UX.
> + case $host_cpu in
> +- hppa*64*)
> ++ hppa*64*|ia64*)
> + ;;
> + *)
> + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
> +@@ -3700,19 +3692,12 @@ m4_if([$1], [CXX], [
> + _LT_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
> + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
> + ;;
> +- ecpc* )
> +- # old Intel C++ for x86_64 which still supported -KPIC.
> ++ icpc* | ecpc* )
> ++ # Intel C++
> + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
> + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
> + _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
> + ;;
> +- icpc* )
> +- # Intel C++, used to be incompatible with GCC.
> +- # ICC 10 doesn't accept -KPIC any more.
> +- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
> +- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
> +- _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
> +- ;;
> + pgCC* | pgcpp*)
> + # Portland Group C++ compiler
> + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
> +@@ -3878,7 +3863,7 @@ m4_if([$1], [CXX], [
> + # PIC is the default for these OSes.
> + ;;
> +
> +- mingw* | cygwin* | pw32* | os2* | cegcc*)
> ++ mingw* | cygwin* | pw32* | os2*)
> + # This hack is so that the source file can tell whether it is being
> + # built for inclusion in a dll (and should export symbols for example).
> + # Although the cygwin gcc ignores -fPIC, still need this for old-style
> +@@ -3894,11 +3879,10 @@ m4_if([$1], [CXX], [
> + ;;
> +
> + hpux*)
> +- # PIC is the default for 64-bit PA HP-UX, but not for 32-bit
> +- # PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag
> +- # sets the default TLS model and affects inlining.
> ++ # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
> ++ # not for PA HP-UX.
> + case $host_cpu in
> +- hppa*64*)
> ++ hppa*64*|ia64*)
> + # +Z the default
> + ;;
> + *)
> +@@ -3948,7 +3932,7 @@ m4_if([$1], [CXX], [
> + fi
> + ;;
> +
> +- mingw* | cygwin* | pw32* | os2* | cegcc*)
> ++ mingw* | cygwin* | pw32* | os2*)
> + # This hack is so that the source file can tell whether it is being
> + # built for inclusion in a dll (and should export symbols for example).
> + m4_if([$1], [GCJ], [],
> +@@ -3979,25 +3963,11 @@ m4_if([$1], [CXX], [
> +
> + linux* | k*bsd*-gnu)
> + case $cc_basename in
> +- # old Intel for x86_64 which still supported -KPIC.
> +- ecc*)
> ++ icc* | ecc* | ifort*)
> + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
> + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
> + _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
> + ;;
> +- # icc used to be incompatible with GCC.
> +- # ICC 10 doesn't accept -KPIC any more.
> +- icc* | ifort*)
> +- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
> +- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
> +- _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
> +- ;;
> +- # Lahey Fortran 8.1.
> +- lf95*)
> +- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
> +- _LT_TAGVAR(lt_prog_compiler_pic, $1)='--shared'
> +- _LT_TAGVAR(lt_prog_compiler_static, $1)='--static'
> +- ;;
> + pgcc* | pgf77* | pgf90* | pgf95*)
> + # Portland Group compilers (*not* the Pentium gcc compiler,
> + # which looks to be a dead project)
> +@@ -4179,7 +4149,7 @@ m4_if([$1], [CXX], [
> + pw32*)
> + _LT_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
> + ;;
> +- cygwin* | mingw* | cegcc*)
> ++ cygwin* | mingw*)
> + _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
> + ;;
> + *)
> +@@ -4231,7 +4201,7 @@ dnl Note also adjust exclude_expsyms for
> + extract_expsyms_cmds=
> +
> + case $host_os in
> +- cygwin* | mingw* | pw32* | cegcc*)
> ++ cygwin* | mingw* | pw32*)
> + # FIXME: the MSVC++ port hasn't been tested in a loooong time
> + # When not using gcc, we currently assume that we are using
> + # Microsoft Visual C++.
> +@@ -4318,7 +4288,7 @@ _LT_EOF
> + fi
> + ;;
> +
> +- cygwin* | mingw* | pw32* | cegcc*)
> ++ cygwin* | mingw* | pw32*)
> + # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
> + # as there is no search path for DLLs.
> + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
> +@@ -4384,9 +4354,6 @@ _LT_EOF
> + tmp_addflag=' -i_dynamic -nofor_main' ;;
> + ifc* | ifort*) # Intel Fortran compiler
> + tmp_addflag=' -nofor_main' ;;
> +- lf95*) # Lahey Fortran 8.1
> +- _LT_TAGVAR(whole_archive_flag_spec, $1)=
> +- tmp_sharedflag='--shared' ;;
> + xl[[cC]]*) # IBM XL C 8.0 on PPC (deal with xlf below)
> + tmp_sharedflag='-qmkshrobj'
> + tmp_addflag= ;;
> +@@ -4618,7 +4585,6 @@ _LT_EOF
> + fi
> + fi
> +
> +- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-bexpall'
> + # It seems that -bexpall does not export symbols beginning with
> + # underscore (_), so it is better to generate a list of symbols to export.
> + _LT_TAGVAR(always_export_symbols, $1)=yes
> +@@ -4673,7 +4639,7 @@ _LT_EOF
> + _LT_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic
> + ;;
> +
> +- cygwin* | mingw* | pw32* | cegcc*)
> ++ cygwin* | mingw* | pw32*)
> + # When not using gcc, we currently assume that we are using
> + # Microsoft Visual C++.
> + # hardcode_libdir_flag_spec is actually meaningless, as there is
> +@@ -4777,7 +4743,7 @@ _LT_EOF
> + _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
> + ;;
> + ia64*)
> +- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
> ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
> + ;;
> + *)
> + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
> +@@ -5562,7 +5528,6 @@ if test "$_lt_caught_CXX_error" != yes;
> + fi
> + fi
> +
> +- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-bexpall'
> + # It seems that -bexpall does not export symbols beginning with
> + # underscore (_), so it is better to generate a list of symbols to
> + # export.
> +@@ -5621,7 +5586,7 @@ if test "$_lt_caught_CXX_error" != yes;
> + esac
> + ;;
> +
> +- cygwin* | mingw* | pw32* | cegcc*)
> ++ cygwin* | mingw* | pw32*)
> + # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
> + # as there is no search path for DLLs.
> + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
> +@@ -7006,18 +6971,6 @@ AC_SUBST([GREP])
> + ])
> +
> +
> +-# _LT_DECL_OBJDUMP
> +-# --------------
> +-# If we don't have a new enough Autoconf to choose the best objdump
> +-# available, choose the one first in the user's PATH.
> +-m4_defun([_LT_DECL_OBJDUMP],
> +-[AC_CHECK_TOOL(OBJDUMP, objdump, false)
> +-test -z "$OBJDUMP" && OBJDUMP=objdump
> +-_LT_DECL([], [OBJDUMP], [1], [An object symbol dumper])
> +-AC_SUBST([OBJDUMP])
> +-])
> +-
> +-
> + # _LT_DECL_SED
> + # ------------
> + # Check for a fully-functional sed program, that truncates
> +Index: libiconv-1.13.1/m4/libtool.m4
> +===================================================================
> +--- libiconv-1.13.1.orig/m4/libtool.m4 2009-06-21 04:17:33.000000000 -0700
> ++++ libiconv-1.13.1/m4/libtool.m4 2010-06-01 02:57:31.301726190 -0700
> +@@ -89,7 +89,8 @@ _LT_SET_OPTIONS([$0], [$1])
> + LIBTOOL_DEPS="$ltmain"
> +
> + # Always use our own libtool.
> +-LIBTOOL="${CONFIG_SHELL-$SHELL} "'$(top_builddir)/libtool'
> ++LIBTOOL='$(SHELL) $(top_builddir)'
> ++LIBTOOL="$LIBTOOL/$host_alias-libtool"
> + AC_SUBST(LIBTOOL)dnl
> +
> + _LT_SETUP
> +@@ -211,7 +212,7 @@ delay_single_quote_subst='s/'\''/'\'\\\\
> + no_glob_subst='s/\*/\\\*/g'
> +
> + # Global variables:
> +-ofile=libtool
> ++ofile=${host_alias}-libtool
> + can_build_shared=yes
> +
> + # All known linkers require a `.a' archive for static linking (except MSVC,
> +@@ -380,12 +381,12 @@ m4_define([lt_decl_dquote_varnames],
> + # lt_decl_varnames_tagged([SEPARATOR], [VARNAME1...])
> + # ---------------------------------------------------
> + m4_define([lt_decl_varnames_tagged],
> +-[m4_assert([$# <= 2])dnl
> +-_$0(m4_quote(m4_default([$1], [[, ]])),
> +- m4_ifval([$2], [[$2]], [m4_dquote(lt_decl_tag_varnames)]),
> +- m4_split(m4_normalize(m4_quote(_LT_TAGS)), [ ]))])
> +-m4_define([_lt_decl_varnames_tagged],
> +-[m4_ifval([$3], [lt_combine([$1], [$2], [_], $3)])])
> ++[_$0(m4_quote(m4_default([$1], [[, ]])),
> ++ m4_quote(m4_if([$2], [],
> ++ m4_quote(lt_decl_tag_varnames),
> ++ m4_quote(m4_shift($@)))),
> ++ m4_split(m4_normalize(m4_quote(_LT_TAGS))))])
> ++m4_define([_lt_decl_varnames_tagged], [lt_combine([$1], [$2], [_], $3)])
> +
> +
> + # lt_decl_all_varnames([SEPARATOR], [VARNAME1...])
> +@@ -990,11 +991,7 @@ m4_defun([_LT_DARWIN_LINKER_FEATURES],
> + _LT_TAGVAR(whole_archive_flag_spec, $1)=''
> + _LT_TAGVAR(link_all_deplibs, $1)=yes
> + _LT_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined"
> +- case $cc_basename in
> +- ifort*) _lt_dar_can_shared=yes ;;
> +- *) _lt_dar_can_shared=$GCC ;;
> +- esac
> +- if test "$_lt_dar_can_shared" = "yes"; then
> ++ if test "$GCC" = "yes"; then
> + output_verbose_link_cmd=echo
> + _LT_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
> + _LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
> +@@ -1516,7 +1513,7 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [d
> + lt_cv_sys_max_cmd_len=-1;
> + ;;
> +
> +- cygwin* | mingw* | cegcc*)
> ++ cygwin* | mingw*)
> + # On Win9x/ME, this test blows up -- it succeeds, but takes
> + # about 5 minutes as the teststring grows exponentially.
> + # Worse, since 9x/ME are not pre-emptively multitasking,
> +@@ -1684,6 +1681,10 @@ else
> + # endif
> + #endif
> +
> ++#ifdef __cplusplus
> ++extern "C" void exit (int);
> ++#endif
> ++
> + void fnord() { int i=42;}
> + int main ()
> + {
> +@@ -1699,7 +1700,7 @@ int main ()
> + else
> + puts (dlerror ());
> +
> +- return status;
> ++ exit (status);
> + }]
> + _LT_EOF
> + if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then
> +@@ -1738,7 +1739,7 @@ else
> + lt_cv_dlopen_self=yes
> + ;;
> +
> +- mingw* | pw32* | cegcc*)
> ++ mingw* | pw32*)
> + lt_cv_dlopen="LoadLibrary"
> + lt_cv_dlopen_libs=
> + ;;
> +@@ -2035,7 +2036,6 @@ m4_defun([_LT_SYS_DYNAMIC_LINKER],
> + [AC_REQUIRE([AC_CANONICAL_HOST])dnl
> + m4_require([_LT_DECL_EGREP])dnl
> + m4_require([_LT_FILEUTILS_DEFAULTS])dnl
> +-m4_require([_LT_DECL_OBJDUMP])dnl
> + m4_require([_LT_DECL_SED])dnl
> + AC_MSG_CHECKING([dynamic linker characteristics])
> + m4_if([$1],
> +@@ -2200,14 +2200,14 @@ bsdi[[45]]*)
> + # libtool to hard-code these into programs
> + ;;
> +
> +-cygwin* | mingw* | pw32* | cegcc*)
> ++cygwin* | mingw* | pw32*)
> + version_type=windows
> + shrext_cmds=".dll"
> + need_version=no
> + need_lib_prefix=no
> +
> + case $GCC,$host_os in
> +- yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
> ++ yes,cygwin* | yes,mingw* | yes,pw32*)
> + library_names_spec='$libname.dll.a'
> + # DLL is installed to $(libdir)/../bin by postinstall_cmds
> + postinstall_cmds='base_file=`basename \${file}`~
> +@@ -2230,7 +2230,7 @@ cygwin* | mingw* | pw32* | cegcc*)
> + soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
> + sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
> + ;;
> +- mingw* | cegcc*)
> ++ mingw*)
> + # MinGW DLLs use traditional 'lib' prefix
> + soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
> + sys_lib_search_path_spec=`$CC -print-search-dirs | $GREP "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
> +@@ -2656,7 +2656,7 @@ tpf*)
> + version_type=linux
> + need_lib_prefix=no
> + need_version=no
> +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
> ++ library_name_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
> + shlibpath_var=LD_LIBRARY_PATH
> + shlibpath_overrides_runpath=no
> + hardcode_into_libs=yes
> +@@ -2957,7 +2957,6 @@ _LT_DECL([], [reload_cmds], [2])dnl
> + # -- PORTME fill in with the dynamic library characteristics
> + m4_defun([_LT_CHECK_MAGIC_METHOD],
> + [m4_require([_LT_DECL_EGREP])
> +-m4_require([_LT_DECL_OBJDUMP])
> + AC_CACHE_CHECK([how to recognize dependent libraries],
> + lt_cv_deplibs_check_method,
> + [lt_cv_file_magic_cmd='$MAGIC_CMD'
> +@@ -3008,12 +3007,6 @@ mingw* | pw32*)
> + fi
> + ;;
> +
> +-cegcc)
> +- # use the weaker test based on 'objdump'. See mingw*.
> +- lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?'
> +- lt_cv_file_magic_cmd='$OBJDUMP -f'
> +- ;;
> +-
> + darwin* | rhapsody*)
> + lt_cv_deplibs_check_method=pass_all
> + ;;
> +@@ -3325,7 +3318,7 @@ case $host_os in
> + aix*)
> + symcode='[[BCDT]]'
> + ;;
> +-cygwin* | mingw* | pw32* | cegcc*)
> ++cygwin* | mingw* | pw32*)
> + symcode='[[ABCDGISTW]]'
> + ;;
> + hpux*)
> +@@ -3571,7 +3564,7 @@ m4_if([$1], [CXX], [
> + beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
> + # PIC is the default for these OSes.
> + ;;
> +- mingw* | cygwin* | os2* | pw32* | cegcc*)
> ++ mingw* | cygwin* | os2* | pw32*)
> + # This hack is so that the source file can tell whether it is being
> + # built for inclusion in a dll (and should export symbols for example).
> + # Although the cygwin gcc ignores -fPIC, still need this for old-style
> +@@ -3598,11 +3591,10 @@ m4_if([$1], [CXX], [
> + fi
> + ;;
> + hpux*)
> +- # PIC is the default for 64-bit PA HP-UX, but not for 32-bit
> +- # PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag
> +- # sets the default TLS model and affects inlining.
> ++ # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
> ++ # not for PA HP-UX.
> + case $host_cpu in
> +- hppa*64*)
> ++ hppa*64*|ia64*)
> + ;;
> + *)
> + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
> +@@ -3700,19 +3692,12 @@ m4_if([$1], [CXX], [
> + _LT_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
> + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
> + ;;
> +- ecpc* )
> +- # old Intel C++ for x86_64 which still supported -KPIC.
> ++ icpc* | ecpc* )
> ++ # Intel C++
> + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
> + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
> + _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
> + ;;
> +- icpc* )
> +- # Intel C++, used to be incompatible with GCC.
> +- # ICC 10 doesn't accept -KPIC any more.
> +- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
> +- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
> +- _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
> +- ;;
> + pgCC* | pgcpp*)
> + # Portland Group C++ compiler
> + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
> +@@ -3878,7 +3863,7 @@ m4_if([$1], [CXX], [
> + # PIC is the default for these OSes.
> + ;;
> +
> +- mingw* | cygwin* | pw32* | os2* | cegcc*)
> ++ mingw* | cygwin* | pw32* | os2*)
> + # This hack is so that the source file can tell whether it is being
> + # built for inclusion in a dll (and should export symbols for example).
> + # Although the cygwin gcc ignores -fPIC, still need this for old-style
> +@@ -3894,11 +3879,10 @@ m4_if([$1], [CXX], [
> + ;;
> +
> + hpux*)
> +- # PIC is the default for 64-bit PA HP-UX, but not for 32-bit
> +- # PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag
> +- # sets the default TLS model and affects inlining.
> ++ # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
> ++ # not for PA HP-UX.
> + case $host_cpu in
> +- hppa*64*)
> ++ hppa*64*|ia64*)
> + # +Z the default
> + ;;
> + *)
> +@@ -3948,7 +3932,7 @@ m4_if([$1], [CXX], [
> + fi
> + ;;
> +
> +- mingw* | cygwin* | pw32* | os2* | cegcc*)
> ++ mingw* | cygwin* | pw32* | os2*)
> + # This hack is so that the source file can tell whether it is being
> + # built for inclusion in a dll (and should export symbols for example).
> + m4_if([$1], [GCJ], [],
> +@@ -3979,25 +3963,11 @@ m4_if([$1], [CXX], [
> +
> + linux* | k*bsd*-gnu)
> + case $cc_basename in
> +- # old Intel for x86_64 which still supported -KPIC.
> +- ecc*)
> ++ icc* | ecc* | ifort*)
> + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
> + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
> + _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
> + ;;
> +- # icc used to be incompatible with GCC.
> +- # ICC 10 doesn't accept -KPIC any more.
> +- icc* | ifort*)
> +- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
> +- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
> +- _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
> +- ;;
> +- # Lahey Fortran 8.1.
> +- lf95*)
> +- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
> +- _LT_TAGVAR(lt_prog_compiler_pic, $1)='--shared'
> +- _LT_TAGVAR(lt_prog_compiler_static, $1)='--static'
> +- ;;
> + pgcc* | pgf77* | pgf90* | pgf95*)
> + # Portland Group compilers (*not* the Pentium gcc compiler,
> + # which looks to be a dead project)
> +@@ -4179,7 +4149,7 @@ m4_if([$1], [CXX], [
> + pw32*)
> + _LT_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
> + ;;
> +- cygwin* | mingw* | cegcc*)
> ++ cygwin* | mingw*)
> + _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
> + ;;
> + *)
> +@@ -4231,7 +4201,7 @@ dnl Note also adjust exclude_expsyms for
> + extract_expsyms_cmds=
> +
> + case $host_os in
> +- cygwin* | mingw* | pw32* | cegcc*)
> ++ cygwin* | mingw* | pw32*)
> + # FIXME: the MSVC++ port hasn't been tested in a loooong time
> + # When not using gcc, we currently assume that we are using
> + # Microsoft Visual C++.
> +@@ -4318,7 +4288,7 @@ _LT_EOF
> + fi
> + ;;
> +
> +- cygwin* | mingw* | pw32* | cegcc*)
> ++ cygwin* | mingw* | pw32*)
> + # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
> + # as there is no search path for DLLs.
> + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
> +@@ -4384,9 +4354,6 @@ _LT_EOF
> + tmp_addflag=' -i_dynamic -nofor_main' ;;
> + ifc* | ifort*) # Intel Fortran compiler
> + tmp_addflag=' -nofor_main' ;;
> +- lf95*) # Lahey Fortran 8.1
> +- _LT_TAGVAR(whole_archive_flag_spec, $1)=
> +- tmp_sharedflag='--shared' ;;
> + xl[[cC]]*) # IBM XL C 8.0 on PPC (deal with xlf below)
> + tmp_sharedflag='-qmkshrobj'
> + tmp_addflag= ;;
> +@@ -4618,7 +4585,6 @@ _LT_EOF
> + fi
> + fi
> +
> +- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-bexpall'
> + # It seems that -bexpall does not export symbols beginning with
> + # underscore (_), so it is better to generate a list of symbols to export.
> + _LT_TAGVAR(always_export_symbols, $1)=yes
> +@@ -4673,7 +4639,7 @@ _LT_EOF
> + _LT_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic
> + ;;
> +
> +- cygwin* | mingw* | pw32* | cegcc*)
> ++ cygwin* | mingw* | pw32*)
> + # When not using gcc, we currently assume that we are using
> + # Microsoft Visual C++.
> + # hardcode_libdir_flag_spec is actually meaningless, as there is
> +@@ -4777,7 +4743,7 @@ _LT_EOF
> + _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
> + ;;
> + ia64*)
> +- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
> ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
> + ;;
> + *)
> + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
> +@@ -5562,7 +5528,6 @@ if test "$_lt_caught_CXX_error" != yes;
> + fi
> + fi
> +
> +- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-bexpall'
> + # It seems that -bexpall does not export symbols beginning with
> + # underscore (_), so it is better to generate a list of symbols to
> + # export.
> +@@ -5621,7 +5586,7 @@ if test "$_lt_caught_CXX_error" != yes;
> + esac
> + ;;
> +
> +- cygwin* | mingw* | pw32* | cegcc*)
> ++ cygwin* | mingw* | pw32*)
> + # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
> + # as there is no search path for DLLs.
> + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
> +@@ -7006,18 +6971,6 @@ AC_SUBST([GREP])
> + ])
> +
> +
> +-# _LT_DECL_OBJDUMP
> +-# --------------
> +-# If we don't have a new enough Autoconf to choose the best objdump
> +-# available, choose the one first in the user's PATH.
> +-m4_defun([_LT_DECL_OBJDUMP],
> +-[AC_CHECK_TOOL(OBJDUMP, objdump, false)
> +-test -z "$OBJDUMP" && OBJDUMP=objdump
> +-_LT_DECL([], [OBJDUMP], [1], [An object symbol dumper])
> +-AC_SUBST([OBJDUMP])
> +-])
> +-
> +-
> + # _LT_DECL_SED
> + # ------------
> + # Check for a fully-functional sed program, that truncates
> +Index: libiconv-1.13.1/libcharset/m4/ltversion.m4
> +===================================================================
> +--- libiconv-1.13.1.orig/libcharset/m4/ltversion.m4 2009-06-21 04:17:33.000000000 -0700
> ++++ libiconv-1.13.1/libcharset/m4/ltversion.m4 2010-06-01 02:57:31.301726190 -0700
> +@@ -9,15 +9,15 @@
> +
> + # Generated from ltversion.in.
> +
> +-# serial 3012 ltversion.m4
> ++# serial 3017 ltversion.m4
> + # This file is part of GNU Libtool
> +
> +-m4_define([LT_PACKAGE_VERSION], [2.2.6])
> +-m4_define([LT_PACKAGE_REVISION], [1.3012])
> ++m4_define([LT_PACKAGE_VERSION], [2.2.6b])
> ++m4_define([LT_PACKAGE_REVISION], [1.3017])
> +
> + AC_DEFUN([LTVERSION_VERSION],
> +-[macro_version='2.2.6'
> +-macro_revision='1.3012'
> ++[macro_version='2.2.6b'
> ++macro_revision='1.3017'
> + _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
> + _LT_DECL(, macro_revision, 0)
> + ])
> +Index: libiconv-1.13.1/m4/ltversion.m4
> +===================================================================
> +--- libiconv-1.13.1.orig/m4/ltversion.m4 2009-06-21 04:17:33.000000000 -0700
> ++++ libiconv-1.13.1/m4/ltversion.m4 2010-06-01 02:57:31.301726190 -0700
> +@@ -9,15 +9,15 @@
> +
> + # Generated from ltversion.in.
> +
> +-# serial 3012 ltversion.m4
> ++# serial 3017 ltversion.m4
> + # This file is part of GNU Libtool
> +
> +-m4_define([LT_PACKAGE_VERSION], [2.2.6])
> +-m4_define([LT_PACKAGE_REVISION], [1.3012])
> ++m4_define([LT_PACKAGE_VERSION], [2.2.6b])
> ++m4_define([LT_PACKAGE_REVISION], [1.3017])
> +
> + AC_DEFUN([LTVERSION_VERSION],
> +-[macro_version='2.2.6'
> +-macro_revision='1.3012'
> ++[macro_version='2.2.6b'
> ++macro_revision='1.3017'
> + _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
> + _LT_DECL(, macro_revision, 0)
> + ])
> diff --git a/recipes/libiconv/libiconv.inc b/recipes/libiconv/libiconv.inc
> index 6bb85ef..11dfaf2 100644
> --- a/recipes/libiconv/libiconv.inc
> +++ b/recipes/libiconv/libiconv.inc
> @@ -6,21 +6,10 @@ PRIORITY = "optional"
> NOTES = "Needs to be stripped down to: ascii iso8859-1 eucjp iso-2022jp gb utf8"
>
> SRC_URI = "ftp://ftp.gnu.org/pub/gnu/libiconv/libiconv-${PV}.tar.gz \
> - file://autotools.patch \
> - file://preload.patch"
> + "
>
> S = "${WORKDIR}/libiconv-${PV}"
>
> inherit autotools gettext
>
> -EXTRA_OECONF += "--enable-shared --enable-static --enable-relocatable --disable-rpath"
> -
> -do_configure_append () {
> - # Fix stupid libtool... handling. rpath handling can't be disabled and the Makefile's can't be regenerated..
> - # (GNU sed required)
> - sed -i s/^hardcode_libdir_flag_spec/#hardcode_libdir_flag_spec/ ${S}/*-libtool
> -}
> -
> -do_stage () {
> - autotools_stage_all
> -}
> +EXTRA_OECONF += "--enable-shared --enable-static --enable-relocatable"
> diff --git a/recipes/libiconv/libiconv_1.12.bb b/recipes/libiconv/libiconv_1.12.bb
> index a38248e..83774d6 100644
> --- a/recipes/libiconv/libiconv_1.12.bb
> +++ b/recipes/libiconv/libiconv_1.12.bb
> @@ -11,5 +11,15 @@ EXTRA_OECONF += "${@['--disable-nls','--enable-nls'][bb.data.getVar('USE_NLS',
>
> LEAD_SONAME = "libiconv.so"
>
> +SRC_URI += "file://autotools.patch \
> + file://preload.patch \
> + "
> +do_configure_append () {
> + # Fix stupid libtool... handling.
> + # rpath handling can't be disabled and the Makefile's can't be regenerated..
> + # (GNU sed required)
> + sed -i s/^hardcode_libdir_flag_spec/#hardcode_libdir_flag_spec/ ${S}/*-libtool
> +}
> +
> SRC_URI[md5sum] = "c2be282595751535a618ae0edeb8f648"
> SRC_URI[sha256sum] = "a99e244fd78babb95ea3c9a5c88b964994edaa1d15fd8dde5b4067801e23f0cd"
> diff --git a/recipes/libiconv/libiconv_1.13.1.bb b/recipes/libiconv/libiconv_1.13.1.bb
> new file mode 100644
> index 0000000..3cd836f
> --- /dev/null
> +++ b/recipes/libiconv/libiconv_1.13.1.bb
> @@ -0,0 +1,24 @@
> +require libiconv.inc
> +LICENSE = "GPLv3 LGPLv2"
> +
> +PROVIDES = "virtual/libiconv"
> +PR = "r0"
> +
> +#gettext.class cant be inherit here so use this hack
> +DEPENDS = "${@['','gettext-native'][bb.data.getVar('USE_NLS', d, 1) == 'yes']}"
> +
> +EXTRA_OECONF += "${@['--disable-nls','--enable-nls'][bb.data.getVar('USE_NLS', d, 1) == 'yes']}"
> +
> +SRC_URI += "file://autoconf.patch"
> +
> +do_configure_append () {
> + # Fix stupid libtool... handling.
> + # rpath handling can't be disabled and the Makefile's can't be regenerated..
> + # (GNU sed required)
> + sed -i s/^hardcode_libdir_flag_spec/#hardcode_libdir_flag_spec/ ${S}/*-libtool
> +}
> +
> +LEAD_SONAME = "libiconv.so"
> +SRC_URI[md5sum] = "7ab33ebd26687c744a37264a330bbe9a"
> +SRC_URI[sha256sum] = "55a36168306089009d054ccdd9d013041bfc3ab26be7033d107821f1c4949a49"
> +
> --
> 1.7.0.4
>
>
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
>
^ permalink raw reply [flat|nested] 45+ messages in thread
* Re: [PATCH 06/16] db_5.0.21: Add recipes for target and native packages.
2010-06-04 0:29 ` Khem Raj
@ 2010-06-04 7:38 ` Martin Jansa
2010-06-08 19:53 ` Jan Paesmans
0 siblings, 1 reply; 45+ messages in thread
From: Martin Jansa @ 2010-06-04 7:38 UTC (permalink / raw)
To: openembedded-devel
On Fri, Jun 4, 2010 at 2:29 AM, Khem Raj <raj.khem@gmail.com> wrote:
> On (02/06/10 22:41), Koen Kooi wrote:
>> -----BEGIN PGP SIGNED MESSAGE-----
>> Hash: SHA1
>>
>> On 02-06-10 22:34, Khem Raj wrote:
>> > * Get rid of old style staging.
>> >
>> > Signed-off-by: Khem Raj <raj.khem@gmail.com>
>> > ---
>> > recipes/db/db-native_4.2.52.bb | 1 -
>> > recipes/db/db-native_5.0.21.bb | 2 +
>>
>> Can these get converted to BBCLASSEXTEND?
>
> Yes. I have intended to do that afterwards
Then
Acked-by: Martin Jansa <Martin.Jansa@gmail.com>
>
>>
>> regards,
>>
>> Koen
>> -----BEGIN PGP SIGNATURE-----
>> Version: GnuPG v1.4.5 (Darwin)
>>
>> iD8DBQFMBsIIMkyGM64RGpERAqLBAJ9T1EGUDygy/NfaND/5EO0hSebLqgCfUPHo
>> 7eD81HjkwQFLTl3APVx7mFg=
>> =mMkU
>> -----END PGP SIGNATURE-----
>>
>>
>> _______________________________________________
>> Openembedded-devel mailing list
>> Openembedded-devel@lists.openembedded.org
>> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
>
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
>
^ permalink raw reply [flat|nested] 45+ messages in thread
* Re: [PATCH 07/16] grep-2.6.3: Add recipe.
2010-06-02 20:34 ` [PATCH 07/16] grep-2.6.3: Add recipe Khem Raj
@ 2010-06-04 7:39 ` Martin Jansa
2010-06-07 7:35 ` Jan Paesmans
0 siblings, 1 reply; 45+ messages in thread
From: Martin Jansa @ 2010-06-04 7:39 UTC (permalink / raw)
To: openembedded-devel
On Wed, Jun 2, 2010 at 10:34 PM, Khem Raj <raj.khem@gmail.com> wrote:
> * Fix build for uclibc as well.
>
> Signed-off-by: Khem Raj <raj.khem@gmail.com>
Acked-by: Martin Jansa <Martin.Jansa@gmail.com>
> ---
> recipes/grep/grep-2.6.3/uclibc-fix.patch | 50 ++++++++++++++++++++++++++++++
> recipes/grep/grep_2.6.3.bb | 47 ++++++++++++++++++++++++++++
> 2 files changed, 97 insertions(+), 0 deletions(-)
> create mode 100644 recipes/grep/grep-2.6.3/uclibc-fix.patch
> create mode 100644 recipes/grep/grep_2.6.3.bb
>
> diff --git a/recipes/grep/grep-2.6.3/uclibc-fix.patch b/recipes/grep/grep-2.6.3/uclibc-fix.patch
> new file mode 100644
> index 0000000..2e1c584
> --- /dev/null
> +++ b/recipes/grep/grep-2.6.3/uclibc-fix.patch
> @@ -0,0 +1,50 @@
> +Fix to use mempcpy instead of __mempcpy. This is needed for uclibc which
> +doesn't define __mempcpy only mempcpy. Since both uclibc and glibc have
> +mempcpy we'll just use that instead.
> +
> +Index: grep-2.6.3/lib/getopt.c
> +===================================================================
> +--- grep-2.6.3.orig/lib/getopt.c 2010-03-21 00:34:02.000000000 -0700
> ++++ grep-2.6.3/lib/getopt.c 2010-05-22 21:37:11.352740539 -0700
> +@@ -41,6 +41,10 @@
> + # include <wchar.h>
> + #endif
> +
> ++#ifdef __UCLIBC__
> ++#define __mempcpy mempcpy
> ++#endif
> ++
> + /* This version of `getopt' appears to the caller like standard Unix `getopt'
> + but it behaves differently for the user, since it allows the user
> + to intersperse the options with the other arguments.
> +Index: grep-2.6.3/gnulib-tests/setenv.c
> +===================================================================
> +--- grep-2.6.3.orig/gnulib-tests/setenv.c 2010-05-22 21:37:53.655168151 -0700
> ++++ grep-2.6.3/gnulib-tests/setenv.c 2010-05-22 21:38:42.792745476 -0700
> +@@ -68,6 +68,10 @@ __libc_lock_define_initialized (static,
> + # define tsearch __tsearch
> + #endif
> +
> ++#ifdef __UCLIBC__
> ++#define __mempcpy mempcpy
> ++#endif
> ++
> + /* In the GNU C library implementation we try to be more clever and
> + allow arbitrarily many changes of the environment given that the used
> + values are from a small set. Outside glibc this will eat up all
> +Index: grep-2.6.3/lib/regexec.c
> +===================================================================
> +--- grep-2.6.3.orig/lib/regexec.c 2010-05-22 21:36:02.655154671 -0700
> ++++ grep-2.6.3/lib/regexec.c 2010-05-22 21:37:26.212743273 -0700
> +@@ -22,6 +22,11 @@
> +
> + #include "verify.h"
> + #include "intprops.h"
> ++
> ++#ifdef __UCLIBC__
> ++#define __mempcpy mempcpy
> ++#endif
> ++
> + static reg_errcode_t match_ctx_init (re_match_context_t *cache, int eflags,
> + Idx n) internal_function;
> + static void match_ctx_clean (re_match_context_t *mctx) internal_function;
> diff --git a/recipes/grep/grep_2.6.3.bb b/recipes/grep/grep_2.6.3.bb
> new file mode 100644
> index 0000000..c887ca0
> --- /dev/null
> +++ b/recipes/grep/grep_2.6.3.bb
> @@ -0,0 +1,47 @@
> +LICENSE = "GPL"
> +SECTION = "console/utils"
> +DESCRIPTION = "grep GNU utility"
> +PR = "r0"
> +
> +SRC_URI = "${GNU_MIRROR}/grep/grep-${PV}.tar.xz \
> + file://uclibc-fix.patch"
> +
> +inherit autotools
> +
> +EXTRA_OECONF = "--disable-perl-regexp --disable-ncurses"
> +EXTRA_OECONF_virtclass-native = "--with-included-regex --disable-ncurses"
> +
> +do_configure () {
> + rm -f ${S}/m4/init.m4
> + autotools_do_configure
> +}
> +
> +do_install () {
> + autotools_do_install
> + install -d ${D}${base_bindir}
> + mv ${D}${bindir}/grep ${D}${base_bindir}/grep.${PN}
> + mv ${D}${bindir}/egrep ${D}${base_bindir}/egrep.${PN}
> + mv ${D}${bindir}/fgrep ${D}${base_bindir}/fgrep.${PN}
> +}
> +
> +do_install_virtclass-native () {
> + autotools_do_install
> +}
> +
> +pkg_postinst_${PN} () {
> + update-alternatives --install ${base_bindir}/grep grep grep.${PN} 100
> + update-alternatives --install ${base_bindir}/egrep egrep egrep.${PN} 100
> + update-alternatives --install ${base_bindir}/fgrep fgrep fgrep.${PN} 100
> +}
> +
> +pkg_prerm_${PN} () {
> + update-alternatives --remove grep grep.${PN}
> + update-alternatives --remove egrep egrep.${PN}
> + update-alternatives --remove fgrep fgrep.${PN}
> +}
> +
> +BBCLASSEXTEND = "native"
> +
> +SRC_URI[md5sum] = "69a3bf508a3f14d12369e0e1c7a92763"
> +SRC_URI[sha256sum] = "ba745e2ff297ab225bf870740d35593d402a1d92999cf0d7e56840f10218db7c"
> +
> --
> 1.7.0.4
>
>
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
>
^ permalink raw reply [flat|nested] 45+ messages in thread
* Re: [PATCH 08/16] glib-2.0_2.24.0.bb: Remove virtual/libiconv virtual/libintl from DEPENDS
2010-06-02 20:34 ` [PATCH 08/16] glib-2.0_2.24.0.bb: Remove virtual/libiconv virtual/libintl from DEPENDS Khem Raj
@ 2010-06-04 7:39 ` Martin Jansa
0 siblings, 0 replies; 45+ messages in thread
From: Martin Jansa @ 2010-06-04 7:39 UTC (permalink / raw)
To: openembedded-devel
On Wed, Jun 2, 2010 at 10:34 PM, Khem Raj <raj.khem@gmail.com> wrote:
> Signed-off-by: Khem Raj <raj.khem@gmail.com>
Acked-by: Martin Jansa <Martin.Jansa@gmail.com>
> ---
> recipes/glib-2.0/glib-2.0_2.24.0.bb | 4 ++--
> 1 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/recipes/glib-2.0/glib-2.0_2.24.0.bb b/recipes/glib-2.0/glib-2.0_2.24.0.bb
> index 56fe567..3a90dc6 100644
> --- a/recipes/glib-2.0/glib-2.0_2.24.0.bb
> +++ b/recipes/glib-2.0/glib-2.0_2.24.0.bb
> @@ -6,9 +6,9 @@ UNIX-like platforms, Windows, OS/2 and BeOS."
> LICENSE = "LGPL"
> SECTION = "libs"
> PRIORITY = "optional"
> -DEPENDS = "glib-2.0-native gtk-doc virtual/libiconv virtual/libintl zlib"
> +DEPENDS = "glib-2.0-native gtk-doc zlib"
>
> -PR = "r4"
> +PR = "r5"
>
> SRC_URI = "\
> http://ftp.gnome.org/pub/GNOME/sources/glib/2.24/glib-${PV}.tar.bz2;name=archive \
> --
> 1.7.0.4
>
>
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
>
^ permalink raw reply [flat|nested] 45+ messages in thread
* Re: [PATCH 09/16] gnutls_2.8.6.bb: Add recipe for version 2.8.6
2010-06-02 20:34 ` [PATCH 09/16] gnutls_2.8.6.bb: Add recipe for version 2.8.6 Khem Raj
@ 2010-06-04 7:40 ` Martin Jansa
0 siblings, 0 replies; 45+ messages in thread
From: Martin Jansa @ 2010-06-04 7:40 UTC (permalink / raw)
To: openembedded-devel
On Wed, Jun 2, 2010 at 10:34 PM, Khem Raj <raj.khem@gmail.com> wrote:
> Signed-off-by: Khem Raj <raj.khem@gmail.com>
Acked-by: Martin Jansa <Martin.Jansa@gmail.com>
> ---
> .../gettextize-with-gettext-0.18.patch | 1042 ++++++++++++++++++++
> recipes/gnutls/gnutls-2.8.6/gnutls-openssl.patch | 129 +++
> .../gnutls-2.8.6/gnutls-replace-siginterrupt.patch | 41 +
> recipes/gnutls/gnutls_2.8.5.bb | 3 +
> recipes/gnutls/gnutls_2.8.6.bb | 16 +
> 5 files changed, 1231 insertions(+), 0 deletions(-)
> create mode 100644 recipes/gnutls/gnutls-2.8.6/gettextize-with-gettext-0.18.patch
> create mode 100644 recipes/gnutls/gnutls-2.8.6/gnutls-openssl.patch
> create mode 100644 recipes/gnutls/gnutls-2.8.6/gnutls-replace-siginterrupt.patch
> create mode 100644 recipes/gnutls/gnutls_2.8.6.bb
>
> diff --git a/recipes/gnutls/gnutls-2.8.6/gettextize-with-gettext-0.18.patch b/recipes/gnutls/gnutls-2.8.6/gettextize-with-gettext-0.18.patch
> new file mode 100644
> index 0000000..5984f98
> --- /dev/null
> +++ b/recipes/gnutls/gnutls-2.8.6/gettextize-with-gettext-0.18.patch
> @@ -0,0 +1,1042 @@
> +Index: gnutls-2.8.6/lib/build-aux/config.rpath
> +===================================================================
> +--- gnutls-2.8.6.orig/lib/build-aux/config.rpath 2009-06-02 11:59:32.000000000 -0700
> ++++ gnutls-2.8.6/lib/build-aux/config.rpath 2010-05-19 22:15:18.491309044 -0700
> +@@ -2,7 +2,7 @@
> + # Output a system dependent set of variables, describing how to set the
> + # run time search path of shared libraries in an executable.
> + #
> +-# Copyright 1996-2008 Free Software Foundation, Inc.
> ++# Copyright 1996-2010 Free Software Foundation, Inc.
> + # Taken from GNU libtool, 2001
> + # Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
> + #
> +Index: gnutls-2.8.6/lib/ChangeLog
> +===================================================================
> +--- /dev/null 1970-01-01 00:00:00.000000000 +0000
> ++++ gnutls-2.8.6/lib/ChangeLog 2010-05-19 22:15:18.491309044 -0700
> +@@ -0,0 +1,12 @@
> ++2010-05-19 gettextize <bug-gnu-gettext@gnu.org>
> ++
> ++ * m4/gettext.m4: Upgrade to gettext-0.18.
> ++ * m4/iconv.m4: Upgrade to gettext-0.18.
> ++ * m4/lib-ld.m4: Upgrade to gettext-0.18.
> ++ * m4/lib-link.m4: Upgrade to gettext-0.18.
> ++ * m4/lib-prefix.m4: Upgrade to gettext-0.18.
> ++ * m4/nls.m4: Upgrade to gettext-0.18.
> ++ * m4/po.m4: Upgrade to gettext-0.18.
> ++ * m4/progtest.m4: Upgrade to gettext-0.18.
> ++ * configure.ac (AM_GNU_GETTEXT_VERSION): Bump to 0.18.
> ++
> +Index: gnutls-2.8.6/lib/configure.ac
> +===================================================================
> +--- gnutls-2.8.6.orig/lib/configure.ac 2009-11-02 04:08:07.000000000 -0800
> ++++ gnutls-2.8.6/lib/configure.ac 2010-05-19 22:15:18.491309044 -0700
> +@@ -38,7 +38,7 @@ AC_PROG_LIBTOOL
> + LIBGNUTLS_HOOKS
> +
> + AM_GNU_GETTEXT([external])
> +-AM_GNU_GETTEXT_VERSION([0.17])
> ++AM_GNU_GETTEXT_VERSION([0.18])
> +
> + AC_C_BIGENDIAN
> +
> +Index: gnutls-2.8.6/lib/m4/gettext.m4
> +===================================================================
> +--- gnutls-2.8.6.orig/lib/m4/gettext.m4 2010-03-15 03:28:11.000000000 -0700
> ++++ gnutls-2.8.6/lib/m4/gettext.m4 2010-05-19 22:15:18.491309044 -0700
> +@@ -1,5 +1,5 @@
> +-# gettext.m4 serial 60 (gettext-0.17)
> +-dnl Copyright (C) 1995-2007 Free Software Foundation, Inc.
> ++# gettext.m4 serial 63 (gettext-0.18)
> ++dnl Copyright (C) 1995-2010 Free Software Foundation, Inc.
> + dnl This file is free software; the Free Software Foundation
> + dnl gives unlimited permission to copy and/or distribute it,
> + dnl with or without modifications, as long as this notice is preserved.
> +@@ -15,7 +15,7 @@ dnl They are *not* in the public domain.
> +
> + dnl Authors:
> + dnl Ulrich Drepper <drepper@cygnus.com>, 1995-2000.
> +-dnl Bruno Haible <haible@clisp.cons.org>, 2000-2006.
> ++dnl Bruno Haible <haible@clisp.cons.org>, 2000-2006, 2008-2010.
> +
> + dnl Macro to add for using GNU gettext.
> +
> +@@ -60,6 +60,8 @@ AC_DEFUN([AM_GNU_GETTEXT],
> + ifelse([$1], [], , [ifelse([$1], [external], , [ifelse([$1], [no-libtool], , [ifelse([$1], [use-libtool], ,
> + [errprint([ERROR: invalid first argument to AM_GNU_GETTEXT
> + ])])])])])
> ++ ifelse(ifelse([$1], [], [old])[]ifelse([$1], [no-libtool], [old]), [old],
> ++ [AC_DIAGNOSE([obsolete], [Use of AM_GNU_GETTEXT without [external] argument is deprecated.])])
> + ifelse([$2], [], , [ifelse([$2], [need-ngettext], , [ifelse([$2], [need-formatstring-macros], ,
> + [errprint([ERROR: invalid second argument to AM_GNU_GETTEXT
> + ])])])])
> +@@ -123,11 +125,11 @@ AC_DEFUN([AM_GNU_GETTEXT],
> + gt_use_preinstalled_gnugettext=no
> + ifelse(gt_included_intl, yes, [
> + AC_MSG_CHECKING([whether included gettext is requested])
> +- AC_ARG_WITH(included-gettext,
> ++ AC_ARG_WITH([included-gettext],
> + [ --with-included-gettext use the GNU gettext library included here],
> + nls_cv_force_use_gnu_gettext=$withval,
> + nls_cv_force_use_gnu_gettext=no)
> +- AC_MSG_RESULT($nls_cv_force_use_gnu_gettext)
> ++ AC_MSG_RESULT([$nls_cv_force_use_gnu_gettext])
> +
> + nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext"
> + if test "$nls_cv_force_use_gnu_gettext" != "yes"; then
> +@@ -267,7 +269,7 @@ return * gettext ("")$gt_expression_test
> +
> + if test "$gt_use_preinstalled_gnugettext" = "yes" \
> + || test "$nls_cv_use_gnu_gettext" = "yes"; then
> +- AC_DEFINE(ENABLE_NLS, 1,
> ++ AC_DEFINE([ENABLE_NLS], [1],
> + [Define to 1 if translation of program messages to the user's native language
> + is requested.])
> + else
> +@@ -301,9 +303,9 @@ return * gettext ("")$gt_expression_test
> + fi
> +
> + dnl For backward compatibility. Some packages may be using this.
> +- AC_DEFINE(HAVE_GETTEXT, 1,
> ++ AC_DEFINE([HAVE_GETTEXT], [1],
> + [Define if the GNU gettext() function is already present or preinstalled.])
> +- AC_DEFINE(HAVE_DCGETTEXT, 1,
> ++ AC_DEFINE([HAVE_DCGETTEXT], [1],
> + [Define if the GNU dcgettext() function is already present or preinstalled.])
> + fi
> +
> +@@ -319,9 +321,9 @@ return * gettext ("")$gt_expression_test
> + fi
> +
> + dnl Make all variables we use known to autoconf.
> +- AC_SUBST(BUILD_INCLUDED_LIBINTL)
> +- AC_SUBST(USE_INCLUDED_LIBINTL)
> +- AC_SUBST(CATOBJEXT)
> ++ AC_SUBST([BUILD_INCLUDED_LIBINTL])
> ++ AC_SUBST([USE_INCLUDED_LIBINTL])
> ++ AC_SUBST([CATOBJEXT])
> +
> + dnl For backward compatibility. Some configure.ins may be using this.
> + nls_cv_header_intl=
> +@@ -329,36 +331,36 @@ return * gettext ("")$gt_expression_test
> +
> + dnl For backward compatibility. Some Makefiles may be using this.
> + DATADIRNAME=share
> +- AC_SUBST(DATADIRNAME)
> ++ AC_SUBST([DATADIRNAME])
> +
> + dnl For backward compatibility. Some Makefiles may be using this.
> + INSTOBJEXT=.mo
> +- AC_SUBST(INSTOBJEXT)
> ++ AC_SUBST([INSTOBJEXT])
> +
> + dnl For backward compatibility. Some Makefiles may be using this.
> + GENCAT=gencat
> +- AC_SUBST(GENCAT)
> ++ AC_SUBST([GENCAT])
> +
> + dnl For backward compatibility. Some Makefiles may be using this.
> + INTLOBJS=
> + if test "$USE_INCLUDED_LIBINTL" = yes; then
> + INTLOBJS="\$(GETTOBJS)"
> + fi
> +- AC_SUBST(INTLOBJS)
> ++ AC_SUBST([INTLOBJS])
> +
> + dnl Enable libtool support if the surrounding package wishes it.
> + INTL_LIBTOOL_SUFFIX_PREFIX=gt_libtool_suffix_prefix
> +- AC_SUBST(INTL_LIBTOOL_SUFFIX_PREFIX)
> ++ AC_SUBST([INTL_LIBTOOL_SUFFIX_PREFIX])
> + ])
> +
> + dnl For backward compatibility. Some Makefiles may be using this.
> + INTLLIBS="$LIBINTL"
> +- AC_SUBST(INTLLIBS)
> ++ AC_SUBST([INTLLIBS])
> +
> + dnl Make all documented variables known to autoconf.
> +- AC_SUBST(LIBINTL)
> +- AC_SUBST(LTLIBINTL)
> +- AC_SUBST(POSUB)
> ++ AC_SUBST([LIBINTL])
> ++ AC_SUBST([LTLIBINTL])
> ++ AC_SUBST([POSUB])
> + ])
> +
> +
> +Index: gnutls-2.8.6/lib/m4/iconv.m4
> +===================================================================
> +--- gnutls-2.8.6.orig/lib/m4/iconv.m4 2010-03-15 03:28:11.000000000 -0700
> ++++ gnutls-2.8.6/lib/m4/iconv.m4 2010-05-19 22:15:18.491309044 -0700
> +@@ -1,5 +1,5 @@
> +-# iconv.m4 serial AM6 (gettext-0.17)
> +-dnl Copyright (C) 2000-2002, 2007 Free Software Foundation, Inc.
> ++# iconv.m4 serial 9 (gettext-0.18)
> ++dnl Copyright (C) 2000-2002, 2007-2010 Free Software Foundation, Inc.
> + dnl This file is free software; the Free Software Foundation
> + dnl gives unlimited permission to copy and/or distribute it,
> + dnl with or without modifications, as long as this notice is preserved.
> +@@ -34,7 +34,7 @@ AC_DEFUN([AM_ICONV_LINK],
> + am_save_CPPFLAGS="$CPPFLAGS"
> + AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCICONV])
> +
> +- AC_CACHE_CHECK([for iconv], am_cv_func_iconv, [
> ++ AC_CACHE_CHECK([for iconv], [am_cv_func_iconv], [
> + am_cv_func_iconv="no, consider installing GNU libiconv"
> + am_cv_lib_iconv=no
> + AC_TRY_LINK([#include <stdlib.h>
> +@@ -42,7 +42,7 @@ AC_DEFUN([AM_ICONV_LINK],
> + [iconv_t cd = iconv_open("","");
> + iconv(cd,NULL,NULL,NULL,NULL);
> + iconv_close(cd);],
> +- am_cv_func_iconv=yes)
> ++ [am_cv_func_iconv=yes])
> + if test "$am_cv_func_iconv" != yes; then
> + am_save_LIBS="$LIBS"
> + LIBS="$LIBS $LIBICONV"
> +@@ -51,14 +51,14 @@ AC_DEFUN([AM_ICONV_LINK],
> + [iconv_t cd = iconv_open("","");
> + iconv(cd,NULL,NULL,NULL,NULL);
> + iconv_close(cd);],
> +- am_cv_lib_iconv=yes
> +- am_cv_func_iconv=yes)
> ++ [am_cv_lib_iconv=yes]
> ++ [am_cv_func_iconv=yes])
> + LIBS="$am_save_LIBS"
> + fi
> + ])
> + if test "$am_cv_func_iconv" = yes; then
> +- AC_CACHE_CHECK([for working iconv], am_cv_func_iconv_works, [
> +- dnl This tests against bugs in AIX 5.1 and HP-UX 11.11.
> ++ AC_CACHE_CHECK([for working iconv], [am_cv_func_iconv_works], [
> ++ dnl This tests against bugs in AIX 5.1, HP-UX 11.11, Solaris 10.
> + am_save_LIBS="$LIBS"
> + if test $am_cv_lib_iconv = yes; then
> + LIBS="$LIBS $LIBICONV"
> +@@ -87,6 +87,25 @@ int main ()
> + return 1;
> + }
> + }
> ++ /* Test against Solaris 10 bug: Failures are not distinguishable from
> ++ successful returns. */
> ++ {
> ++ iconv_t cd_ascii_to_88591 = iconv_open ("ISO8859-1", "646");
> ++ if (cd_ascii_to_88591 != (iconv_t)(-1))
> ++ {
> ++ static const char input[] = "\263";
> ++ char buf[10];
> ++ const char *inptr = input;
> ++ size_t inbytesleft = strlen (input);
> ++ char *outptr = buf;
> ++ size_t outbytesleft = sizeof (buf);
> ++ size_t res = iconv (cd_ascii_to_88591,
> ++ (char **) &inptr, &inbytesleft,
> ++ &outptr, &outbytesleft);
> ++ if (res == 0)
> ++ return 1;
> ++ }
> ++ }
> + #if 0 /* This bug could be worked around by the caller. */
> + /* Test against HP-UX 11.11 bug: Positive return value instead of 0. */
> + {
> +@@ -134,7 +153,7 @@ int main ()
> + am_func_iconv=no am_cv_lib_iconv=no
> + fi
> + if test "$am_func_iconv" = yes; then
> +- AC_DEFINE(HAVE_ICONV, 1,
> ++ AC_DEFINE([HAVE_ICONV], [1],
> + [Define if you have the iconv() function and it works.])
> + fi
> + if test "$am_cv_lib_iconv" = yes; then
> +@@ -147,8 +166,8 @@ int main ()
> + LIBICONV=
> + LTLIBICONV=
> + fi
> +- AC_SUBST(LIBICONV)
> +- AC_SUBST(LTLIBICONV)
> ++ AC_SUBST([LIBICONV])
> ++ AC_SUBST([LTLIBICONV])
> + ])
> +
> + AC_DEFUN([AM_ICONV],
> +@@ -156,7 +175,7 @@ AC_DEFUN([AM_ICONV],
> + AM_ICONV_LINK
> + if test "$am_cv_func_iconv" = yes; then
> + AC_MSG_CHECKING([for iconv declaration])
> +- AC_CACHE_VAL(am_cv_proto_iconv, [
> ++ AC_CACHE_VAL([am_cv_proto_iconv], [
> + AC_TRY_COMPILE([
> + #include <stdlib.h>
> + #include <iconv.h>
> +@@ -169,12 +188,12 @@ size_t iconv (iconv_t cd, char * *inbuf,
> + #else
> + size_t iconv();
> + #endif
> +-], [], am_cv_proto_iconv_arg1="", am_cv_proto_iconv_arg1="const")
> ++], [], [am_cv_proto_iconv_arg1=""], [am_cv_proto_iconv_arg1="const"])
> + am_cv_proto_iconv="extern size_t iconv (iconv_t cd, $am_cv_proto_iconv_arg1 char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);"])
> + am_cv_proto_iconv=`echo "[$]am_cv_proto_iconv" | tr -s ' ' | sed -e 's/( /(/'`
> +- AC_MSG_RESULT([$]{ac_t:-
> +- }[$]am_cv_proto_iconv)
> +- AC_DEFINE_UNQUOTED(ICONV_CONST, $am_cv_proto_iconv_arg1,
> ++ AC_MSG_RESULT([
> ++ $am_cv_proto_iconv])
> ++ AC_DEFINE_UNQUOTED([ICONV_CONST], [$am_cv_proto_iconv_arg1],
> + [Define as const if the declaration of iconv() needs const.])
> + fi
> + ])
> +Index: gnutls-2.8.6/lib/m4/lib-ld.m4
> +===================================================================
> +--- gnutls-2.8.6.orig/lib/m4/lib-ld.m4 2010-03-15 03:28:11.000000000 -0700
> ++++ gnutls-2.8.6/lib/m4/lib-ld.m4 2010-05-19 22:15:18.511309002 -0700
> +@@ -1,5 +1,5 @@
> +-# lib-ld.m4 serial 3 (gettext-0.13)
> +-dnl Copyright (C) 1996-2003 Free Software Foundation, Inc.
> ++# lib-ld.m4 serial 4 (gettext-0.18)
> ++dnl Copyright (C) 1996-2003, 2009-2010 Free Software Foundation, Inc.
> + dnl This file is free software; the Free Software Foundation
> + dnl gives unlimited permission to copy and/or distribute it,
> + dnl with or without modifications, as long as this notice is preserved.
> +@@ -10,7 +10,7 @@ dnl with libtool.m4.
> +
> + dnl From libtool-1.4. Sets the variable with_gnu_ld to yes or no.
> + AC_DEFUN([AC_LIB_PROG_LD_GNU],
> +-[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], acl_cv_prog_gnu_ld,
> ++[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], [acl_cv_prog_gnu_ld],
> + [# I'd rather use --version here, but apparently some GNU ld's only accept -v.
> + case `$LD -v 2>&1 </dev/null` in
> + *GNU* | *'with BFD'*)
> +@@ -23,7 +23,7 @@ with_gnu_ld=$acl_cv_prog_gnu_ld
> +
> + dnl From libtool-1.4. Sets the variable LD.
> + AC_DEFUN([AC_LIB_PROG_LD],
> +-[AC_ARG_WITH(gnu-ld,
> ++[AC_ARG_WITH([gnu-ld],
> + [ --with-gnu-ld assume the C compiler uses GNU ld [default=no]],
> + test "$withval" = no || with_gnu_ld=yes, with_gnu_ld=no)
> + AC_REQUIRE([AC_PROG_CC])dnl
> +@@ -59,7 +59,7 @@ if test "$GCC" = yes; then
> + # Canonicalize the path of ld
> + ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'`
> + while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
> +- ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`
> ++ ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`
> + done
> + test -z "$LD" && LD="$ac_prog"
> + ;;
> +@@ -77,7 +77,7 @@ elif test "$with_gnu_ld" = yes; then
> + else
> + AC_MSG_CHECKING([for non-GNU ld])
> + fi
> +-AC_CACHE_VAL(acl_cv_path_LD,
> ++AC_CACHE_VAL([acl_cv_path_LD],
> + [if test -z "$LD"; then
> + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
> + for ac_dir in $PATH; do
> +@@ -89,9 +89,9 @@ AC_CACHE_VAL(acl_cv_path_LD,
> + # Break only if it was the GNU/non-GNU ld that we prefer.
> + case `"$acl_cv_path_LD" -v 2>&1 < /dev/null` in
> + *GNU* | *'with BFD'*)
> +- test "$with_gnu_ld" != no && break ;;
> ++ test "$with_gnu_ld" != no && break ;;
> + *)
> +- test "$with_gnu_ld" != yes && break ;;
> ++ test "$with_gnu_ld" != yes && break ;;
> + esac
> + fi
> + done
> +@@ -101,9 +101,9 @@ else
> + fi])
> + LD="$acl_cv_path_LD"
> + if test -n "$LD"; then
> +- AC_MSG_RESULT($LD)
> ++ AC_MSG_RESULT([$LD])
> + else
> +- AC_MSG_RESULT(no)
> ++ AC_MSG_RESULT([no])
> + fi
> + test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
> + AC_LIB_PROG_LD_GNU
> +Index: gnutls-2.8.6/lib/m4/lib-link.m4
> +===================================================================
> +--- gnutls-2.8.6.orig/lib/m4/lib-link.m4 2010-03-15 03:28:11.000000000 -0700
> ++++ gnutls-2.8.6/lib/m4/lib-link.m4 2010-05-19 22:15:18.521282615 -0700
> +@@ -1,12 +1,12 @@
> +-# lib-link.m4 serial 13 (gettext-0.17)
> +-dnl Copyright (C) 2001-2007 Free Software Foundation, Inc.
> ++# lib-link.m4 serial 21 (gettext-0.18)
> ++dnl Copyright (C) 2001-2010 Free Software Foundation, Inc.
> + dnl This file is free software; the Free Software Foundation
> + dnl gives unlimited permission to copy and/or distribute it,
> + dnl with or without modifications, as long as this notice is preserved.
> +
> + dnl From Bruno Haible.
> +
> +-AC_PREREQ(2.54)
> ++AC_PREREQ([2.54])
> +
> + dnl AC_LIB_LINKFLAGS(name [, dependencies]) searches for libname and
> + dnl the libraries corresponding to explicit and implicit dependencies.
> +@@ -18,9 +18,9 @@ AC_DEFUN([AC_LIB_LINKFLAGS],
> + [
> + AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
> + AC_REQUIRE([AC_LIB_RPATH])
> +- define([Name],[translit([$1],[./-], [___])])
> +- define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
> +- [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
> ++ pushdef([Name],[translit([$1],[./-], [___])])
> ++ pushdef([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
> ++ [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
> + AC_CACHE_CHECK([how to link with lib[]$1], [ac_cv_lib[]Name[]_libs], [
> + AC_LIB_LINKFLAGS_BODY([$1], [$2])
> + ac_cv_lib[]Name[]_libs="$LIB[]NAME"
> +@@ -39,16 +39,17 @@ AC_DEFUN([AC_LIB_LINKFLAGS],
> + dnl Also set HAVE_LIB[]NAME so that AC_LIB_HAVE_LINKFLAGS can reuse the
> + dnl results of this search when this library appears as a dependency.
> + HAVE_LIB[]NAME=yes
> +- undefine([Name])
> +- undefine([NAME])
> ++ popdef([NAME])
> ++ popdef([Name])
> + ])
> +
> +-dnl AC_LIB_HAVE_LINKFLAGS(name, dependencies, includes, testcode)
> ++dnl AC_LIB_HAVE_LINKFLAGS(name, dependencies, includes, testcode, [missing-message])
> + dnl searches for libname and the libraries corresponding to explicit and
> + dnl implicit dependencies, together with the specified include files and
> +-dnl the ability to compile and link the specified testcode. If found, it
> +-dnl sets and AC_SUBSTs HAVE_LIB${NAME}=yes and the LIB${NAME} and
> +-dnl LTLIB${NAME} variables and augments the CPPFLAGS variable, and
> ++dnl the ability to compile and link the specified testcode. The missing-message
> ++dnl defaults to 'no' and may contain additional hints for the user.
> ++dnl If found, it sets and AC_SUBSTs HAVE_LIB${NAME}=yes and the LIB${NAME}
> ++dnl and LTLIB${NAME} variables and augments the CPPFLAGS variable, and
> + dnl #defines HAVE_LIB${NAME} to 1. Otherwise, it sets and AC_SUBSTs
> + dnl HAVE_LIB${NAME}=no and LIB${NAME} and LTLIB${NAME} to empty.
> + dnl Sets and AC_SUBSTs the LIB${NAME}_PREFIX variable to nonempty if libname
> +@@ -57,9 +58,9 @@ AC_DEFUN([AC_LIB_HAVE_LINKFLAGS],
> + [
> + AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
> + AC_REQUIRE([AC_LIB_RPATH])
> +- define([Name],[translit([$1],[./-], [___])])
> +- define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
> +- [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
> ++ pushdef([Name],[translit([$1],[./-], [___])])
> ++ pushdef([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
> ++ [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
> +
> + dnl Search for lib[]Name and define LIB[]NAME, LTLIB[]NAME and INC[]NAME
> + dnl accordingly.
> +@@ -73,13 +74,25 @@ AC_DEFUN([AC_LIB_HAVE_LINKFLAGS],
> +
> + AC_CACHE_CHECK([for lib[]$1], [ac_cv_lib[]Name], [
> + ac_save_LIBS="$LIBS"
> +- LIBS="$LIBS $LIB[]NAME"
> +- AC_TRY_LINK([$3], [$4], [ac_cv_lib[]Name=yes], [ac_cv_lib[]Name=no])
> ++ dnl If $LIB[]NAME contains some -l options, add it to the end of LIBS,
> ++ dnl because these -l options might require -L options that are present in
> ++ dnl LIBS. -l options benefit only from the -L options listed before it.
> ++ dnl Otherwise, add it to the front of LIBS, because it may be a static
> ++ dnl library that depends on another static library that is present in LIBS.
> ++ dnl Static libraries benefit only from the static libraries listed after
> ++ dnl it.
> ++ case " $LIB[]NAME" in
> ++ *" -l"*) LIBS="$LIBS $LIB[]NAME" ;;
> ++ *) LIBS="$LIB[]NAME $LIBS" ;;
> ++ esac
> ++ AC_TRY_LINK([$3], [$4],
> ++ [ac_cv_lib[]Name=yes],
> ++ [ac_cv_lib[]Name='m4_if([$5], [], [no], [[$5]])'])
> + LIBS="$ac_save_LIBS"
> + ])
> + if test "$ac_cv_lib[]Name" = yes; then
> + HAVE_LIB[]NAME=yes
> +- AC_DEFINE([HAVE_LIB]NAME, 1, [Define if you have the $1 library.])
> ++ AC_DEFINE([HAVE_LIB]NAME, 1, [Define if you have the lib][$1 library.])
> + AC_MSG_CHECKING([how to link with lib[]$1])
> + AC_MSG_RESULT([$LIB[]NAME])
> + else
> +@@ -95,8 +108,8 @@ AC_DEFUN([AC_LIB_HAVE_LINKFLAGS],
> + AC_SUBST([LIB]NAME)
> + AC_SUBST([LTLIB]NAME)
> + AC_SUBST([LIB]NAME[_PREFIX])
> +- undefine([Name])
> +- undefine([NAME])
> ++ popdef([NAME])
> ++ popdef([Name])
> + ])
> +
> + dnl Determine the platform dependent parameters needed to use rpath:
> +@@ -114,7 +127,7 @@ AC_DEFUN([AC_LIB_RPATH],
> + AC_REQUIRE([AC_LIB_PROG_LD]) dnl we use $LD, $with_gnu_ld
> + AC_REQUIRE([AC_CANONICAL_HOST]) dnl we use $host
> + AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT]) dnl we use $ac_aux_dir
> +- AC_CACHE_CHECK([for shared library run path origin], acl_cv_rpath, [
> ++ AC_CACHE_CHECK([for shared library run path origin], [acl_cv_rpath], [
> + CC="$CC" GCC="$GCC" LDFLAGS="$LDFLAGS" LD="$LD" with_gnu_ld="$with_gnu_ld" \
> + ${CONFIG_SHELL-/bin/sh} "$ac_aux_dir/config.rpath" "$host" > conftest.sh
> + . ./conftest.sh
> +@@ -131,11 +144,32 @@ AC_DEFUN([AC_LIB_RPATH],
> + acl_hardcode_direct="$acl_cv_hardcode_direct"
> + acl_hardcode_minus_L="$acl_cv_hardcode_minus_L"
> + dnl Determine whether the user wants rpath handling at all.
> +- AC_ARG_ENABLE(rpath,
> ++ AC_ARG_ENABLE([rpath],
> + [ --disable-rpath do not hardcode runtime library paths],
> + :, enable_rpath=yes)
> + ])
> +
> ++dnl AC_LIB_FROMPACKAGE(name, package)
> ++dnl declares that libname comes from the given package. The configure file
> ++dnl will then not have a --with-libname-prefix option but a
> ++dnl --with-package-prefix option. Several libraries can come from the same
> ++dnl package. This declaration must occur before an AC_LIB_LINKFLAGS or similar
> ++dnl macro call that searches for libname.
> ++AC_DEFUN([AC_LIB_FROMPACKAGE],
> ++[
> ++ pushdef([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
> ++ [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
> ++ define([acl_frompackage_]NAME, [$2])
> ++ popdef([NAME])
> ++ pushdef([PACK],[$2])
> ++ pushdef([PACKUP],[translit(PACK,[abcdefghijklmnopqrstuvwxyz./-],
> ++ [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
> ++ define([acl_libsinpackage_]PACKUP,
> ++ m4_ifdef([acl_libsinpackage_]PACKUP, [acl_libsinpackage_]PACKUP[[, ]],)[lib$1])
> ++ popdef([PACKUP])
> ++ popdef([PACK])
> ++])
> ++
> + dnl AC_LIB_LINKFLAGS_BODY(name [, dependencies]) searches for libname and
> + dnl the libraries corresponding to explicit and implicit dependencies.
> + dnl Sets the LIB${NAME}, LTLIB${NAME} and INC${NAME} variables.
> +@@ -144,19 +178,23 @@ dnl in ${LIB${NAME}_PREFIX}/$acl_libdirs
> + AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
> + [
> + AC_REQUIRE([AC_LIB_PREPARE_MULTILIB])
> +- define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
> +- [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
> ++ pushdef([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
> ++ [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
> ++ pushdef([PACK],[m4_ifdef([acl_frompackage_]NAME, [acl_frompackage_]NAME, lib[$1])])
> ++ pushdef([PACKUP],[translit(PACK,[abcdefghijklmnopqrstuvwxyz./-],
> ++ [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
> ++ pushdef([PACKLIBS],[m4_ifdef([acl_frompackage_]NAME, [acl_libsinpackage_]PACKUP, lib[$1])])
> + dnl Autoconf >= 2.61 supports dots in --with options.
> +- define([N_A_M_E],[m4_if(m4_version_compare(m4_defn([m4_PACKAGE_VERSION]),[2.61]),[-1],[translit([$1],[.],[_])],[$1])])
> ++ pushdef([P_A_C_K],[m4_if(m4_version_compare(m4_defn([m4_PACKAGE_VERSION]),[2.61]),[-1],[translit(PACK,[.],[_])],PACK)])
> + dnl By default, look in $includedir and $libdir.
> + use_additional=yes
> + AC_LIB_WITH_FINAL_PREFIX([
> + eval additional_includedir=\"$includedir\"
> + eval additional_libdir=\"$libdir\"
> + ])
> +- AC_LIB_ARG_WITH([lib]N_A_M_E[-prefix],
> +-[ --with-lib]N_A_M_E[-prefix[=DIR] search for lib$1 in DIR/include and DIR/lib
> +- --without-lib]N_A_M_E[-prefix don't search for lib$1 in includedir and libdir],
> ++ AC_ARG_WITH(P_A_C_K[-prefix],
> ++[[ --with-]]P_A_C_K[[-prefix[=DIR] search for ]PACKLIBS[ in DIR/include and DIR/lib
> ++ --without-]]P_A_C_K[[-prefix don't search for ]PACKLIBS[ in includedir and libdir]],
> + [
> + if test "X$withval" = "Xno"; then
> + use_additional=no
> +@@ -169,6 +207,10 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
> + else
> + additional_includedir="$withval/include"
> + additional_libdir="$withval/$acl_libdirstem"
> ++ if test "$acl_libdirstem2" != "$acl_libdirstem" \
> ++ && ! test -d "$withval/$acl_libdirstem"; then
> ++ additional_libdir="$withval/$acl_libdirstem2"
> ++ fi
> + fi
> + fi
> + ])
> +@@ -178,6 +220,9 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
> + LTLIB[]NAME=
> + INC[]NAME=
> + LIB[]NAME[]_PREFIX=
> ++ dnl HAVE_LIB${NAME} is an indicator that LIB${NAME}, LTLIB${NAME} have been
> ++ dnl computed. So it has to be reset here.
> ++ HAVE_LIB[]NAME=
> + rpathdirs=
> + ltrpathdirs=
> + names_already_handled=
> +@@ -267,6 +312,9 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
> + fi
> + fi
> + fi
> ++ dnl Just let the compiler find the library, the compiler and user are smarter then this script
> ++ dnl when cross compiling and working with a relocated install.
> ++ found_dir=""
> + if test "X$found_dir" = "X"; then
> + for x in $LDFLAGS $LTLIB[]NAME; do
> + AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
> +@@ -327,7 +375,9 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
> + dnl Linking with a shared library. We attempt to hardcode its
> + dnl directory into the executable's runpath, unless it's the
> + dnl standard /usr/lib.
> +- if test "$enable_rpath" = no || test "X$found_dir" = "X/usr/$acl_libdirstem"; then
> ++ if test "$enable_rpath" = no \
> ++ || test "X$found_dir" = "X/usr/$acl_libdirstem" \
> ++ || test "X$found_dir" = "X/usr/$acl_libdirstem2"; then
> + dnl No hardcoding is needed.
> + LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
> + else
> +@@ -415,7 +465,16 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
> + case "$found_dir" in
> + */$acl_libdirstem | */$acl_libdirstem/)
> + basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem/"'*$,,'`
> +- LIB[]NAME[]_PREFIX="$basedir"
> ++ if test "$name" = '$1'; then
> ++ LIB[]NAME[]_PREFIX="$basedir"
> ++ fi
> ++ additional_includedir="$basedir/include"
> ++ ;;
> ++ */$acl_libdirstem2 | */$acl_libdirstem2/)
> ++ basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem2/"'*$,,'`
> ++ if test "$name" = '$1'; then
> ++ LIB[]NAME[]_PREFIX="$basedir"
> ++ fi
> + additional_includedir="$basedir/include"
> + ;;
> + esac
> +@@ -476,9 +535,11 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
> + dnl 3. if it's already present in $LDFLAGS or the already
> + dnl constructed $LIBNAME,
> + dnl 4. if it doesn't exist as a directory.
> +- if test "X$additional_libdir" != "X/usr/$acl_libdirstem"; then
> ++ if test "X$additional_libdir" != "X/usr/$acl_libdirstem" \
> ++ && test "X$additional_libdir" != "X/usr/$acl_libdirstem2"; then
> + haveit=
> +- if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem"; then
> ++ if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem" \
> ++ || test "X$additional_libdir" = "X/usr/local/$acl_libdirstem2"; then
> + if test -n "$GCC"; then
> + case $host_os in
> + linux* | gnu* | k*bsd*-gnu) haveit=yes;;
> +@@ -609,6 +670,11 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
> + LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-R$found_dir"
> + done
> + fi
> ++ popdef([P_A_C_K])
> ++ popdef([PACKLIBS])
> ++ popdef([PACKUP])
> ++ popdef([PACK])
> ++ popdef([NAME])
> + ])
> +
> + dnl AC_LIB_APPENDTOVAR(VAR, CONTENTS) appends the elements of CONTENTS to VAR,
> +@@ -654,7 +720,8 @@ AC_DEFUN([AC_LIB_LINKFLAGS_FROM_LIBS],
> + if test -n "$next"; then
> + dir="$next"
> + dnl No need to hardcode the standard /usr/lib.
> +- if test "X$dir" != "X/usr/$acl_libdirstem"; then
> ++ if test "X$dir" != "X/usr/$acl_libdirstem" \
> ++ && test "X$dir" != "X/usr/$acl_libdirstem2"; then
> + rpathdirs="$rpathdirs $dir"
> + fi
> + next=
> +@@ -663,7 +730,8 @@ AC_DEFUN([AC_LIB_LINKFLAGS_FROM_LIBS],
> + -L) next=yes ;;
> + -L*) dir=`echo "X$opt" | sed -e 's,^X-L,,'`
> + dnl No need to hardcode the standard /usr/lib.
> +- if test "X$dir" != "X/usr/$acl_libdirstem"; then
> ++ if test "X$dir" != "X/usr/$acl_libdirstem" \
> ++ && test "X$dir" != "X/usr/$acl_libdirstem2"; then
> + rpathdirs="$rpathdirs $dir"
> + fi
> + next= ;;
> +Index: gnutls-2.8.6/lib/m4/lib-prefix.m4
> +===================================================================
> +--- gnutls-2.8.6.orig/lib/m4/lib-prefix.m4 2010-03-15 03:28:11.000000000 -0700
> ++++ gnutls-2.8.6/lib/m4/lib-prefix.m4 2010-05-19 22:15:18.521282615 -0700
> +@@ -1,5 +1,5 @@
> +-# lib-prefix.m4 serial 5 (gettext-0.15)
> +-dnl Copyright (C) 2001-2005 Free Software Foundation, Inc.
> ++# lib-prefix.m4 serial 7 (gettext-0.18)
> ++dnl Copyright (C) 2001-2005, 2008-2010 Free Software Foundation, Inc.
> + dnl This file is free software; the Free Software Foundation
> + dnl gives unlimited permission to copy and/or distribute it,
> + dnl with or without modifications, as long as this notice is preserved.
> +@@ -153,33 +153,72 @@ AC_DEFUN([AC_LIB_WITH_FINAL_PREFIX],
> + prefix="$acl_save_prefix"
> + ])
> +
> +-dnl AC_LIB_PREPARE_MULTILIB creates a variable acl_libdirstem, containing
> +-dnl the basename of the libdir, either "lib" or "lib64".
> ++dnl AC_LIB_PREPARE_MULTILIB creates
> ++dnl - a variable acl_libdirstem, containing the basename of the libdir, either
> ++dnl "lib" or "lib64" or "lib/64",
> ++dnl - a variable acl_libdirstem2, as a secondary possible value for
> ++dnl acl_libdirstem, either the same as acl_libdirstem or "lib/sparcv9" or
> ++dnl "lib/amd64".
> + AC_DEFUN([AC_LIB_PREPARE_MULTILIB],
> + [
> +- dnl There is no formal standard regarding lib and lib64. The current
> +- dnl practice is that on a system supporting 32-bit and 64-bit instruction
> +- dnl sets or ABIs, 64-bit libraries go under $prefix/lib64 and 32-bit
> +- dnl libraries go under $prefix/lib. We determine the compiler's default
> +- dnl mode by looking at the compiler's library search path. If at least
> +- dnl of its elements ends in /lib64 or points to a directory whose absolute
> +- dnl pathname ends in /lib64, we assume a 64-bit ABI. Otherwise we use the
> +- dnl default, namely "lib".
> ++ dnl There is no formal standard regarding lib and lib64.
> ++ dnl On glibc systems, the current practice is that on a system supporting
> ++ dnl 32-bit and 64-bit instruction sets or ABIs, 64-bit libraries go under
> ++ dnl $prefix/lib64 and 32-bit libraries go under $prefix/lib. We determine
> ++ dnl the compiler's default mode by looking at the compiler's library search
> ++ dnl path. If at least one of its elements ends in /lib64 or points to a
> ++ dnl directory whose absolute pathname ends in /lib64, we assume a 64-bit ABI.
> ++ dnl Otherwise we use the default, namely "lib".
> ++ dnl On Solaris systems, the current practice is that on a system supporting
> ++ dnl 32-bit and 64-bit instruction sets or ABIs, 64-bit libraries go under
> ++ dnl $prefix/lib/64 (which is a symlink to either $prefix/lib/sparcv9 or
> ++ dnl $prefix/lib/amd64) and 32-bit libraries go under $prefix/lib.
> ++ AC_REQUIRE([AC_CANONICAL_HOST])
> + acl_libdirstem=lib
> +- searchpath=`(LC_ALL=C $CC -print-search-dirs) 2>/dev/null | sed -n -e 's,^libraries: ,,p' | sed -e 's,^=,,'`
> +- if test -n "$searchpath"; then
> +- acl_save_IFS="${IFS= }"; IFS=":"
> +- for searchdir in $searchpath; do
> +- if test -d "$searchdir"; then
> +- case "$searchdir" in
> +- */lib64/ | */lib64 ) acl_libdirstem=lib64 ;;
> +- *) searchdir=`cd "$searchdir" && pwd`
> +- case "$searchdir" in
> +- */lib64 ) acl_libdirstem=lib64 ;;
> +- esac ;;
> ++ acl_libdirstem2=
> ++ case "$host_os" in
> ++ solaris*)
> ++ dnl See Solaris 10 Software Developer Collection > Solaris 64-bit Developer's Guide > The Development Environment
> ++ dnl <http://docs.sun.com/app/docs/doc/816-5138/dev-env?l=en&a=view>.
> ++ dnl "Portable Makefiles should refer to any library directories using the 64 symbolic link."
> ++ dnl But we want to recognize the sparcv9 or amd64 subdirectory also if the
> ++ dnl symlink is missing, so we set acl_libdirstem2 too.
> ++ AC_CACHE_CHECK([for 64-bit host], [gl_cv_solaris_64bit],
> ++ [AC_EGREP_CPP([sixtyfour bits], [
> ++#ifdef _LP64
> ++sixtyfour bits
> ++#endif
> ++ ], [gl_cv_solaris_64bit=yes], [gl_cv_solaris_64bit=no])
> ++ ])
> ++ if test $gl_cv_solaris_64bit = yes; then
> ++ acl_libdirstem=lib/64
> ++ case "$host_cpu" in
> ++ sparc*) acl_libdirstem2=lib/sparcv9 ;;
> ++ i*86 | x86_64) acl_libdirstem2=lib/amd64 ;;
> + esac
> + fi
> +- done
> +- IFS="$acl_save_IFS"
> +- fi
> ++ ;;
> ++ *)
> ++ searchpath=`(LC_ALL=C $CC -print-search-dirs) 2>/dev/null | sed -n -e 's,^libraries: ,,p' | sed -e 's,^=,,'`
> ++ if test -n "$searchpath"; then
> ++ acl_save_IFS="${IFS= }"; IFS=":"
> ++ for searchdir in $searchpath; do
> ++ if test -d "$searchdir"; then
> ++ case "$searchdir" in
> ++ */lib64/ | */lib64 ) acl_libdirstem=lib64 ;;
> ++ */../ | */.. )
> ++ # Better ignore directories of this form. They are misleading.
> ++ ;;
> ++ *) searchdir=`cd "$searchdir" && pwd`
> ++ case "$searchdir" in
> ++ */lib64 ) acl_libdirstem=lib64 ;;
> ++ esac ;;
> ++ esac
> ++ fi
> ++ done
> ++ IFS="$acl_save_IFS"
> ++ fi
> ++ ;;
> ++ esac
> ++ test -n "$acl_libdirstem2" || acl_libdirstem2="$acl_libdirstem"
> + ])
> +Index: gnutls-2.8.6/lib/m4/nls.m4
> +===================================================================
> +--- gnutls-2.8.6.orig/lib/m4/nls.m4 2010-03-15 03:28:11.000000000 -0700
> ++++ gnutls-2.8.6/lib/m4/nls.m4 2010-05-19 22:15:18.521282615 -0700
> +@@ -1,5 +1,6 @@
> +-# nls.m4 serial 3 (gettext-0.15)
> +-dnl Copyright (C) 1995-2003, 2005-2006 Free Software Foundation, Inc.
> ++# nls.m4 serial 5 (gettext-0.18)
> ++dnl Copyright (C) 1995-2003, 2005-2006, 2008-2010 Free Software Foundation,
> ++dnl Inc.
> + dnl This file is free software; the Free Software Foundation
> + dnl gives unlimited permission to copy and/or distribute it,
> + dnl with or without modifications, as long as this notice is preserved.
> +@@ -17,15 +18,15 @@ dnl Authors:
> + dnl Ulrich Drepper <drepper@cygnus.com>, 1995-2000.
> + dnl Bruno Haible <haible@clisp.cons.org>, 2000-2003.
> +
> +-AC_PREREQ(2.50)
> ++AC_PREREQ([2.50])
> +
> + AC_DEFUN([AM_NLS],
> + [
> + AC_MSG_CHECKING([whether NLS is requested])
> + dnl Default is enabled NLS
> +- AC_ARG_ENABLE(nls,
> ++ AC_ARG_ENABLE([nls],
> + [ --disable-nls do not use Native Language Support],
> + USE_NLS=$enableval, USE_NLS=yes)
> +- AC_MSG_RESULT($USE_NLS)
> +- AC_SUBST(USE_NLS)
> ++ AC_MSG_RESULT([$USE_NLS])
> ++ AC_SUBST([USE_NLS])
> + ])
> +Index: gnutls-2.8.6/lib/m4/po.m4
> +===================================================================
> +--- gnutls-2.8.6.orig/lib/m4/po.m4 2010-03-15 03:28:11.000000000 -0700
> ++++ gnutls-2.8.6/lib/m4/po.m4 2010-05-19 22:15:18.521282615 -0700
> +@@ -1,5 +1,5 @@
> +-# po.m4 serial 15 (gettext-0.17)
> +-dnl Copyright (C) 1995-2007 Free Software Foundation, Inc.
> ++# po.m4 serial 17 (gettext-0.18)
> ++dnl Copyright (C) 1995-2010 Free Software Foundation, Inc.
> + dnl This file is free software; the Free Software Foundation
> + dnl gives unlimited permission to copy and/or distribute it,
> + dnl with or without modifications, as long as this notice is preserved.
> +@@ -17,7 +17,7 @@ dnl Authors:
> + dnl Ulrich Drepper <drepper@cygnus.com>, 1995-2000.
> + dnl Bruno Haible <haible@clisp.cons.org>, 2000-2003.
> +
> +-AC_PREREQ(2.50)
> ++AC_PREREQ([2.50])
> +
> + dnl Checks for all prerequisites of the po subdirectory.
> + AC_DEFUN([AM_PO_SUBDIRS],
> +@@ -29,7 +29,7 @@ AC_DEFUN([AM_PO_SUBDIRS],
> +
> + dnl Release version of the gettext macros. This is used to ensure that
> + dnl the gettext macros and po/Makefile.in.in are in sync.
> +- AC_SUBST([GETTEXT_MACRO_VERSION], [0.17])
> ++ AC_SUBST([GETTEXT_MACRO_VERSION], [0.18])
> +
> + dnl Perform the following tests also if --disable-nls has been given,
> + dnl because they are needed for "make dist" to work.
> +@@ -41,7 +41,7 @@ AC_DEFUN([AM_PO_SUBDIRS],
> + [$ac_dir/$ac_word --statistics /dev/null >&]AS_MESSAGE_LOG_FD[ 2>&1 &&
> + (if $ac_dir/$ac_word --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi)],
> + :)
> +- AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
> ++ AC_PATH_PROG([GMSGFMT], [gmsgfmt], [$MSGFMT])
> +
> + dnl Test whether it is GNU msgfmt >= 0.15.
> + changequote(,)dnl
> +Index: gnutls-2.8.6/lib/m4/progtest.m4
> +===================================================================
> +--- gnutls-2.8.6.orig/lib/m4/progtest.m4 2010-03-15 03:28:11.000000000 -0700
> ++++ gnutls-2.8.6/lib/m4/progtest.m4 2010-05-19 22:15:18.521282615 -0700
> +@@ -1,5 +1,5 @@
> +-# progtest.m4 serial 4 (gettext-0.14.2)
> +-dnl Copyright (C) 1996-2003, 2005 Free Software Foundation, Inc.
> ++# progtest.m4 serial 6 (gettext-0.18)
> ++dnl Copyright (C) 1996-2003, 2005, 2008-2010 Free Software Foundation, Inc.
> + dnl This file is free software; the Free Software Foundation
> + dnl gives unlimited permission to copy and/or distribute it,
> + dnl with or without modifications, as long as this notice is preserved.
> +@@ -16,7 +16,7 @@ dnl They are *not* in the public domain.
> + dnl Authors:
> + dnl Ulrich Drepper <drepper@cygnus.com>, 1996.
> +
> +-AC_PREREQ(2.50)
> ++AC_PREREQ([2.50])
> +
> + # Search path for a program which passes the given test.
> +
> +@@ -55,7 +55,7 @@ rm -f conf$$.file
> + # Extract the first word of "$2", so it can be a program name with args.
> + set dummy $2; ac_word=[$]2
> + AC_MSG_CHECKING([for $ac_word])
> +-AC_CACHE_VAL(ac_cv_path_$1,
> ++AC_CACHE_VAL([ac_cv_path_$1],
> + [case "[$]$1" in
> + [[\\/]]* | ?:[[\\/]]*)
> + ac_cv_path_$1="[$]$1" # Let the user override the test with a path.
> +@@ -84,9 +84,9 @@ ifelse([$4], , , [ test -z "[$]ac_cv_pa
> + esac])dnl
> + $1="$ac_cv_path_$1"
> + if test ifelse([$4], , [-n "[$]$1"], ["[$]$1" != "$4"]); then
> +- AC_MSG_RESULT([$]$1)
> ++ AC_MSG_RESULT([$][$1])
> + else
> +- AC_MSG_RESULT(no)
> ++ AC_MSG_RESULT([no])
> + fi
> +-AC_SUBST($1)dnl
> ++AC_SUBST([$1])dnl
> + ])
> +Index: gnutls-2.8.6/lib/po/ChangeLog
> +===================================================================
> +--- /dev/null 1970-01-01 00:00:00.000000000 +0000
> ++++ gnutls-2.8.6/lib/po/ChangeLog 2010-05-19 22:15:18.521282615 -0700
> +@@ -0,0 +1,5 @@
> ++2010-05-19 gettextize <bug-gnu-gettext@gnu.org>
> ++
> ++ * Makefile.in.in: Upgrade to gettext-0.18.
> ++ * Rules-quot: Upgrade to gettext-0.18.
> ++
> +Index: gnutls-2.8.6/lib/po/Makefile.in.in
> +===================================================================
> +--- gnutls-2.8.6.orig/lib/po/Makefile.in.in 2010-03-15 03:28:11.000000000 -0700
> ++++ gnutls-2.8.6/lib/po/Makefile.in.in 2010-05-19 22:15:18.531283048 -0700
> +@@ -1,5 +1,5 @@
> + # Makefile for PO directory in any package using GNU gettext.
> +-# Copyright (C) 1995-1997, 2000-2007 by Ulrich Drepper <drepper@gnu.ai.mit.edu>
> ++# Copyright (C) 1995-1997, 2000-2007, 2009-2010 by Ulrich Drepper <drepper@gnu.ai.mit.edu>
> + #
> + # This file can be copied and used freely without restrictions. It can
> + # be used in projects which are not available under the GNU General Public
> +@@ -8,8 +8,8 @@
> + # Please note that the actual code of GNU gettext is covered by the GNU
> + # General Public License and is *not* in the public domain.
> + #
> +-# Origin: gettext-0.17
> +-GETTEXT_MACRO_VERSION = 0.17
> ++# Origin: gettext-0.18
> ++GETTEXT_MACRO_VERSION = 0.18
> +
> + PACKAGE = @PACKAGE@
> + VERSION = @VERSION@
> +@@ -88,8 +88,8 @@ CATALOGS = @CATALOGS@
> + .po.gmo:
> + @lang=`echo $* | sed -e 's,.*/,,'`; \
> + test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \
> +- echo "$${cdcmd}rm -f $${lang}.gmo && $(GMSGFMT) -c --statistics -o $${lang}.gmo $${lang}.po"; \
> +- cd $(srcdir) && rm -f $${lang}.gmo && $(GMSGFMT) -c --statistics -o t-$${lang}.gmo $${lang}.po && mv t-$${lang}.gmo $${lang}.gmo
> ++ echo "$${cdcmd}rm -f $${lang}.gmo && $(GMSGFMT) -c --statistics --verbose -o $${lang}.gmo $${lang}.po"; \
> ++ cd $(srcdir) && rm -f $${lang}.gmo && $(GMSGFMT) -c --statistics --verbose -o t-$${lang}.gmo $${lang}.po && mv t-$${lang}.gmo $${lang}.gmo
> +
> + .sin.sed:
> + sed -e '/^#/d' $< > t-$@
> +@@ -193,8 +193,15 @@ $(POFILES): $(srcdir)/$(DOMAIN).pot
> + @lang=`echo $@ | sed -e 's,.*/,,' -e 's/\.po$$//'`; \
> + if test -f "$(srcdir)/$${lang}.po"; then \
> + test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \
> +- echo "$${cdcmd}$(MSGMERGE_UPDATE) $${lang}.po $(DOMAIN).pot"; \
> +- cd $(srcdir) && $(MSGMERGE_UPDATE) $${lang}.po $(DOMAIN).pot; \
> ++ echo "$${cdcmd}$(MSGMERGE_UPDATE) $(MSGMERGE_OPTIONS) --lang=$${lang} $${lang}.po $(DOMAIN).pot"; \
> ++ cd $(srcdir) \
> ++ && { case `$(MSGMERGE_UPDATE) --version | sed 1q | sed -e 's,^[^0-9]*,,'` in \
> ++ '' | 0.[0-9] | 0.[0-9].* | 0.1[0-7] | 0.1[0-7].*) \
> ++ $(MSGMERGE_UPDATE) $(MSGMERGE_OPTIONS) $${lang}.po $(DOMAIN).pot;; \
> ++ *) \
> ++ $(MSGMERGE_UPDATE) $(MSGMERGE_OPTIONS) --lang=$${lang} $${lang}.po $(DOMAIN).pot;; \
> ++ esac; \
> ++ }; \
> + else \
> + $(MAKE) $${lang}.po-create; \
> + fi
> +@@ -217,7 +224,6 @@ install-data: install-data-@USE_NLS@
> + fi
> + install-data-no: all
> + install-data-yes: all
> +- $(mkdir_p) $(DESTDIR)$(datadir)
> + @catalogs='$(CATALOGS)'; \
> + for cat in $$catalogs; do \
> + cat=`basename $$cat`; \
> +@@ -269,7 +275,6 @@ installdirs-data: installdirs-data-@USE_
> + fi
> + installdirs-data-no:
> + installdirs-data-yes:
> +- $(mkdir_p) $(DESTDIR)$(datadir)
> + @catalogs='$(CATALOGS)'; \
> + for cat in $$catalogs; do \
> + cat=`basename $$cat`; \
> +@@ -395,9 +400,15 @@ update-po: Makefile
> + tmpdir=`pwd`; \
> + echo "$$lang:"; \
> + test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \
> +- echo "$${cdcmd}$(MSGMERGE) $$lang.po $(DOMAIN).pot -o $$lang.new.po"; \
> ++ echo "$${cdcmd}$(MSGMERGE) $(MSGMERGE_OPTIONS) --lang=$$lang $$lang.po $(DOMAIN).pot -o $$lang.new.po"; \
> + cd $(srcdir); \
> +- if $(MSGMERGE) $$lang.po $(DOMAIN).pot -o $$tmpdir/$$lang.new.po; then \
> ++ if { case `$(MSGMERGE) --version | sed 1q | sed -e 's,^[^0-9]*,,'` in \
> ++ '' | 0.[0-9] | 0.[0-9].* | 0.1[0-7] | 0.1[0-7].*) \
> ++ $(MSGMERGE) $(MSGMERGE_OPTIONS) -o $$tmpdir/$$lang.new.po $$lang.po $(DOMAIN).pot;; \
> ++ *) \
> ++ $(MSGMERGE) $(MSGMERGE_OPTIONS) --lang=$$lang -o $$tmpdir/$$lang.new.po $$lang.po $(DOMAIN).pot;; \
> ++ esac; \
> ++ }; then \
> + if cmp $$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \
> + rm -f $$tmpdir/$$lang.new.po; \
> + else \
> +@@ -418,9 +429,13 @@ $(DUMMYPOFILES):
> + update-gmo: Makefile $(GMOFILES)
> + @:
> +
> ++# Recreate Makefile by invoking config.status. Explicitly invoke the shell,
> ++# because execution permission bits may not work on the current file system.
> ++# Use @SHELL@, which is the shell determined by autoconf for the use by its
> ++# scripts, not $(SHELL) which is hardwired to /bin/sh and may be deficient.
> + Makefile: Makefile.in.in Makevars $(top_builddir)/config.status @POMAKEFILEDEPS@
> + cd $(top_builddir) \
> +- && $(SHELL) ./config.status $(subdir)/$@.in po-directories
> ++ && @SHELL@ ./config.status $(subdir)/$@.in po-directories
> +
> + force:
> +
> +Index: gnutls-2.8.6/lib/po/Makevars.template
> +===================================================================
> +--- /dev/null 1970-01-01 00:00:00.000000000 +0000
> ++++ gnutls-2.8.6/lib/po/Makevars.template 2010-05-19 22:15:18.531283048 -0700
> +@@ -0,0 +1,41 @@
> ++# Makefile variables for PO directory in any package using GNU gettext.
> ++
> ++# Usually the message domain is the same as the package name.
> ++DOMAIN = $(PACKAGE)
> ++
> ++# These two variables depend on the location of this directory.
> ++subdir = po
> ++top_builddir = ..
> ++
> ++# These options get passed to xgettext.
> ++XGETTEXT_OPTIONS = --keyword=_ --keyword=N_
> ++
> ++# This is the copyright holder that gets inserted into the header of the
> ++# $(DOMAIN).pot file. Set this to the copyright holder of the surrounding
> ++# package. (Note that the msgstr strings, extracted from the package's
> ++# sources, belong to the copyright holder of the package.) Translators are
> ++# expected to transfer the copyright for their translations to this person
> ++# or entity, or to disclaim their copyright. The empty string stands for
> ++# the public domain; in this case the translators are expected to disclaim
> ++# their copyright.
> ++COPYRIGHT_HOLDER = Free Software Foundation, Inc.
> ++
> ++# This is the email address or URL to which the translators shall report
> ++# bugs in the untranslated strings:
> ++# - Strings which are not entire sentences, see the maintainer guidelines
> ++# in the GNU gettext documentation, section 'Preparing Strings'.
> ++# - Strings which use unclear terms or require additional context to be
> ++# understood.
> ++# - Strings which make invalid assumptions about notation of date, time or
> ++# money.
> ++# - Pluralisation problems.
> ++# - Incorrect English spelling.
> ++# - Incorrect formatting.
> ++# It can be your email address, or a mailing list address where translators
> ++# can write to without being subscribed, or the URL of a web page through
> ++# which the translators can contact you.
> ++MSGID_BUGS_ADDRESS =
> ++
> ++# This is the list of locale categories, beyond LC_MESSAGES, for which the
> ++# message catalogs shall be used. It is usually empty.
> ++EXTRA_LOCALE_CATEGORIES =
> +Index: gnutls-2.8.6/lib/po/Rules-quot
> +===================================================================
> +--- gnutls-2.8.6.orig/lib/po/Rules-quot 2010-03-15 03:28:11.000000000 -0700
> ++++ gnutls-2.8.6/lib/po/Rules-quot 2010-05-19 22:15:18.531283048 -0700
> +@@ -20,7 +20,7 @@ en@boldquot.po-update: en@boldquot.po-up
> + ll=`echo $$lang | sed -e 's/@.*//'`; \
> + LC_ALL=C; export LC_ALL; \
> + cd $(srcdir); \
> +- if $(MSGINIT) -i $(DOMAIN).pot --no-translator -l $$ll -o - 2>/dev/null | sed -f $$tmpdir/$$lang.insert-header | $(MSGCONV) -t UTF-8 | $(MSGFILTER) sed -f `echo $$lang | sed -e 's/.*@//'`.sed 2>/dev/null > $$tmpdir/$$lang.new.po; then \
> ++ if $(MSGINIT) -i $(DOMAIN).pot --no-translator -l $$lang -o - 2>/dev/null | sed -f $$tmpdir/$$lang.insert-header | $(MSGCONV) -t UTF-8 | $(MSGFILTER) sed -f `echo $$lang | sed -e 's/.*@//'`.sed 2>/dev/null > $$tmpdir/$$lang.new.po; then \
> + if cmp $$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \
> + rm -f $$tmpdir/$$lang.new.po; \
> + else \
> diff --git a/recipes/gnutls/gnutls-2.8.6/gnutls-openssl.patch b/recipes/gnutls/gnutls-2.8.6/gnutls-openssl.patch
> new file mode 100644
> index 0000000..033e4d1
> --- /dev/null
> +++ b/recipes/gnutls/gnutls-2.8.6/gnutls-openssl.patch
> @@ -0,0 +1,129 @@
> +---
> + libextra/gnutls_openssl.c | 58 +++++++++++++++++++++++++++++++++++++
> + libextra/includes/gnutls/openssl.h | 5 +++
> + 2 files changed, 63 insertions(+)
> +
> +Index: gnutls-2.8.6/libextra/gnutls_openssl.c
> +===================================================================
> +--- gnutls-2.8.6.orig/libextra/gnutls_openssl.c 2009-11-06 00:39:42.000000000 -0800
> ++++ gnutls-2.8.6/libextra/gnutls_openssl.c 2010-05-19 22:20:34.071283592 -0700
> +@@ -258,12 +258,17 @@ SSL_new (SSL_CTX * ctx)
> + ssl->rfd = (gnutls_transport_ptr_t) - 1;
> + ssl->wfd = (gnutls_transport_ptr_t) - 1;
> +
> ++ ssl->ssl_peek_buffer = NULL;
> ++ ssl->ssl_peek_buffer_size = ssl->ssl_peek_avail = 0;
> ++
> + return ssl;
> + }
> +
> + void
> + SSL_free (SSL * ssl)
> + {
> ++ if (ssl->ssl_peek_buffer)
> ++ free(ssl->ssl_peek_buffer);
> + gnutls_certificate_free_credentials (ssl->gnutls_cred);
> + gnutls_deinit (ssl->gnutls_state);
> + free (ssl);
> +@@ -287,6 +292,7 @@ int
> + SSL_set_fd (SSL * ssl, int fd)
> + {
> + gnutls_transport_set_ptr (ssl->gnutls_state, GNUTLS_INT_TO_POINTER (fd));
> ++ ssl->rfd = ssl->wfd = fd;
> + return 1;
> + }
> +
> +@@ -312,6 +318,17 @@ SSL_set_wfd (SSL * ssl, int fd)
> + return 1;
> + }
> +
> ++int SSL_get_rfd(SSL *ssl)
> ++{
> ++ return ssl->rfd;
> ++}
> ++
> ++int SSL_get_wfd(SSL *ssl)
> ++{
> ++ return ssl->wfd;
> ++}
> ++
> ++
> + void
> + SSL_set_bio (SSL * ssl, BIO * rbio, BIO * wbio)
> + {
> +@@ -327,6 +344,8 @@ SSL_set_connect_state (SSL * ssl)
> + int
> + SSL_pending (SSL * ssl)
> + {
> ++ if (ssl->ssl_peek_avail)
> ++ return ssl->ssl_peek_avail;
> + return gnutls_record_check_pending (ssl->gnutls_state);
> + }
> +
> +@@ -482,11 +501,50 @@ SSL_shutdown (SSL * ssl)
> + return 1;
> + }
> +
> ++int SSL_peek(SSL *ssl, void *buf, int len)
> ++{
> ++ if (len > ssl->ssl_peek_buffer_size) {
> ++ ssl->ssl_peek_buffer = realloc (ssl->ssl_peek_buffer, len);
> ++ ssl->ssl_peek_buffer_size = len;
> ++ }
> ++
> ++ if (ssl->ssl_peek_avail == 0) {
> ++
> ++ int ret;
> ++
> ++ ret = gnutls_record_recv(ssl->gnutls_state, ssl->ssl_peek_buffer, len);
> ++ ssl->last_error = ret;
> ++
> ++ if (ret > 0)
> ++ ssl->ssl_peek_avail += ret;
> ++ }
> ++
> ++ if (len > ssl->ssl_peek_avail)
> ++ len = ssl->ssl_peek_avail;
> ++
> ++ memcpy (buf, ssl->ssl_peek_buffer, len);
> ++
> ++ return len;
> ++}
> ++
> + int
> + SSL_read (SSL * ssl, void *buf, int len)
> + {
> + int ret;
> +
> ++ if (ssl->ssl_peek_avail) {
> ++ int n = (ssl->ssl_peek_avail > len) ? len : ssl->ssl_peek_avail;
> ++
> ++ memcpy (buf, ssl->ssl_peek_buffer, n);
> ++
> ++ if (ssl->ssl_peek_avail > n)
> ++ memmove (ssl->ssl_peek_buffer, ssl->ssl_peek_buffer + n, ssl->ssl_peek_avail - n);
> ++
> ++ ssl->ssl_peek_avail -= n;
> ++
> ++ return n;
> ++ }
> ++
> + ret = gnutls_record_recv (ssl->gnutls_state, buf, len);
> + ssl->last_error = ret;
> +
> +Index: gnutls-2.8.6/libextra/includes/gnutls/openssl.h
> +===================================================================
> +--- gnutls-2.8.6.orig/libextra/includes/gnutls/openssl.h 2009-06-02 11:59:32.000000000 -0700
> ++++ gnutls-2.8.6/libextra/includes/gnutls/openssl.h 2010-05-19 22:20:34.071283592 -0700
> +@@ -164,6 +164,11 @@ extern "C"
> +
> + gnutls_transport_ptr_t rfd;
> + gnutls_transport_ptr_t wfd;
> ++
> ++ char *ssl_peek_buffer;
> ++ size_t ssl_peek_buffer_size;
> ++ size_t ssl_peek_avail;
> ++
> + };
> +
> + #define rbio gnutls_state
> diff --git a/recipes/gnutls/gnutls-2.8.6/gnutls-replace-siginterrupt.patch b/recipes/gnutls/gnutls-2.8.6/gnutls-replace-siginterrupt.patch
> new file mode 100644
> index 0000000..a0fb64f
> --- /dev/null
> +++ b/recipes/gnutls/gnutls-2.8.6/gnutls-replace-siginterrupt.patch
> @@ -0,0 +1,41 @@
> +---
> + src/tests.c | 12 ++++++++++--
> + 1 file changed, 10 insertions(+), 2 deletions(-)
> +
> +Index: gnutls-2.8.6/src/tests.c
> +===================================================================
> +--- gnutls-2.8.6.orig/src/tests.c 2009-06-02 11:59:32.000000000 -0700
> ++++ gnutls-2.8.6/src/tests.c 2010-05-19 22:20:51.703780601 -0700
> +@@ -493,6 +493,7 @@ test_bye (gnutls_session_t session)
> + int old, secs = 6;
> +
> + #ifndef _WIN32
> ++ struct sigaction act;
> + signal (SIGALRM, got_alarm);
> + #endif
> +
> +@@ -513,7 +514,9 @@ test_bye (gnutls_session_t session)
> + return TEST_FAILED;
> +
> + #ifndef _WIN32
> +- old = siginterrupt (SIGALRM, 1);
> ++ (void) sigaction(SIGALRM, NULL, &act);
> ++ act.sa_flags &= ~SA_RESTART;
> ++ old = sigaction(SIGALRM, &act, NULL);
> + alarm (secs);
> + #else
> + setsockopt ((int) gnutls_transport_get_ptr (session), SOL_SOCKET,
> +@@ -527,7 +530,12 @@ test_bye (gnutls_session_t session)
> + while (ret > 0);
> +
> + #ifndef _WIN32
> +- siginterrupt (SIGALRM, old);
> ++ (void) sigaction(SIGALRM, NULL, &act);
> ++ if (old)
> ++ act.sa_flags &= ~SA_RESTART;
> ++ else
> ++ act.sa_flags |= SA_RESTART;
> ++ sigaction(SIGALRM, &act, NULL);
> + #else
> + if (WSAGetLastError () == WSAETIMEDOUT ||
> + WSAGetLastError () == WSAECONNABORTED)
> diff --git a/recipes/gnutls/gnutls_2.8.5.bb b/recipes/gnutls/gnutls_2.8.5.bb
> index b0786f6..c536d18 100644
> --- a/recipes/gnutls/gnutls_2.8.5.bb
> +++ b/recipes/gnutls/gnutls_2.8.5.bb
> @@ -1,4 +1,7 @@
> require gnutls.inc
> +
> +PR = "${INC_PR}.0"
> +
> LICENSE_${PN}-extra = "GPLv3"
>
> SRC_URI += "\
> diff --git a/recipes/gnutls/gnutls_2.8.6.bb b/recipes/gnutls/gnutls_2.8.6.bb
> new file mode 100644
> index 0000000..0998c6b
> --- /dev/null
> +++ b/recipes/gnutls/gnutls_2.8.6.bb
> @@ -0,0 +1,16 @@
> +require gnutls.inc
> +
> +PR = "${INC_PR}.0"
> +
> +LICENSE_${PN}-extra = "GPLv3"
> +
> +EXTRA_OECONF += " --without-libgcrypt-prefix "
> +
> +SRC_URI += "file://gettextize-with-gettext-0.18.patch \
> + file://gnutls-openssl.patch \
> + file://gnutls-replace-siginterrupt.patch \
> + "
> +
> +SRC_URI[gnutls.md5sum] = "eb0a6d7d3cb9ac684d971c14f9f6d3ba"
> +SRC_URI[gnutls.sha256sum] = "d6f846a7064af3ee2c9aebd65dcee76953b767170cbcd719e990ed6b9688a356"
> +
> --
> 1.7.0.4
>
>
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
>
^ permalink raw reply [flat|nested] 45+ messages in thread
* Re: [PATCH 10/16] inetutils_1.8.bb: Add recipe
2010-06-02 20:34 ` [PATCH 10/16] inetutils_1.8.bb: Add recipe Khem Raj
@ 2010-06-04 7:40 ` Martin Jansa
0 siblings, 0 replies; 45+ messages in thread
From: Martin Jansa @ 2010-06-04 7:40 UTC (permalink / raw)
To: openembedded-devel
On Wed, Jun 2, 2010 at 10:34 PM, Khem Raj <raj.khem@gmail.com> wrote:
> Signed-off-by: Khem Raj <raj.khem@gmail.com>
Acked-by: Martin Jansa <Martin.Jansa@gmail.com>
> ---
> recipes/inetutils/inetutils_1.8.bb | 43 ++++++++++++++++++++++++++++++++++++
> 1 files changed, 43 insertions(+), 0 deletions(-)
> create mode 100644 recipes/inetutils/inetutils_1.8.bb
>
> diff --git a/recipes/inetutils/inetutils_1.8.bb b/recipes/inetutils/inetutils_1.8.bb
> new file mode 100644
> index 0000000..11fb818
> --- /dev/null
> +++ b/recipes/inetutils/inetutils_1.8.bb
> @@ -0,0 +1,43 @@
> +SECTION = "libs"
> +DEPENDS = "ncurses"
> +LICENSE = "GPL"
> +DESCRIPTION = "The GNU inetutils are a collection of common \
> +networking utilities and servers including ftp, ftpd, rcp, \
> +rexec, rlogin, rlogind, rsh, rshd, syslog, syslogd, talk, \
> +talkd, telnet, telnetd, tftp, tftpd, and uucpd."
> +
> +PR = "r0"
> +
> +SRC_URI = "${GNU_MIRROR}/inetutils/inetutils-${PV}.tar.gz \
> +"
> +
> +inherit autotools
> +
> +EXTRA_OECONF = "--with-ncurses-include-dir=${STAGING_INCDIR}"
> +
> +do_configure_prepend () {
> + cp ${STAGING_DATADIR_NATIVE}/gettext/config.rpath ${S}/build-aux/config.rpath
> + rm -f ${S}/glob/configure*
> +}
> +
> +do_install () {
> + autotools_do_install
> + mv ${D}${bindir}/tftp ${D}${bindir}/tftp.${PN}
> + mv ${D}${bindir}/telnet ${D}${bindir}/telnet.${PN}
> + mv ${D}${bindir}/logger ${D}${bindir}/logger.${PN}
> +}
> +
> +pkg_postinst_${PN} () {
> + update-alternatives --install ${bindir}/tftp tftp tftp.${PN} 100
> + update-alternatives --install ${bindir}/telnet telnet telnet.${PN} 100
> + update-alternatives --install ${bindir}/logger logger logger.${PN} 100
> +}
> +
> +pkg_prerm_${PN} () {
> + update-alternatives --remove tftp tftp.${PN}
> + update-alternatives --remove telnet telnet.${PN}
> + update-alternatives --remove logger logger.${PN}
> +}
> +SRC_URI[md5sum] = "ad8fdcdf1797b9ca258264a6b04e48fd"
> +SRC_URI[sha256sum] = "c8500baee04b9ea408c9e65e24ad7f5b41e7d96d42fb1d29abf25b52b68311c7"
> +
> --
> 1.7.0.4
>
>
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
>
^ permalink raw reply [flat|nested] 45+ messages in thread
* Re: [PATCH 11/16] findutils_4.5.9.bb: Add recipe.
2010-06-02 20:34 ` [PATCH 11/16] findutils_4.5.9.bb: " Khem Raj
@ 2010-06-04 7:41 ` Martin Jansa
0 siblings, 0 replies; 45+ messages in thread
From: Martin Jansa @ 2010-06-04 7:41 UTC (permalink / raw)
To: openembedded-devel
On Wed, Jun 2, 2010 at 10:34 PM, Khem Raj <raj.khem@gmail.com> wrote:
> Signed-off-by: Khem Raj <raj.khem@gmail.com>
Acked-by: Martin Jansa <Martin.Jansa@gmail.com>
> ---
> .../findutils-4.5.9/gettext-0.18-update.patch | 3074 ++++++++++++++++++++
> recipes/findutils/findutils_4.5.9.bb | 12 +
> 2 files changed, 3086 insertions(+), 0 deletions(-)
> create mode 100644 recipes/findutils/findutils-4.5.9/gettext-0.18-update.patch
> create mode 100644 recipes/findutils/findutils_4.5.9.bb
>
> diff --git a/recipes/findutils/findutils-4.5.9/gettext-0.18-update.patch b/recipes/findutils/findutils-4.5.9/gettext-0.18-update.patch
> new file mode 100644
> index 0000000..994ed6d
> --- /dev/null
> +++ b/recipes/findutils/findutils-4.5.9/gettext-0.18-update.patch
> @@ -0,0 +1,3074 @@
> +diff -urp -x '*~' findutils-4.5.9.org/ABOUT-NLS findutils-4.5.9/ABOUT-NLS
> +--- findutils-4.5.9.org/ABOUT-NLS 2010-04-29 14:26:12.000000000 -0700
> ++++ findutils-4.5.9/ABOUT-NLS 2010-05-23 09:08:51.825173977 -0700
> +@@ -181,855 +181,1114 @@ programming skills, here.
> + ======================
> +
> + Languages are not equally supported in all packages. The following
> +-matrix shows the current state of internationalization, as of November
> +-2007. The matrix shows, in regard of each package, for which languages
> +-PO files have been submitted to translation coordination, with a
> ++matrix shows the current state of internationalization, as of May 2010.
> ++The matrix shows, in regard of each package, for which languages PO
> ++files have been submitted to translation coordination, with a
> + translation percentage of at least 50%.
> +
> +- Ready PO files af am ar az be bg bs ca cs cy da de el en en_GB eo
> +- +----------------------------------------------------+
> +- Compendium | [] [] [] [] |
> +- a2ps | [] [] [] [] [] |
> +- aegis | () |
> +- ant-phone | () |
> +- anubis | [] |
> +- ap-utils | |
> +- aspell | [] [] [] [] [] |
> +- bash | [] |
> +- bfd | |
> +- bibshelf | [] |
> +- binutils | |
> +- bison | [] [] |
> +- bison-runtime | [] |
> +- bluez-pin | [] [] [] [] [] |
> +- cflow | [] |
> +- clisp | [] [] [] |
> +- console-tools | [] [] |
> +- coreutils | [] [] [] [] |
> +- cpio | |
> +- cpplib | [] [] [] |
> +- cryptonit | [] |
> +- dialog | |
> +- diffutils | [] [] [] [] [] [] |
> +- doodle | [] |
> +- e2fsprogs | [] [] |
> +- enscript | [] [] [] [] |
> +- fetchmail | [] [] () [] [] |
> +- findutils | [] |
> +- findutils_stable | [] [] [] |
> +- flex | [] [] [] |
> +- fslint | |
> +- gas | |
> +- gawk | [] [] [] |
> +- gcal | [] |
> +- gcc | [] |
> +- gettext-examples | [] [] [] [] [] |
> +- gettext-runtime | [] [] [] [] [] |
> +- gettext-tools | [] [] |
> +- gip | [] |
> +- gliv | [] [] |
> +- glunarclock | [] |
> +- gmult | [] [] |
> +- gnubiff | () |
> +- gnucash | [] [] () () [] |
> +- gnuedu | |
> +- gnulib | [] |
> +- gnunet | |
> +- gnunet-gtk | |
> +- gnutls | [] |
> +- gpe-aerial | [] [] |
> +- gpe-beam | [] [] |
> +- gpe-calendar | |
> +- gpe-clock | [] [] |
> +- gpe-conf | [] [] |
> +- gpe-contacts | |
> +- gpe-edit | [] |
> +- gpe-filemanager | |
> +- gpe-go | [] |
> +- gpe-login | [] [] |
> +- gpe-ownerinfo | [] [] |
> +- gpe-package | |
> +- gpe-sketchbook | [] [] |
> +- gpe-su | [] [] |
> +- gpe-taskmanager | [] [] |
> +- gpe-timesheet | [] |
> +- gpe-today | [] [] |
> +- gpe-todo | |
> +- gphoto2 | [] [] [] [] |
> +- gprof | [] [] |
> +- gpsdrive | |
> +- gramadoir | [] [] |
> +- grep | [] [] |
> +- gretl | () |
> +- gsasl | |
> +- gss | |
> +- gst-plugins-bad | [] [] |
> +- gst-plugins-base | [] [] |
> +- gst-plugins-good | [] [] [] |
> +- gst-plugins-ugly | [] [] |
> +- gstreamer | [] [] [] [] [] [] [] |
> +- gtick | () |
> +- gtkam | [] [] [] [] |
> +- gtkorphan | [] [] |
> +- gtkspell | [] [] [] [] |
> +- gutenprint | [] |
> +- hello | [] [] [] [] [] |
> +- herrie | [] |
> +- hylafax | |
> +- idutils | [] [] |
> +- indent | [] [] [] [] |
> +- iso_15924 | |
> +- iso_3166 | [] [] [] [] [] [] [] [] [] [] [] |
> +- iso_3166_2 | |
> +- iso_4217 | [] [] [] |
> +- iso_639 | [] [] [] [] |
> +- jpilot | [] |
> +- jtag | |
> +- jwhois | |
> +- kbd | [] [] [] [] |
> +- keytouch | [] [] |
> +- keytouch-editor | [] |
> +- keytouch-keyboa... | [] |
> +- latrine | () |
> +- ld | [] |
> +- leafpad | [] [] [] [] [] |
> +- libc | [] [] [] [] |
> +- libexif | [] |
> +- libextractor | [] |
> +- libgpewidget | [] [] [] |
> +- libgpg-error | [] |
> +- libgphoto2 | [] [] |
> +- libgphoto2_port | [] [] |
> +- libgsasl | |
> +- libiconv | [] [] |
> +- libidn | [] [] [] |
> +- lifelines | [] () |
> +- lilypond | [] |
> +- lingoteach | |
> +- lprng | |
> +- lynx | [] [] [] [] |
> +- m4 | [] [] [] [] |
> +- mailfromd | |
> +- mailutils | [] |
> +- make | [] [] |
> +- man-db | [] [] [] |
> +- minicom | [] [] [] |
> +- nano | [] [] [] |
> +- opcodes | [] |
> +- parted | [] [] |
> +- pilot-qof | |
> +- popt | [] [] [] |
> +- psmisc | [] |
> +- pwdutils | |
> +- qof | |
> +- radius | [] |
> +- recode | [] [] [] [] [] [] |
> +- rpm | [] |
> +- screem | |
> +- scrollkeeper | [] [] [] [] [] [] [] [] |
> +- sed | [] [] [] |
> +- shared-mime-info | [] [] [] [] () [] [] [] |
> +- sharutils | [] [] [] [] [] [] |
> +- shishi | |
> +- skencil | [] () |
> +- solfege | |
> +- soundtracker | [] [] |
> +- sp | [] |
> +- system-tools-ba... | [] [] [] [] [] [] [] [] [] |
> +- tar | [] [] |
> +- texinfo | [] [] [] |
> +- tin | () () |
> +- tuxpaint | [] [] [] [] [] [] |
> +- unicode-han-tra... | |
> +- unicode-transla... | |
> +- util-linux | [] [] [] [] |
> +- util-linux-ng | [] [] [] [] |
> +- vorbis-tools | [] |
> +- wastesedge | () |
> +- wdiff | [] [] [] [] |
> +- wget | [] [] [] |
> +- xchat | [] [] [] [] [] [] [] |
> +- xkeyboard-config | [] |
> +- xpad | [] [] [] |
> +- +----------------------------------------------------+
> +- af am ar az be bg bs ca cs cy da de el en en_GB eo
> +- 6 0 2 1 8 26 2 40 48 2 56 88 15 1 15 18
> +-
> +- es et eu fa fi fr ga gl gu he hi hr hu id is it
> +- +--------------------------------------------------+
> +- Compendium | [] [] [] [] [] |
> +- a2ps | [] [] [] () |
> +- aegis | |
> +- ant-phone | [] |
> +- anubis | [] |
> +- ap-utils | [] [] |
> +- aspell | [] [] [] |
> +- bash | [] |
> +- bfd | [] [] |
> +- bibshelf | [] [] [] |
> +- binutils | [] [] [] |
> +- bison | [] [] [] [] [] [] |
> +- bison-runtime | [] [] [] [] [] |
> +- bluez-pin | [] [] [] [] [] |
> +- cflow | [] |
> +- clisp | [] [] |
> +- console-tools | |
> +- coreutils | [] [] [] [] [] [] |
> +- cpio | [] [] [] |
> +- cpplib | [] [] |
> +- cryptonit | [] |
> +- dialog | [] [] [] |
> +- diffutils | [] [] [] [] [] [] [] [] [] |
> +- doodle | [] [] |
> +- e2fsprogs | [] [] [] |
> +- enscript | [] [] [] |
> +- fetchmail | [] |
> +- findutils | [] [] [] |
> +- findutils_stable | [] [] [] [] |
> +- flex | [] [] [] |
> +- fslint | |
> +- gas | [] [] |
> +- gawk | [] [] [] [] () |
> +- gcal | [] [] |
> +- gcc | [] |
> +- gettext-examples | [] [] [] [] [] [] [] |
> +- gettext-runtime | [] [] [] [] [] [] |
> +- gettext-tools | [] [] [] [] |
> +- gip | [] [] [] [] |
> +- gliv | () |
> +- glunarclock | [] [] [] |
> +- gmult | [] [] [] |
> +- gnubiff | () () |
> +- gnucash | () () () |
> +- gnuedu | [] |
> +- gnulib | [] [] [] |
> +- gnunet | |
> +- gnunet-gtk | |
> +- gnutls | |
> +- gpe-aerial | [] [] |
> +- gpe-beam | [] [] |
> +- gpe-calendar | |
> +- gpe-clock | [] [] [] [] |
> +- gpe-conf | [] |
> +- gpe-contacts | [] [] |
> +- gpe-edit | [] [] [] [] |
> +- gpe-filemanager | [] |
> +- gpe-go | [] [] [] |
> +- gpe-login | [] [] [] |
> +- gpe-ownerinfo | [] [] [] [] [] |
> +- gpe-package | [] |
> +- gpe-sketchbook | [] [] |
> +- gpe-su | [] [] [] [] |
> +- gpe-taskmanager | [] [] [] |
> +- gpe-timesheet | [] [] [] [] |
> +- gpe-today | [] [] [] [] |
> +- gpe-todo | [] |
> +- gphoto2 | [] [] [] [] [] |
> +- gprof | [] [] [] [] [] |
> +- gpsdrive | [] |
> +- gramadoir | [] [] |
> +- grep | [] [] [] |
> +- gretl | [] [] [] () |
> +- gsasl | [] [] |
> +- gss | [] [] |
> +- gst-plugins-bad | [] [] [] [] |
> +- gst-plugins-base | [] [] [] [] |
> +- gst-plugins-good | [] [] [] [] [] |
> +- gst-plugins-ugly | [] [] [] [] |
> +- gstreamer | [] [] [] |
> +- gtick | [] [] [] |
> +- gtkam | [] [] [] [] |
> +- gtkorphan | [] [] |
> +- gtkspell | [] [] [] [] [] [] [] |
> +- gutenprint | [] |
> +- hello | [] [] [] [] [] [] [] [] [] [] [] [] [] |
> +- herrie | [] |
> +- hylafax | |
> +- idutils | [] [] [] [] [] |
> +- indent | [] [] [] [] [] [] [] [] [] [] |
> +- iso_15924 | [] |
> +- iso_3166 | [] [] [] [] [] [] [] [] [] [] [] [] [] |
> +- iso_3166_2 | [] |
> +- iso_4217 | [] [] [] [] [] [] |
> +- iso_639 | [] [] [] [] [] [] |
> +- jpilot | [] [] |
> +- jtag | [] |
> +- jwhois | [] [] [] [] [] |
> +- kbd | [] [] |
> +- keytouch | [] [] [] |
> +- keytouch-editor | [] |
> +- keytouch-keyboa... | [] [] |
> +- latrine | [] [] |
> +- ld | [] [] [] [] |
> +- leafpad | [] [] [] [] [] [] |
> +- libc | [] [] [] [] [] |
> +- libexif | [] |
> +- libextractor | [] |
> +- libgpewidget | [] [] [] [] [] |
> +- libgpg-error | [] |
> +- libgphoto2 | [] [] [] |
> +- libgphoto2_port | [] [] |
> +- libgsasl | [] [] |
> +- libiconv | [] [] [] |
> +- libidn | [] [] |
> +- lifelines | () |
> +- lilypond | [] [] [] |
> +- lingoteach | [] [] [] |
> +- lprng | |
> +- lynx | [] [] [] |
> +- m4 | [] [] [] [] |
> +- mailfromd | |
> +- mailutils | [] [] |
> +- make | [] [] [] [] [] [] [] [] |
> +- man-db | [] |
> +- minicom | [] [] [] [] |
> +- nano | [] [] [] [] [] [] [] |
> +- opcodes | [] [] [] [] |
> +- parted | [] [] [] |
> +- pilot-qof | |
> +- popt | [] [] [] [] |
> +- psmisc | [] [] |
> +- pwdutils | |
> +- qof | [] |
> +- radius | [] [] |
> +- recode | [] [] [] [] [] [] [] [] |
> +- rpm | [] [] |
> +- screem | |
> +- scrollkeeper | [] [] [] |
> +- sed | [] [] [] [] [] |
> +- shared-mime-info | [] [] [] [] [] [] |
> +- sharutils | [] [] [] [] [] [] [] [] |
> +- shishi | [] |
> +- skencil | [] [] |
> +- solfege | [] |
> +- soundtracker | [] [] [] |
> +- sp | [] |
> +- system-tools-ba... | [] [] [] [] [] [] [] [] [] |
> +- tar | [] [] [] [] [] |
> +- texinfo | [] [] [] |
> +- tin | [] () |
> +- tuxpaint | [] [] |
> +- unicode-han-tra... | |
> +- unicode-transla... | [] [] |
> +- util-linux | [] [] [] [] [] [] [] |
> +- util-linux-ng | [] [] [] [] [] [] [] |
> +- vorbis-tools | |
> +- wastesedge | () |
> +- wdiff | [] [] [] [] [] [] [] [] |
> +- wget | [] [] [] [] [] [] [] [] |
> +- xchat | [] [] [] [] [] [] [] |
> +- xkeyboard-config | [] [] [] [] |
> +- xpad | [] [] [] |
> +- +--------------------------------------------------+
> +- es et eu fa fi fr ga gl gu he hi hr hu id is it
> +- 85 22 14 2 48 101 61 12 2 8 2 6 53 29 1 52
> +-
> +- ja ka ko ku ky lg lt lv mk mn ms mt nb ne nl nn
> +- +--------------------------------------------------+
> +- Compendium | [] |
> +- a2ps | () [] [] |
> +- aegis | () |
> +- ant-phone | [] |
> +- anubis | [] [] [] |
> +- ap-utils | [] |
> +- aspell | [] [] |
> +- bash | [] |
> +- bfd | |
> +- bibshelf | [] |
> +- binutils | |
> +- bison | [] [] [] |
> +- bison-runtime | [] [] [] |
> +- bluez-pin | [] [] [] |
> +- cflow | |
> +- clisp | [] |
> +- console-tools | |
> +- coreutils | [] |
> +- cpio | [] |
> +- cpplib | [] |
> +- cryptonit | [] |
> +- dialog | [] [] |
> +- diffutils | [] [] [] |
> +- doodle | |
> +- e2fsprogs | [] |
> +- enscript | [] |
> +- fetchmail | [] [] |
> +- findutils | [] |
> +- findutils_stable | [] |
> +- flex | [] [] |
> +- fslint | |
> +- gas | |
> +- gawk | [] [] |
> +- gcal | |
> +- gcc | |
> +- gettext-examples | [] [] [] |
> +- gettext-runtime | [] [] [] |
> +- gettext-tools | [] [] |
> +- gip | [] [] |
> +- gliv | [] |
> +- glunarclock | [] [] |
> +- gmult | [] [] [] |
> +- gnubiff | |
> +- gnucash | () () () |
> +- gnuedu | |
> +- gnulib | [] [] |
> +- gnunet | |
> +- gnunet-gtk | |
> +- gnutls | [] |
> +- gpe-aerial | [] |
> +- gpe-beam | [] |
> +- gpe-calendar | [] |
> +- gpe-clock | [] [] [] |
> +- gpe-conf | [] [] [] |
> +- gpe-contacts | [] |
> +- gpe-edit | [] [] [] |
> +- gpe-filemanager | [] [] |
> +- gpe-go | [] [] [] |
> +- gpe-login | [] [] [] |
> +- gpe-ownerinfo | [] [] |
> +- gpe-package | [] [] |
> +- gpe-sketchbook | [] [] |
> +- gpe-su | [] [] [] |
> +- gpe-taskmanager | [] [] [] [] |
> +- gpe-timesheet | [] |
> +- gpe-today | [] [] |
> +- gpe-todo | [] |
> +- gphoto2 | [] [] |
> +- gprof | [] |
> +- gpsdrive | [] |
> +- gramadoir | () |
> +- grep | [] [] |
> +- gretl | |
> +- gsasl | [] |
> +- gss | |
> +- gst-plugins-bad | [] |
> +- gst-plugins-base | [] |
> +- gst-plugins-good | [] |
> +- gst-plugins-ugly | [] |
> +- gstreamer | [] |
> +- gtick | [] |
> +- gtkam | [] [] |
> +- gtkorphan | [] |
> +- gtkspell | [] [] |
> +- gutenprint | [] |
> +- hello | [] [] [] [] [] [] [] |
> +- herrie | [] |
> +- hylafax | |
> +- idutils | [] |
> +- indent | [] [] |
> +- iso_15924 | [] |
> +- iso_3166 | [] [] [] [] [] [] [] [] |
> +- iso_3166_2 | [] |
> +- iso_4217 | [] [] [] |
> +- iso_639 | [] [] [] [] |
> +- jpilot | () () |
> +- jtag | |
> +- jwhois | [] |
> +- kbd | [] |
> +- keytouch | [] |
> +- keytouch-editor | [] |
> +- keytouch-keyboa... | |
> +- latrine | [] |
> +- ld | |
> +- leafpad | [] [] |
> +- libc | [] [] [] |
> +- libexif | |
> +- libextractor | |
> +- libgpewidget | [] |
> +- libgpg-error | |
> +- libgphoto2 | [] |
> +- libgphoto2_port | [] |
> +- libgsasl | [] |
> +- libiconv | [] |
> +- libidn | [] [] |
> +- lifelines | [] |
> +- lilypond | [] |
> +- lingoteach | [] |
> +- lprng | |
> +- lynx | [] [] |
> +- m4 | [] [] |
> +- mailfromd | |
> +- mailutils | |
> +- make | [] [] [] |
> +- man-db | |
> +- minicom | [] |
> +- nano | [] [] [] |
> +- opcodes | [] |
> +- parted | [] [] |
> +- pilot-qof | |
> +- popt | [] [] [] |
> +- psmisc | [] [] [] |
> +- pwdutils | |
> +- qof | |
> +- radius | |
> +- recode | [] |
> +- rpm | [] [] |
> +- screem | [] |
> +- scrollkeeper | [] [] [] [] |
> +- sed | [] [] |
> +- shared-mime-info | [] [] [] [] [] [] [] |
> +- sharutils | [] [] |
> +- shishi | |
> +- skencil | |
> +- solfege | () () |
> +- soundtracker | |
> +- sp | () |
> +- system-tools-ba... | [] [] [] [] |
> +- tar | [] [] [] |
> +- texinfo | [] [] |
> +- tin | |
> +- tuxpaint | () [] [] |
> +- unicode-han-tra... | |
> +- unicode-transla... | |
> +- util-linux | [] [] |
> +- util-linux-ng | [] [] |
> +- vorbis-tools | |
> +- wastesedge | [] |
> +- wdiff | [] [] |
> +- wget | [] [] |
> +- xchat | [] [] [] [] |
> +- xkeyboard-config | [] [] [] |
> +- xpad | [] [] [] |
> +- +--------------------------------------------------+
> +- ja ka ko ku ky lg lt lv mk mn ms mt nb ne nl nn
> +- 51 2 25 3 2 0 6 0 2 2 20 0 11 1 103 6
> +-
> +- or pa pl pt pt_BR rm ro ru rw sk sl sq sr sv ta
> +- +--------------------------------------------------+
> +- Compendium | [] [] [] [] [] |
> +- a2ps | () [] [] [] [] [] [] |
> +- aegis | () () |
> +- ant-phone | [] [] |
> +- anubis | [] [] [] |
> +- ap-utils | () |
> +- aspell | [] [] [] |
> +- bash | [] [] |
> +- bfd | |
> +- bibshelf | [] |
> +- binutils | [] [] |
> +- bison | [] [] [] [] [] |
> +- bison-runtime | [] [] [] [] [] |
> +- bluez-pin | [] [] [] [] [] [] [] [] [] |
> +- cflow | [] |
> +- clisp | [] |
> +- console-tools | [] |
> +- coreutils | [] [] [] [] |
> +- cpio | [] [] [] |
> +- cpplib | [] |
> +- cryptonit | [] [] |
> +- dialog | [] |
> +- diffutils | [] [] [] [] [] [] |
> +- doodle | [] [] |
> +- e2fsprogs | [] [] |
> +- enscript | [] [] [] [] [] |
> +- fetchmail | [] [] [] |
> +- findutils | [] [] [] |
> +- findutils_stable | [] [] [] [] [] [] |
> +- flex | [] [] [] [] [] |
> +- fslint | [] |
> +- gas | |
> +- gawk | [] [] [] [] |
> +- gcal | [] |
> +- gcc | [] [] |
> +- gettext-examples | [] [] [] [] [] [] [] [] |
> +- gettext-runtime | [] [] [] [] [] [] [] [] |
> +- gettext-tools | [] [] [] [] [] [] [] |
> +- gip | [] [] [] [] |
> +- gliv | [] [] [] [] [] [] |
> +- glunarclock | [] [] [] [] [] [] |
> +- gmult | [] [] [] [] |
> +- gnubiff | () [] |
> +- gnucash | () [] |
> +- gnuedu | |
> +- gnulib | [] [] [] |
> +- gnunet | |
> +- gnunet-gtk | [] |
> +- gnutls | [] [] |
> +- gpe-aerial | [] [] [] [] [] [] [] |
> +- gpe-beam | [] [] [] [] [] [] [] |
> +- gpe-calendar | [] [] [] [] |
> +- gpe-clock | [] [] [] [] [] [] [] [] |
> +- gpe-conf | [] [] [] [] [] [] [] |
> +- gpe-contacts | [] [] [] [] [] |
> +- gpe-edit | [] [] [] [] [] [] [] [] [] |
> +- gpe-filemanager | [] [] |
> +- gpe-go | [] [] [] [] [] [] [] [] |
> +- gpe-login | [] [] [] [] [] [] [] [] |
> +- gpe-ownerinfo | [] [] [] [] [] [] [] [] |
> +- gpe-package | [] [] |
> +- gpe-sketchbook | [] [] [] [] [] [] [] [] |
> +- gpe-su | [] [] [] [] [] [] [] [] |
> +- gpe-taskmanager | [] [] [] [] [] [] [] [] |
> +- gpe-timesheet | [] [] [] [] [] [] [] [] |
> +- gpe-today | [] [] [] [] [] [] [] [] |
> +- gpe-todo | [] [] [] [] |
> +- gphoto2 | [] [] [] [] [] [] |
> +- gprof | [] [] [] |
> +- gpsdrive | [] [] |
> +- gramadoir | [] [] |
> +- grep | [] [] [] [] |
> +- gretl | [] [] [] |
> +- gsasl | [] [] [] |
> +- gss | [] [] [] [] |
> +- gst-plugins-bad | [] [] [] |
> +- gst-plugins-base | [] [] |
> +- gst-plugins-good | [] [] |
> +- gst-plugins-ugly | [] [] [] |
> +- gstreamer | [] [] [] [] |
> +- gtick | [] |
> +- gtkam | [] [] [] [] [] |
> +- gtkorphan | [] |
> +- gtkspell | [] [] [] [] [] [] [] [] |
> +- gutenprint | [] |
> +- hello | [] [] [] [] [] [] [] [] |
> +- herrie | [] [] [] |
> +- hylafax | |
> +- idutils | [] [] [] [] [] |
> +- indent | [] [] [] [] [] [] [] |
> +- iso_15924 | |
> +- iso_3166 | [] [] [] [] [] [] [] [] [] [] [] [] [] |
> +- iso_3166_2 | |
> +- iso_4217 | [] [] [] [] [] [] [] |
> +- iso_639 | [] [] [] [] [] [] [] |
> +- jpilot | |
> +- jtag | [] |
> +- jwhois | [] [] [] [] |
> +- kbd | [] [] [] |
> +- keytouch | [] |
> +- keytouch-editor | [] |
> +- keytouch-keyboa... | [] |
> +- latrine | |
> +- ld | [] |
> +- leafpad | [] [] [] [] [] [] |
> +- libc | [] [] [] [] |
> +- libexif | [] [] |
> +- libextractor | [] [] |
> +- libgpewidget | [] [] [] [] [] [] [] [] |
> +- libgpg-error | [] [] [] |
> +- libgphoto2 | [] |
> +- libgphoto2_port | [] [] [] |
> +- libgsasl | [] [] [] [] |
> +- libiconv | [] [] [] |
> +- libidn | [] [] () |
> +- lifelines | [] [] |
> +- lilypond | |
> +- lingoteach | [] |
> +- lprng | [] |
> +- lynx | [] [] [] |
> +- m4 | [] [] [] [] [] |
> +- mailfromd | [] |
> +- mailutils | [] [] [] |
> +- make | [] [] [] [] |
> +- man-db | [] [] [] [] |
> +- minicom | [] [] [] [] [] |
> +- nano | [] [] [] [] |
> +- opcodes | [] [] |
> +- parted | [] |
> +- pilot-qof | |
> +- popt | [] [] [] [] |
> +- psmisc | [] [] |
> +- pwdutils | [] [] |
> +- qof | [] [] |
> +- radius | [] [] |
> +- recode | [] [] [] [] [] [] [] |
> +- rpm | [] [] [] [] |
> +- screem | |
> +- scrollkeeper | [] [] [] [] [] [] [] |
> +- sed | [] [] [] [] [] [] [] [] [] |
> +- shared-mime-info | [] [] [] [] [] [] |
> +- sharutils | [] [] [] [] |
> +- shishi | [] |
> +- skencil | [] [] [] |
> +- solfege | [] |
> +- soundtracker | [] [] |
> +- sp | |
> +- system-tools-ba... | [] [] [] [] [] [] [] [] [] |
> +- tar | [] [] [] [] |
> +- texinfo | [] [] [] [] |
> +- tin | () |
> +- tuxpaint | [] [] [] [] [] [] |
> +- unicode-han-tra... | |
> +- unicode-transla... | |
> +- util-linux | [] [] [] [] |
> +- util-linux-ng | [] [] [] [] |
> +- vorbis-tools | [] |
> +- wastesedge | |
> +- wdiff | [] [] [] [] [] [] [] |
> +- wget | [] [] [] [] |
> +- xchat | [] [] [] [] [] [] [] |
> +- xkeyboard-config | [] [] [] |
> +- xpad | [] [] [] |
> +- +--------------------------------------------------+
> +- or pa pl pt pt_BR rm ro ru rw sk sl sq sr sv ta
> +- 0 5 77 31 53 4 58 72 3 45 46 9 45 122 3
> ++ Ready PO files af am ar as ast az be be@latin bg bn_IN bs ca crh
> ++ +---------------------------------------------------+
> ++ a2ps | [] [] |
> ++ aegis | |
> ++ ant-phone | |
> ++ anubis | |
> ++ aspell | [] [] |
> ++ bash | |
> ++ bfd | |
> ++ bibshelf | [] |
> ++ binutils | |
> ++ bison | |
> ++ bison-runtime | [] |
> ++ bluez-pin | [] [] |
> ++ bombono-dvd | |
> ++ buzztard | |
> ++ cflow | |
> ++ clisp | |
> ++ coreutils | [] [] |
> ++ cpio | |
> ++ cppi | |
> ++ cpplib | [] |
> ++ cryptsetup | |
> ++ dfarc | |
> ++ dialog | [] [] |
> ++ dico | |
> ++ diffutils | [] |
> ++ dink | |
> ++ doodle | |
> ++ e2fsprogs | [] |
> ++ enscript | [] |
> ++ exif | |
> ++ fetchmail | [] |
> ++ findutils | [] |
> ++ flex | [] |
> ++ freedink | |
> ++ gas | |
> ++ gawk | [] [] |
> ++ gcal | [] |
> ++ gcc | |
> ++ gettext-examples | [] [] [] [] |
> ++ gettext-runtime | [] [] [] |
> ++ gettext-tools | [] [] |
> ++ gip | [] |
> ++ gjay | |
> ++ gliv | [] |
> ++ glunarclock | [] [] |
> ++ gnubiff | |
> ++ gnucash | [] |
> ++ gnuedu | |
> ++ gnulib | |
> ++ gnunet | |
> ++ gnunet-gtk | |
> ++ gnutls | |
> ++ gold | |
> ++ gpe-aerial | |
> ++ gpe-beam | |
> ++ gpe-bluetooth | |
> ++ gpe-calendar | |
> ++ gpe-clock | [] |
> ++ gpe-conf | |
> ++ gpe-contacts | |
> ++ gpe-edit | |
> ++ gpe-filemanager | |
> ++ gpe-go | |
> ++ gpe-login | |
> ++ gpe-ownerinfo | [] |
> ++ gpe-package | |
> ++ gpe-sketchbook | |
> ++ gpe-su | [] |
> ++ gpe-taskmanager | [] |
> ++ gpe-timesheet | [] |
> ++ gpe-today | [] |
> ++ gpe-todo | |
> ++ gphoto2 | |
> ++ gprof | [] |
> ++ gpsdrive | |
> ++ gramadoir | |
> ++ grep | |
> ++ grub | [] [] |
> ++ gsasl | |
> ++ gss | |
> ++ gst-plugins-bad | [] |
> ++ gst-plugins-base | [] |
> ++ gst-plugins-good | [] |
> ++ gst-plugins-ugly | [] |
> ++ gstreamer | [] [] [] |
> ++ gtick | |
> ++ gtkam | [] |
> ++ gtkorphan | [] |
> ++ gtkspell | [] [] [] |
> ++ gutenprint | |
> ++ hello | [] |
> ++ help2man | |
> ++ hylafax | |
> ++ idutils | |
> ++ indent | [] [] |
> ++ iso_15924 | |
> ++ iso_3166 | [] [] [] [] [] [] [] [] |
> ++ iso_3166_2 | |
> ++ iso_4217 | |
> ++ iso_639 | [] [] [] [] [] |
> ++ iso_639_3 | [] |
> ++ jwhois | |
> ++ kbd | |
> ++ keytouch | [] |
> ++ keytouch-editor | |
> ++ keytouch-keyboa... | [] |
> ++ klavaro | [] |
> ++ latrine | |
> ++ ld | [] |
> ++ leafpad | [] [] |
> ++ libc | [] [] |
> ++ libexif | () |
> ++ libextractor | |
> ++ libgnutls | |
> ++ libgpewidget | |
> ++ libgpg-error | |
> ++ libgphoto2 | |
> ++ libgphoto2_port | |
> ++ libgsasl | |
> ++ libiconv | [] |
> ++ libidn | |
> ++ lifelines | |
> ++ liferea | [] [] |
> ++ lilypond | |
> ++ linkdr | [] |
> ++ lordsawar | |
> ++ lprng | |
> ++ lynx | [] |
> ++ m4 | |
> ++ mailfromd | |
> ++ mailutils | |
> ++ make | |
> ++ man-db | |
> ++ man-db-manpages | |
> ++ minicom | |
> ++ mkisofs | |
> ++ myserver | |
> ++ nano | [] [] |
> ++ opcodes | |
> ++ parted | |
> ++ pies | |
> ++ popt | |
> ++ psmisc | |
> ++ pspp | [] |
> ++ pwdutils | |
> ++ radius | [] |
> ++ recode | [] [] |
> ++ rosegarden | |
> ++ rpm | |
> ++ rush | |
> ++ sarg | |
> ++ screem | |
> ++ scrollkeeper | [] [] [] |
> ++ sed | [] [] |
> ++ sharutils | [] [] |
> ++ shishi | |
> ++ skencil | |
> ++ solfege | |
> ++ solfege-manual | |
> ++ soundtracker | |
> ++ sp | |
> ++ sysstat | |
> ++ tar | [] |
> ++ texinfo | |
> ++ tin | |
> ++ unicode-han-tra... | |
> ++ unicode-transla... | |
> ++ util-linux-ng | [] |
> ++ vice | |
> ++ vmm | |
> ++ vorbis-tools | |
> ++ wastesedge | |
> ++ wdiff | |
> ++ wget | [] [] |
> ++ wyslij-po | |
> ++ xchat | [] [] [] [] |
> ++ xdg-user-dirs | [] [] [] [] [] [] [] [] [] |
> ++ xkeyboard-config | [] [] [] |
> ++ +---------------------------------------------------+
> ++ af am ar as ast az be be@latin bg bn_IN bs ca crh
> ++ 6 0 2 3 19 1 11 3 28 3 1 38 5
> ++
> ++ cs da de el en en_GB en_ZA eo es et eu fa fi
> ++ +-------------------------------------------------+
> ++ a2ps | [] [] [] [] [] [] [] [] |
> ++ aegis | [] [] [] |
> ++ ant-phone | [] () |
> ++ anubis | [] [] [] |
> ++ aspell | [] [] [] [] [] |
> ++ bash | [] [] [] [] |
> ++ bfd | [] [] |
> ++ bibshelf | [] [] [] [] |
> ++ binutils | [] [] |
> ++ bison | [] [] [] |
> ++ bison-runtime | [] [] [] [] [] |
> ++ bluez-pin | [] [] [] [] [] [] [] |
> ++ bombono-dvd | [] [] |
> ++ buzztard | [] [] [] |
> ++ cflow | [] [] [] |
> ++ clisp | [] [] [] [] |
> ++ coreutils | [] [] [] [] |
> ++ cpio | [] |
> ++ cppi | [] |
> ++ cpplib | [] [] [] |
> ++ cryptsetup | [] |
> ++ dfarc | [] [] [] [] |
> ++ dialog | [] [] [] [] [] |
> ++ dico | |
> ++ diffutils | [] [] [] [] [] [] [] |
> ++ dink | [] [] [] |
> ++ doodle | [] |
> ++ e2fsprogs | [] [] [] |
> ++ enscript | [] [] [] |
> ++ exif | () [] [] [] |
> ++ fetchmail | [] [] () [] [] [] |
> ++ findutils | [] [] [] [] |
> ++ flex | [] [] [] |
> ++ freedink | [] [] [] [] |
> ++ gas | [] |
> ++ gawk | [] [] [] |
> ++ gcal | [] |
> ++ gcc | [] [] |
> ++ gettext-examples | [] [] [] [] [] |
> ++ gettext-runtime | [] [] [] [] [] |
> ++ gettext-tools | [] [] [] |
> ++ gip | [] [] [] [] [] |
> ++ gjay | [] [] |
> ++ gliv | [] [] [] [] |
> ++ glunarclock | [] [] [] |
> ++ gnubiff | () |
> ++ gnucash | [] () () () () () |
> ++ gnuedu | [] [] |
> ++ gnulib | [] [] [] |
> ++ gnunet | |
> ++ gnunet-gtk | [] |
> ++ gnutls | [] [] |
> ++ gold | [] [] |
> ++ gpe-aerial | [] [] [] [] [] |
> ++ gpe-beam | [] [] [] [] [] |
> ++ gpe-bluetooth | [] [] [] |
> ++ gpe-calendar | [] [] |
> ++ gpe-clock | [] [] [] [] [] |
> ++ gpe-conf | [] [] [] [] |
> ++ gpe-contacts | [] [] [] [] |
> ++ gpe-edit | [] [] [] |
> ++ gpe-filemanager | [] [] [] [] |
> ++ gpe-go | [] [] [] [] [] |
> ++ gpe-login | [] [] [] |
> ++ gpe-ownerinfo | [] [] [] [] [] |
> ++ gpe-package | [] [] [] [] |
> ++ gpe-sketchbook | [] [] [] [] [] |
> ++ gpe-su | [] [] [] [] [] |
> ++ gpe-taskmanager | [] [] [] [] [] |
> ++ gpe-timesheet | [] [] [] [] [] |
> ++ gpe-today | [] [] [] [] [] |
> ++ gpe-todo | [] [] [] [] |
> ++ gphoto2 | [] [] () [] [] [] [] |
> ++ gprof | [] [] [] [] |
> ++ gpsdrive | [] [] [] |
> ++ gramadoir | [] [] [] |
> ++ grep | [] [] |
> ++ grub | [] [] [] |
> ++ gsasl | [] [] |
> ++ gss | [] |
> ++ gst-plugins-bad | [] [] [] [] [] [] |
> ++ gst-plugins-base | [] [] [] [] [] [] |
> ++ gst-plugins-good | [] [] [] [] [] [] [] |
> ++ gst-plugins-ugly | [] [] [] [] [] [] [] |
> ++ gstreamer | [] [] [] [] [] [] |
> ++ gtick | [] () [] [] |
> ++ gtkam | [] [] () [] [] |
> ++ gtkorphan | [] [] [] [] |
> ++ gtkspell | [] [] [] [] [] [] [] [] |
> ++ gutenprint | [] [] [] [] |
> ++ hello | [] [] [] [] [] |
> ++ help2man | [] [] |
> ++ hylafax | [] [] |
> ++ idutils | [] [] [] |
> ++ indent | [] [] [] [] [] [] [] [] |
> ++ iso_15924 | [] () [] [] [] |
> ++ iso_3166 | [] [] [] () [] [] [] () [] |
> ++ iso_3166_2 | () |
> ++ iso_4217 | [] [] [] () [] [] [] |
> ++ iso_639 | [] [] [] () [] [] [] |
> ++ iso_639_3 | |
> ++ jwhois | [] [] |
> ++ kbd | [] [] [] [] [] |
> ++ keytouch | [] [] [] |
> ++ keytouch-editor | [] [] [] |
> ++ keytouch-keyboa... | [] [] |
> ++ klavaro | [] [] [] [] |
> ++ latrine | [] () [] |
> ++ ld | [] [] [] |
> ++ leafpad | [] [] [] [] [] [] [] |
> ++ libc | [] [] [] [] [] |
> ++ libexif | [] [] () |
> ++ libextractor | |
> ++ libgnutls | [] |
> ++ libgpewidget | [] [] [] |
> ++ libgpg-error | [] [] |
> ++ libgphoto2 | [] () |
> ++ libgphoto2_port | [] () [] |
> ++ libgsasl | [] |
> ++ libiconv | [] [] [] [] [] [] |
> ++ libidn | [] [] [] [] |
> ++ lifelines | [] () |
> ++ liferea | [] [] [] [] [] |
> ++ lilypond | [] [] [] [] |
> ++ linkdr | [] [] [] [] |
> ++ lordsawar | [] |
> ++ lprng | |
> ++ lynx | [] [] [] [] |
> ++ m4 | [] [] [] [] [] |
> ++ mailfromd | |
> ++ mailutils | [] |
> ++ make | [] [] [] [] |
> ++ man-db | |
> ++ man-db-manpages | |
> ++ minicom | [] [] [] [] [] |
> ++ mkisofs | [] |
> ++ myserver | |
> ++ nano | [] [] [] [] |
> ++ opcodes | [] [] [] |
> ++ parted | [] [] |
> ++ pies | |
> ++ popt | [] [] [] [] [] [] |
> ++ psmisc | [] [] [] [] |
> ++ pspp | [] |
> ++ pwdutils | [] |
> ++ radius | [] |
> ++ recode | [] [] [] [] [] [] [] |
> ++ rosegarden | () () () () |
> ++ rpm | [] [] [] |
> ++ rush | |
> ++ sarg | |
> ++ screem | |
> ++ scrollkeeper | [] [] [] [] [] [] |
> ++ sed | [] [] [] [] [] [] [] |
> ++ sharutils | [] [] [] [] [] |
> ++ shishi | |
> ++ skencil | [] () [] |
> ++ solfege | [] [] [] [] |
> ++ solfege-manual | [] [] |
> ++ soundtracker | [] [] [] |
> ++ sp | [] |
> ++ sysstat | [] [] [] [] |
> ++ tar | [] [] [] [] [] |
> ++ texinfo | [] [] [] |
> ++ tin | [] [] |
> ++ unicode-han-tra... | |
> ++ unicode-transla... | |
> ++ util-linux-ng | [] [] [] [] [] |
> ++ vice | () () |
> ++ vmm | [] |
> ++ vorbis-tools | [] [] |
> ++ wastesedge | [] |
> ++ wdiff | [] [] [] |
> ++ wget | [] [] [] [] |
> ++ wyslij-po | [] |
> ++ xchat | [] [] [] [] [] [] |
> ++ xdg-user-dirs | [] [] [] [] [] [] [] [] [] |
> ++ xkeyboard-config | [] [] [] [] [] [] |
> ++ +-------------------------------------------------+
> ++ cs da de el en en_GB en_ZA eo es et eu fa fi
> ++ 64 105 117 18 1 8 0 28 89 18 19 0 104
> ++
> ++ fr ga gl gu he hi hr hu hy id is it ja ka kn
> ++ +------------------------------------------------+
> ++ a2ps | [] [] [] |
> ++ aegis | [] [] |
> ++ ant-phone | [] [] |
> ++ anubis | [] [] [] |
> ++ aspell | [] [] [] [] |
> ++ bash | [] [] [] |
> ++ bfd | [] [] |
> ++ bibshelf | [] [] [] [] |
> ++ binutils | [] [] |
> ++ bison | [] [] [] |
> ++ bison-runtime | [] [] [] [] [] |
> ++ bluez-pin | [] [] [] [] [] [] [] |
> ++ bombono-dvd | |
> ++ buzztard | [] |
> ++ cflow | [] [] |
> ++ clisp | [] |
> ++ coreutils | [] [] [] [] [] |
> ++ cpio | [] [] [] |
> ++ cppi | [] |
> ++ cpplib | [] [] |
> ++ cryptsetup | [] [] [] |
> ++ dfarc | [] [] |
> ++ dialog | [] [] [] [] [] [] [] |
> ++ dico | |
> ++ diffutils | [] [] [] [] [] [] [] [] |
> ++ dink | [] |
> ++ doodle | [] [] |
> ++ e2fsprogs | [] [] |
> ++ enscript | [] [] [] [] |
> ++ exif | [] [] [] [] [] |
> ++ fetchmail | [] [] [] [] |
> ++ findutils | [] [] [] [] [] |
> ++ flex | [] [] |
> ++ freedink | [] [] |
> ++ gas | [] [] |
> ++ gawk | [] [] [] [] () [] |
> ++ gcal | [] |
> ++ gcc | [] |
> ++ gettext-examples | [] [] [] [] [] [] |
> ++ gettext-runtime | [] [] [] [] [] |
> ++ gettext-tools | [] [] [] [] |
> ++ gip | [] [] [] [] [] |
> ++ gjay | |
> ++ gliv | () |
> ++ glunarclock | [] [] [] |
> ++ gnubiff | () [] () |
> ++ gnucash | () () () () [] |
> ++ gnuedu | [] [] |
> ++ gnulib | [] [] [] [] [] |
> ++ gnunet | |
> ++ gnunet-gtk | [] |
> ++ gnutls | [] [] |
> ++ gold | [] |
> ++ gpe-aerial | [] [] |
> ++ gpe-beam | [] [] [] |
> ++ gpe-bluetooth | [] [] [] |
> ++ gpe-calendar | [] |
> ++ gpe-clock | [] [] [] [] |
> ++ gpe-conf | [] [] [] |
> ++ gpe-contacts | [] [] [] |
> ++ gpe-edit | [] [] |
> ++ gpe-filemanager | [] [] [] |
> ++ gpe-go | [] [] [] [] |
> ++ gpe-login | [] [] |
> ++ gpe-ownerinfo | [] [] [] [] |
> ++ gpe-package | [] [] |
> ++ gpe-sketchbook | [] [] [] |
> ++ gpe-su | [] [] [] [] [] |
> ++ gpe-taskmanager | [] [] [] [] |
> ++ gpe-timesheet | [] [] [] [] |
> ++ gpe-today | [] [] [] [] [] [] |
> ++ gpe-todo | [] [] |
> ++ gphoto2 | [] [] [] [] [] |
> ++ gprof | [] [] [] |
> ++ gpsdrive | [] [] [] |
> ++ gramadoir | [] [] [] |
> ++ grep | [] |
> ++ grub | [] [] [] |
> ++ gsasl | [] [] [] [] |
> ++ gss | [] [] [] [] |
> ++ gst-plugins-bad | [] [] [] [] |
> ++ gst-plugins-base | [] [] [] [] [] |
> ++ gst-plugins-good | [] [] [] [] [] |
> ++ gst-plugins-ugly | [] [] [] [] [] |
> ++ gstreamer | [] [] [] [] |
> ++ gtick | [] [] [] [] |
> ++ gtkam | [] [] [] [] [] |
> ++ gtkorphan | [] [] [] |
> ++ gtkspell | [] [] [] [] [] [] [] [] |
> ++ gutenprint | [] [] [] |
> ++ hello | [] [] |
> ++ help2man | [] |
> ++ hylafax | [] |
> ++ idutils | [] [] [] [] [] |
> ++ indent | [] [] [] [] [] [] [] |
> ++ iso_15924 | () [] [] |
> ++ iso_3166 | () [] [] [] [] [] [] [] [] [] [] |
> ++ iso_3166_2 | () [] [] [] |
> ++ iso_4217 | () [] [] [] [] |
> ++ iso_639 | () [] [] [] [] [] [] [] |
> ++ iso_639_3 | () [] [] |
> ++ jwhois | [] [] [] [] |
> ++ kbd | [] [] |
> ++ keytouch | [] [] [] [] [] |
> ++ keytouch-editor | [] [] [] [] |
> ++ keytouch-keyboa... | [] [] [] [] |
> ++ klavaro | [] [] |
> ++ latrine | [] [] |
> ++ ld | [] [] [] |
> ++ leafpad | [] [] [] [] [] [] () |
> ++ libc | [] [] [] [] |
> ++ libexif | |
> ++ libextractor | |
> ++ libgnutls | [] [] |
> ++ libgpewidget | [] [] [] |
> ++ libgpg-error | [] [] |
> ++ libgphoto2 | [] [] [] |
> ++ libgphoto2_port | [] [] [] |
> ++ libgsasl | [] [] [] [] |
> ++ libiconv | [] [] [] [] [] |
> ++ libidn | [] [] [] |
> ++ lifelines | () |
> ++ liferea | [] [] [] [] |
> ++ lilypond | [] |
> ++ linkdr | [] [] [] [] |
> ++ lordsawar | |
> ++ lprng | [] |
> ++ lynx | [] [] [] [] [] |
> ++ m4 | [] [] [] [] [] |
> ++ mailfromd | |
> ++ mailutils | [] [] |
> ++ make | [] [] [] [] [] [] [] [] |
> ++ man-db | [] [] |
> ++ man-db-manpages | [] |
> ++ minicom | [] [] [] [] |
> ++ mkisofs | [] [] [] |
> ++ myserver | |
> ++ nano | [] [] [] [] [] |
> ++ opcodes | [] [] [] |
> ++ parted | [] [] [] [] |
> ++ pies | |
> ++ popt | [] [] [] [] [] [] [] [] |
> ++ psmisc | [] [] |
> ++ pspp | |
> ++ pwdutils | [] [] |
> ++ radius | [] [] |
> ++ recode | [] [] [] [] [] [] [] |
> ++ rosegarden | () () () () |
> ++ rpm | [] [] |
> ++ rush | |
> ++ sarg | [] |
> ++ screem | [] [] |
> ++ scrollkeeper | [] [] [] |
> ++ sed | [] [] [] [] [] [] [] |
> ++ sharutils | [] [] [] [] [] [] |
> ++ shishi | [] |
> ++ skencil | [] |
> ++ solfege | [] [] [] |
> ++ solfege-manual | [] [] |
> ++ soundtracker | [] [] |
> ++ sp | [] () |
> ++ sysstat | [] [] [] [] |
> ++ tar | [] [] [] [] [] [] |
> ++ texinfo | [] [] [] [] |
> ++ tin | [] |
> ++ unicode-han-tra... | |
> ++ unicode-transla... | [] [] |
> ++ util-linux-ng | [] [] [] [] [] |
> ++ vice | () () () |
> ++ vmm | [] |
> ++ vorbis-tools | [] |
> ++ wastesedge | () () |
> ++ wdiff | |
> ++ wget | [] [] [] [] [] [] [] |
> ++ wyslij-po | [] [] |
> ++ xchat | [] [] [] [] [] [] [] [] |
> ++ xdg-user-dirs | [] [] [] [] [] [] [] [] [] [] [] |
> ++ xkeyboard-config | [] [] [] [] |
> ++ +------------------------------------------------+
> ++ fr ga gl gu he hi hr hu hy id is it ja ka kn
> ++ 121 53 20 4 8 2 5 53 2 120 5 83 66 0 4
> ++
> ++ ko ku ky lg lt lv mk ml mn mr ms mt nb nds ne
> ++ +-----------------------------------------------+
> ++ a2ps | [] |
> ++ aegis | |
> ++ ant-phone | |
> ++ anubis | [] [] |
> ++ aspell | [] |
> ++ bash | |
> ++ bfd | |
> ++ bibshelf | [] [] |
> ++ binutils | |
> ++ bison | [] |
> ++ bison-runtime | [] [] [] [] [] |
> ++ bluez-pin | [] [] [] [] [] |
> ++ bombono-dvd | |
> ++ buzztard | |
> ++ cflow | |
> ++ clisp | |
> ++ coreutils | [] |
> ++ cpio | |
> ++ cppi | |
> ++ cpplib | |
> ++ cryptsetup | |
> ++ dfarc | [] |
> ++ dialog | [] [] [] [] [] |
> ++ dico | |
> ++ diffutils | [] [] |
> ++ dink | |
> ++ doodle | |
> ++ e2fsprogs | |
> ++ enscript | |
> ++ exif | [] |
> ++ fetchmail | |
> ++ findutils | |
> ++ flex | |
> ++ freedink | [] |
> ++ gas | |
> ++ gawk | |
> ++ gcal | |
> ++ gcc | |
> ++ gettext-examples | [] [] [] [] |
> ++ gettext-runtime | [] |
> ++ gettext-tools | [] |
> ++ gip | [] [] |
> ++ gjay | |
> ++ gliv | |
> ++ glunarclock | [] |
> ++ gnubiff | |
> ++ gnucash | () () () () |
> ++ gnuedu | |
> ++ gnulib | |
> ++ gnunet | |
> ++ gnunet-gtk | |
> ++ gnutls | [] |
> ++ gold | |
> ++ gpe-aerial | [] |
> ++ gpe-beam | [] |
> ++ gpe-bluetooth | [] [] |
> ++ gpe-calendar | [] |
> ++ gpe-clock | [] [] [] [] [] |
> ++ gpe-conf | [] [] |
> ++ gpe-contacts | [] [] |
> ++ gpe-edit | [] |
> ++ gpe-filemanager | [] [] |
> ++ gpe-go | [] [] [] |
> ++ gpe-login | [] |
> ++ gpe-ownerinfo | [] [] |
> ++ gpe-package | [] [] |
> ++ gpe-sketchbook | [] [] |
> ++ gpe-su | [] [] [] [] [] [] |
> ++ gpe-taskmanager | [] [] [] [] [] [] |
> ++ gpe-timesheet | [] [] |
> ++ gpe-today | [] [] [] [] |
> ++ gpe-todo | [] [] |
> ++ gphoto2 | |
> ++ gprof | [] |
> ++ gpsdrive | |
> ++ gramadoir | |
> ++ grep | |
> ++ grub | |
> ++ gsasl | |
> ++ gss | |
> ++ gst-plugins-bad | [] [] |
> ++ gst-plugins-base | [] [] |
> ++ gst-plugins-good | [] [] |
> ++ gst-plugins-ugly | [] [] [] [] [] |
> ++ gstreamer | |
> ++ gtick | |
> ++ gtkam | [] |
> ++ gtkorphan | [] [] |
> ++ gtkspell | [] [] [] [] [] [] [] |
> ++ gutenprint | |
> ++ hello | [] [] [] |
> ++ help2man | |
> ++ hylafax | |
> ++ idutils | |
> ++ indent | |
> ++ iso_15924 | [] [] |
> ++ iso_3166 | [] [] () [] [] [] [] [] |
> ++ iso_3166_2 | |
> ++ iso_4217 | [] [] |
> ++ iso_639 | [] [] |
> ++ iso_639_3 | [] |
> ++ jwhois | [] |
> ++ kbd | |
> ++ keytouch | [] |
> ++ keytouch-editor | [] |
> ++ keytouch-keyboa... | [] |
> ++ klavaro | [] |
> ++ latrine | [] |
> ++ ld | |
> ++ leafpad | [] [] [] |
> ++ libc | [] |
> ++ libexif | |
> ++ libextractor | |
> ++ libgnutls | [] |
> ++ libgpewidget | [] [] |
> ++ libgpg-error | |
> ++ libgphoto2 | |
> ++ libgphoto2_port | |
> ++ libgsasl | |
> ++ libiconv | |
> ++ libidn | |
> ++ lifelines | |
> ++ liferea | |
> ++ lilypond | |
> ++ linkdr | |
> ++ lordsawar | |
> ++ lprng | |
> ++ lynx | |
> ++ m4 | |
> ++ mailfromd | |
> ++ mailutils | |
> ++ make | [] |
> ++ man-db | |
> ++ man-db-manpages | |
> ++ minicom | [] |
> ++ mkisofs | |
> ++ myserver | |
> ++ nano | [] [] |
> ++ opcodes | |
> ++ parted | |
> ++ pies | |
> ++ popt | [] [] [] |
> ++ psmisc | |
> ++ pspp | |
> ++ pwdutils | |
> ++ radius | |
> ++ recode | |
> ++ rosegarden | |
> ++ rpm | |
> ++ rush | |
> ++ sarg | |
> ++ screem | |
> ++ scrollkeeper | [] [] |
> ++ sed | |
> ++ sharutils | |
> ++ shishi | |
> ++ skencil | |
> ++ solfege | [] |
> ++ solfege-manual | |
> ++ soundtracker | |
> ++ sp | |
> ++ sysstat | [] |
> ++ tar | [] |
> ++ texinfo | [] |
> ++ tin | |
> ++ unicode-han-tra... | |
> ++ unicode-transla... | |
> ++ util-linux-ng | |
> ++ vice | |
> ++ vmm | |
> ++ vorbis-tools | |
> ++ wastesedge | |
> ++ wdiff | |
> ++ wget | [] |
> ++ wyslij-po | |
> ++ xchat | [] [] [] |
> ++ xdg-user-dirs | [] [] [] [] [] [] [] [] |
> ++ xkeyboard-config | [] [] [] |
> ++ +-----------------------------------------------+
> ++ ko ku ky lg lt lv mk ml mn mr ms mt nb nds ne
> ++ 20 5 10 1 12 48 4 2 2 4 24 10 19 3 1
> ++
> ++ nl nn or pa pl ps pt pt_BR ro ru rw sk sl sq sr
> ++ +---------------------------------------------------+
> ++ a2ps | [] [] [] [] [] [] [] [] |
> ++ aegis | [] [] [] |
> ++ ant-phone | [] [] |
> ++ anubis | [] [] [] |
> ++ aspell | [] [] [] [] [] |
> ++ bash | [] [] |
> ++ bfd | [] |
> ++ bibshelf | [] [] |
> ++ binutils | [] [] |
> ++ bison | [] [] [] |
> ++ bison-runtime | [] [] [] [] [] [] [] |
> ++ bluez-pin | [] [] [] [] [] [] [] [] |
> ++ bombono-dvd | [] () |
> ++ buzztard | [] [] |
> ++ cflow | [] |
> ++ clisp | [] [] |
> ++ coreutils | [] [] [] [] [] [] |
> ++ cpio | [] [] [] |
> ++ cppi | [] |
> ++ cpplib | [] |
> ++ cryptsetup | [] |
> ++ dfarc | [] |
> ++ dialog | [] [] [] [] |
> ++ dico | [] |
> ++ diffutils | [] [] [] [] [] [] |
> ++ dink | () |
> ++ doodle | [] [] |
> ++ e2fsprogs | [] [] |
> ++ enscript | [] [] [] [] [] |
> ++ exif | [] [] [] () [] |
> ++ fetchmail | [] [] [] [] |
> ++ findutils | [] [] [] [] [] |
> ++ flex | [] [] [] [] [] |
> ++ freedink | [] [] |
> ++ gas | |
> ++ gawk | [] [] [] [] |
> ++ gcal | |
> ++ gcc | [] |
> ++ gettext-examples | [] [] [] [] [] [] [] [] |
> ++ gettext-runtime | [] [] [] [] [] [] [] [] [] |
> ++ gettext-tools | [] [] [] [] [] [] |
> ++ gip | [] [] [] [] [] |
> ++ gjay | |
> ++ gliv | [] [] [] [] [] [] |
> ++ glunarclock | [] [] [] [] [] |
> ++ gnubiff | [] () |
> ++ gnucash | [] () () () |
> ++ gnuedu | [] |
> ++ gnulib | [] [] [] [] |
> ++ gnunet | |
> ++ gnunet-gtk | |
> ++ gnutls | [] [] |
> ++ gold | |
> ++ gpe-aerial | [] [] [] [] [] [] [] |
> ++ gpe-beam | [] [] [] [] [] [] [] |
> ++ gpe-bluetooth | [] [] |
> ++ gpe-calendar | [] [] [] [] |
> ++ gpe-clock | [] [] [] [] [] [] [] [] |
> ++ gpe-conf | [] [] [] [] [] [] [] |
> ++ gpe-contacts | [] [] [] [] [] |
> ++ gpe-edit | [] [] [] |
> ++ gpe-filemanager | [] [] [] |
> ++ gpe-go | [] [] [] [] [] [] [] [] |
> ++ gpe-login | [] [] |
> ++ gpe-ownerinfo | [] [] [] [] [] [] [] [] |
> ++ gpe-package | [] [] |
> ++ gpe-sketchbook | [] [] [] [] [] [] [] |
> ++ gpe-su | [] [] [] [] [] [] [] [] |
> ++ gpe-taskmanager | [] [] [] [] [] [] [] [] |
> ++ gpe-timesheet | [] [] [] [] [] [] [] [] |
> ++ gpe-today | [] [] [] [] [] [] [] [] |
> ++ gpe-todo | [] [] [] [] [] |
> ++ gphoto2 | [] [] [] [] [] [] [] [] |
> ++ gprof | [] [] [] |
> ++ gpsdrive | [] [] |
> ++ gramadoir | [] [] |
> ++ grep | [] [] [] [] |
> ++ grub | [] [] [] |
> ++ gsasl | [] [] [] [] |
> ++ gss | [] [] [] |
> ++ gst-plugins-bad | [] [] [] [] [] |
> ++ gst-plugins-base | [] [] [] [] [] |
> ++ gst-plugins-good | [] [] [] [] [] |
> ++ gst-plugins-ugly | [] [] [] [] [] [] |
> ++ gstreamer | [] [] [] [] [] |
> ++ gtick | [] [] [] |
> ++ gtkam | [] [] [] [] [] [] |
> ++ gtkorphan | [] |
> ++ gtkspell | [] [] [] [] [] [] [] [] [] [] |
> ++ gutenprint | [] [] |
> ++ hello | [] [] [] [] |
> ++ help2man | [] [] |
> ++ hylafax | [] |
> ++ idutils | [] [] [] [] [] |
> ++ indent | [] [] [] [] [] [] [] |
> ++ iso_15924 | [] [] [] [] |
> ++ iso_3166 | [] [] [] [] [] () [] [] [] [] [] [] [] [] |
> ++ iso_3166_2 | [] [] [] |
> ++ iso_4217 | [] [] [] [] [] [] [] [] |
> ++ iso_639 | [] [] [] [] [] [] [] [] [] |
> ++ iso_639_3 | [] [] |
> ++ jwhois | [] [] [] [] |
> ++ kbd | [] [] [] |
> ++ keytouch | [] [] [] |
> ++ keytouch-editor | [] [] [] |
> ++ keytouch-keyboa... | [] [] [] |
> ++ klavaro | [] [] |
> ++ latrine | [] [] |
> ++ ld | |
> ++ leafpad | [] [] [] [] [] [] [] [] [] |
> ++ libc | [] [] [] [] |
> ++ libexif | [] [] () [] |
> ++ libextractor | |
> ++ libgnutls | [] [] |
> ++ libgpewidget | [] [] [] |
> ++ libgpg-error | [] [] |
> ++ libgphoto2 | [] [] |
> ++ libgphoto2_port | [] [] [] [] |
> ++ libgsasl | [] [] [] [] [] |
> ++ libiconv | [] [] [] [] [] |
> ++ libidn | [] [] |
> ++ lifelines | [] [] |
> ++ liferea | [] [] [] [] [] () () [] |
> ++ lilypond | [] |
> ++ linkdr | [] [] [] |
> ++ lordsawar | |
> ++ lprng | [] |
> ++ lynx | [] [] [] |
> ++ m4 | [] [] [] [] [] |
> ++ mailfromd | [] |
> ++ mailutils | [] |
> ++ make | [] [] [] [] |
> ++ man-db | [] [] [] |
> ++ man-db-manpages | [] [] [] |
> ++ minicom | [] [] [] [] |
> ++ mkisofs | [] [] [] |
> ++ myserver | |
> ++ nano | [] [] [] [] |
> ++ opcodes | [] [] |
> ++ parted | [] [] [] [] |
> ++ pies | [] |
> ++ popt | [] [] [] [] |
> ++ psmisc | [] [] [] |
> ++ pspp | [] [] |
> ++ pwdutils | [] |
> ++ radius | [] [] [] |
> ++ recode | [] [] [] [] [] [] [] [] |
> ++ rosegarden | () () |
> ++ rpm | [] [] [] |
> ++ rush | [] [] |
> ++ sarg | |
> ++ screem | |
> ++ scrollkeeper | [] [] [] [] [] [] [] [] |
> ++ sed | [] [] [] [] [] [] [] [] [] |
> ++ sharutils | [] [] [] [] |
> ++ shishi | [] |
> ++ skencil | [] [] |
> ++ solfege | [] [] [] [] |
> ++ solfege-manual | [] [] [] |
> ++ soundtracker | [] |
> ++ sp | |
> ++ sysstat | [] [] [] [] |
> ++ tar | [] [] [] [] |
> ++ texinfo | [] [] [] [] |
> ++ tin | [] |
> ++ unicode-han-tra... | |
> ++ unicode-transla... | |
> ++ util-linux-ng | [] [] [] [] [] |
> ++ vice | [] |
> ++ vmm | [] |
> ++ vorbis-tools | [] [] |
> ++ wastesedge | [] |
> ++ wdiff | [] [] |
> ++ wget | [] [] [] [] [] [] [] |
> ++ wyslij-po | [] [] [] |
> ++ xchat | [] [] [] [] [] [] [] [] [] |
> ++ xdg-user-dirs | [] [] [] [] [] [] [] [] [] [] [] [] [] [] |
> ++ xkeyboard-config | [] [] [] [] [] |
> ++ +---------------------------------------------------+
> ++ nl nn or pa pl ps pt pt_BR ro ru rw sk sl sq sr
> ++ 135 10 4 7 105 1 29 61 47 91 3 55 47 8 37
> +
> +- tg th tk tr uk ven vi wa xh zh_CN zh_HK zh_TW zu
> ++ sv sw ta te tg th tr uk vi wa zh_CN zh_HK zh_TW
> + +---------------------------------------------------+
> +- Compendium | [] [] [] [] | 19
> +- a2ps | [] [] [] | 19
> +- aegis | [] | 1
> +- ant-phone | [] [] | 6
> +- anubis | [] [] [] | 11
> +- ap-utils | () [] | 4
> +- aspell | [] [] [] | 16
> +- bash | [] | 6
> +- bfd | | 2
> +- bibshelf | [] | 7
> +- binutils | [] [] [] [] | 9
> +- bison | [] [] [] [] | 20
> +- bison-runtime | [] [] [] [] | 18
> +- bluez-pin | [] [] [] [] [] [] | 28
> +- cflow | [] [] | 5
> +- clisp | | 9
> +- console-tools | [] [] | 5
> +- coreutils | [] [] [] | 18
> +- cpio | [] [] [] [] | 11
> +- cpplib | [] [] [] [] [] | 12
> +- cryptonit | [] | 6
> +- dialog | [] [] [] | 9
> +- diffutils | [] [] [] [] [] | 29
> +- doodle | [] | 6
> +- e2fsprogs | [] [] | 10
> +- enscript | [] [] [] | 16
> +- fetchmail | [] [] | 12
> +- findutils | [] [] [] | 11
> +- findutils_stable | [] [] [] [] | 18
> +- flex | [] [] | 15
> +- fslint | [] | 2
> +- gas | [] | 3
> +- gawk | [] [] [] | 16
> +- gcal | [] | 5
> +- gcc | [] [] [] | 7
> +- gettext-examples | [] [] [] [] [] [] | 29
> +- gettext-runtime | [] [] [] [] [] [] | 28
> +- gettext-tools | [] [] [] [] [] | 20
> +- gip | [] [] | 13
> +- gliv | [] [] | 11
> +- glunarclock | [] [] [] | 15
> +- gmult | [] [] [] [] | 16
> +- gnubiff | [] | 2
> +- gnucash | () [] | 5
> +- gnuedu | [] | 2
> +- gnulib | [] | 10
> +- gnunet | | 0
> +- gnunet-gtk | [] [] | 3
> +- gnutls | | 4
> +- gpe-aerial | [] [] | 14
> +- gpe-beam | [] [] | 14
> +- gpe-calendar | [] [] | 7
> +- gpe-clock | [] [] [] [] | 21
> +- gpe-conf | [] [] [] | 16
> +- gpe-contacts | [] [] | 10
> +- gpe-edit | [] [] [] [] [] | 22
> +- gpe-filemanager | [] [] | 7
> +- gpe-go | [] [] [] [] | 19
> +- gpe-login | [] [] [] [] [] | 21
> +- gpe-ownerinfo | [] [] [] [] | 21
> +- gpe-package | [] | 6
> +- gpe-sketchbook | [] [] | 16
> +- gpe-su | [] [] [] [] | 21
> +- gpe-taskmanager | [] [] [] [] | 21
> +- gpe-timesheet | [] [] [] [] | 18
> +- gpe-today | [] [] [] [] [] | 21
> +- gpe-todo | [] [] | 8
> +- gphoto2 | [] [] [] [] | 21
> +- gprof | [] [] | 13
> +- gpsdrive | [] | 5
> +- gramadoir | [] | 7
> +- grep | [] | 12
> +- gretl | | 6
> +- gsasl | [] [] [] | 9
> +- gss | [] | 7
> +- gst-plugins-bad | [] [] [] | 13
> +- gst-plugins-base | [] [] | 11
> +- gst-plugins-good | [] [] [] [] [] | 16
> +- gst-plugins-ugly | [] [] [] | 13
> +- gstreamer | [] [] [] | 18
> +- gtick | [] [] | 7
> +- gtkam | [] | 16
> +- gtkorphan | [] | 7
> +- gtkspell | [] [] [] [] [] [] | 27
> +- gutenprint | | 4
> +- hello | [] [] [] [] [] | 38
> +- herrie | [] [] | 8
> +- hylafax | | 0
> +- idutils | [] [] | 15
> +- indent | [] [] [] [] [] | 28
> +- iso_15924 | [] [] | 4
> +- iso_3166 | [] [] [] [] [] [] [] [] [] | 54
> +- iso_3166_2 | [] [] | 4
> +- iso_4217 | [] [] [] [] [] | 24
> +- iso_639 | [] [] [] [] [] | 26
> +- jpilot | [] [] [] [] | 7
> +- jtag | [] | 3
> +- jwhois | [] [] [] | 13
> +- kbd | [] [] [] | 13
> +- keytouch | [] | 8
> +- keytouch-editor | [] | 5
> +- keytouch-keyboa... | [] | 5
> +- latrine | [] [] | 5
> +- ld | [] [] [] [] | 10
> +- leafpad | [] [] [] [] [] | 24
> +- libc | [] [] [] | 19
> +- libexif | [] | 5
> +- libextractor | [] | 5
> +- libgpewidget | [] [] [] | 20
> +- libgpg-error | [] | 6
> +- libgphoto2 | [] [] | 9
> +- libgphoto2_port | [] [] [] | 11
> +- libgsasl | [] | 8
> +- libiconv | [] [] | 11
> +- libidn | [] [] | 11
> +- lifelines | | 4
> +- lilypond | [] | 6
> +- lingoteach | [] | 6
> +- lprng | [] | 2
> +- lynx | [] [] [] | 15
> +- m4 | [] [] [] | 18
> +- mailfromd | [] [] | 3
> +- mailutils | [] [] | 8
> +- make | [] [] [] | 20
> +- man-db | [] | 9
> +- minicom | [] | 14
> +- nano | [] [] [] | 20
> +- opcodes | [] [] | 10
> +- parted | [] [] [] | 11
> +- pilot-qof | [] | 1
> +- popt | [] [] [] [] | 18
> +- psmisc | [] [] | 10
> +- pwdutils | [] | 3
> +- qof | [] | 4
> +- radius | [] [] | 7
> +- recode | [] [] [] | 25
> +- rpm | [] [] [] [] | 13
> +- screem | [] | 2
> +- scrollkeeper | [] [] [] [] | 26
> +- sed | [] [] [] [] | 23
> +- shared-mime-info | [] [] [] | 29
> +- sharutils | [] [] [] | 23
> +- shishi | [] | 3
> +- skencil | [] | 7
> +- solfege | [] | 3
> +- soundtracker | [] [] | 9
> +- sp | [] | 3
> +- system-tools-ba... | [] [] [] [] [] [] [] | 38
> +- tar | [] [] [] | 17
> +- texinfo | [] [] [] | 15
> +- tin | | 1
> +- tuxpaint | [] [] [] | 19
> ++ a2ps | [] [] [] [] [] | 27
> ++ aegis | [] | 9
> ++ ant-phone | [] [] [] [] | 9
> ++ anubis | [] [] [] [] | 15
> ++ aspell | [] [] [] | 20
> ++ bash | [] [] | 11
> ++ bfd | [] | 6
> ++ bibshelf | [] [] [] | 16
> ++ binutils | [] [] | 8
> ++ bison | [] [] | 12
> ++ bison-runtime | [] [] [] [] [] [] | 29
> ++ bluez-pin | [] [] [] [] [] [] [] [] | 37
> ++ bombono-dvd | [] | 4
> ++ buzztard | [] | 7
> ++ cflow | [] [] [] | 9
> ++ clisp | | 10
> ++ coreutils | [] [] [] [] | 22
> ++ cpio | [] [] [] [] [] [] | 13
> ++ cppi | [] [] | 5
> ++ cpplib | [] [] [] [] [] [] | 13
> ++ cryptsetup | [] [] | 7
> ++ dfarc | [] | 9
> ++ dialog | [] [] [] [] [] [] [] | 30
> ++ dico | [] | 2
> ++ diffutils | [] [] [] [] [] [] | 30
> ++ dink | | 4
> ++ doodle | [] [] | 7
> ++ e2fsprogs | [] [] [] | 11
> ++ enscript | [] [] [] [] | 17
> ++ exif | [] [] [] | 16
> ++ fetchmail | [] [] [] | 17
> ++ findutils | [] [] [] [] [] | 20
> ++ flex | [] [] [] [] | 15
> ++ freedink | [] | 10
> ++ gas | [] | 4
> ++ gawk | [] [] [] [] | 18
> ++ gcal | [] [] | 5
> ++ gcc | [] [] [] | 7
> ++ gettext-examples | [] [] [] [] [] [] [] | 34
> ++ gettext-runtime | [] [] [] [] [] [] [] | 30
> ++ gettext-tools | [] [] [] [] [] [] | 22
> ++ gip | [] [] [] [] | 22
> ++ gjay | [] | 3
> ++ gliv | [] [] [] | 14
> ++ glunarclock | [] [] [] [] [] | 19
> ++ gnubiff | [] [] | 4
> ++ gnucash | () [] () () | 9
> ++ gnuedu | [] [] | 7
> ++ gnulib | [] [] [] [] | 16
> ++ gnunet | [] | 1
> ++ gnunet-gtk | [] [] [] | 5
> ++ gnutls | [] [] [] | 10
> ++ gold | [] | 4
> ++ gpe-aerial | [] [] [] | 18
> ++ gpe-beam | [] [] [] | 19
> ++ gpe-bluetooth | [] [] [] | 13
> ++ gpe-calendar | [] [] [] [] | 12
> ++ gpe-clock | [] [] [] [] [] | 28
> ++ gpe-conf | [] [] [] [] | 20
> ++ gpe-contacts | [] [] [] | 17
> ++ gpe-edit | [] [] [] | 12
> ++ gpe-filemanager | [] [] [] [] | 16
> ++ gpe-go | [] [] [] [] [] | 25
> ++ gpe-login | [] [] [] | 11
> ++ gpe-ownerinfo | [] [] [] [] [] | 25
> ++ gpe-package | [] [] [] | 13
> ++ gpe-sketchbook | [] [] [] | 20
> ++ gpe-su | [] [] [] [] [] | 30
> ++ gpe-taskmanager | [] [] [] [] [] | 29
> ++ gpe-timesheet | [] [] [] [] [] | 25
> ++ gpe-today | [] [] [] [] [] [] | 30
> ++ gpe-todo | [] [] [] [] | 17
> ++ gphoto2 | [] [] [] [] [] | 24
> ++ gprof | [] [] [] | 15
> ++ gpsdrive | [] [] [] | 11
> ++ gramadoir | [] [] [] | 11
> ++ grep | [] [] [] | 10
> ++ grub | [] [] [] | 14
> ++ gsasl | [] [] [] [] | 14
> ++ gss | [] [] [] | 11
> ++ gst-plugins-bad | [] [] [] [] | 22
> ++ gst-plugins-base | [] [] [] [] [] | 24
> ++ gst-plugins-good | [] [] [] [] [] | 25
> ++ gst-plugins-ugly | [] [] [] [] [] | 29
> ++ gstreamer | [] [] [] [] | 22
> ++ gtick | [] [] [] | 13
> ++ gtkam | [] [] [] | 20
> ++ gtkorphan | [] [] [] | 14
> ++ gtkspell | [] [] [] [] [] [] [] [] [] | 45
> ++ gutenprint | [] | 10
> ++ hello | [] [] [] [] [] [] | 21
> ++ help2man | [] [] | 7
> ++ hylafax | [] | 5
> ++ idutils | [] [] [] [] | 17
> ++ indent | [] [] [] [] [] [] | 30
> ++ iso_15924 | () [] () [] [] | 16
> ++ iso_3166 | [] [] () [] [] () [] [] [] () | 53
> ++ iso_3166_2 | () [] () [] | 9
> ++ iso_4217 | [] () [] [] () [] [] | 26
> ++ iso_639 | [] [] [] () [] () [] [] [] [] | 38
> ++ iso_639_3 | [] () | 8
> ++ jwhois | [] [] [] [] [] | 16
> ++ kbd | [] [] [] [] [] | 15
> ++ keytouch | [] [] [] | 16
> ++ keytouch-editor | [] [] [] | 14
> ++ keytouch-keyboa... | [] [] [] | 14
> ++ klavaro | [] | 11
> ++ latrine | [] [] [] | 10
> ++ ld | [] [] [] [] | 11
> ++ leafpad | [] [] [] [] [] [] | 33
> ++ libc | [] [] [] [] [] | 21
> ++ libexif | [] () | 6
> ++ libextractor | [] | 1
> ++ libgnutls | [] [] [] | 9
> ++ libgpewidget | [] [] [] | 14
> ++ libgpg-error | [] [] [] | 9
> ++ libgphoto2 | [] [] | 8
> ++ libgphoto2_port | [] [] [] [] | 13
> ++ libgsasl | [] [] [] | 13
> ++ libiconv | [] [] [] [] | 21
> ++ libidn | () [] [] | 11
> ++ lifelines | [] | 4
> ++ liferea | [] [] [] | 21
> ++ lilypond | [] | 7
> ++ linkdr | [] [] [] [] [] | 17
> ++ lordsawar | | 1
> ++ lprng | [] | 3
> ++ lynx | [] [] [] [] | 17
> ++ m4 | [] [] [] [] | 19
> ++ mailfromd | [] [] | 3
> ++ mailutils | [] | 5
> ++ make | [] [] [] [] | 21
> ++ man-db | [] [] [] | 8
> ++ man-db-manpages | | 4
> ++ minicom | [] [] | 16
> ++ mkisofs | [] [] | 9
> ++ myserver | | 0
> ++ nano | [] [] [] [] | 21
> ++ opcodes | [] [] [] | 11
> ++ parted | [] [] [] [] [] | 15
> ++ pies | [] [] | 3
> ++ popt | [] [] [] [] [] [] | 27
> ++ psmisc | [] [] | 11
> ++ pspp | | 4
> ++ pwdutils | [] [] | 6
> ++ radius | [] [] | 9
> ++ recode | [] [] [] [] | 28
> ++ rosegarden | () | 0
> ++ rpm | [] [] [] | 11
> ++ rush | [] [] | 4
> ++ sarg | | 1
> ++ screem | [] | 3
> ++ scrollkeeper | [] [] [] [] [] | 27
> ++ sed | [] [] [] [] [] | 30
> ++ sharutils | [] [] [] [] [] | 22
> ++ shishi | [] | 3
> ++ skencil | [] [] | 7
> ++ solfege | [] [] [] [] | 16
> ++ solfege-manual | [] | 8
> ++ soundtracker | [] [] [] | 9
> ++ sp | [] | 3
> ++ sysstat | [] [] | 15
> ++ tar | [] [] [] [] [] [] | 23
> ++ texinfo | [] [] [] [] | 16
> ++ tin | | 4
> + unicode-han-tra... | | 0
> + unicode-transla... | | 2
> +- util-linux | [] [] [] | 20
> +- util-linux-ng | [] [] [] | 20
> +- vorbis-tools | [] [] | 4
> +- wastesedge | | 1
> +- wdiff | [] [] | 23
> +- wget | [] [] [] | 20
> +- xchat | [] [] [] [] | 29
> +- xkeyboard-config | [] [] [] | 14
> +- xpad | [] [] [] | 15
> ++ util-linux-ng | [] [] [] [] | 20
> ++ vice | () () | 1
> ++ vmm | [] | 4
> ++ vorbis-tools | [] | 6
> ++ wastesedge | | 2
> ++ wdiff | [] [] | 7
> ++ wget | [] [] [] [] [] | 26
> ++ wyslij-po | [] [] | 8
> ++ xchat | [] [] [] [] [] [] | 36
> ++ xdg-user-dirs | [] [] [] [] [] [] [] [] [] | 60
> ++ xkeyboard-config | [] [] [] [] | 25
> + +---------------------------------------------------+
> +- 76 teams tg th tk tr uk ven vi wa xh zh_CN zh_HK zh_TW zu
> +- 163 domains 0 3 1 74 51 0 143 21 1 57 7 45 0 2036
> ++ 84 teams sv sw ta te tg th tr uk vi wa zh_CN zh_HK zh_TW
> ++ 178 domains 119 1 3 2 0 10 66 50 155 17 97 7 41 2610
> +
> + Some counters in the preceding matrix are higher than the number of
> + visible blocks let us expect. This is because a few extra PO files are
> +@@ -1042,9 +1301,9 @@ distributed as such by its maintainer.
> + lag between the mere existence a PO file and its wide availability in a
> + distribution.
> +
> +- If November 2007 seems to be old, you may fetch a more recent copy
> +-of this `ABOUT-NLS' file on most GNU archive sites. The most
> +-up-to-date matrix with full percentage details can be found at
> ++ If May 2010 seems to be old, you may fetch a more recent copy of
> ++this `ABOUT-NLS' file on most GNU archive sites. The most up-to-date
> ++matrix with full percentage details can be found at
> + `http://translationproject.org/extra/matrix.html'.
> +
> + 1.6 Using `gettext' in new packages
> +diff -urp -x '*~' findutils-4.5.9.org/build-aux/config.rpath findutils-4.5.9/build-aux/config.rpath
> +--- findutils-4.5.9.org/build-aux/config.rpath 2010-04-17 12:33:46.000000000 -0700
> ++++ findutils-4.5.9/build-aux/config.rpath 2010-05-23 09:08:51.835153877 -0700
> +@@ -2,7 +2,7 @@
> + # Output a system dependent set of variables, describing how to set the
> + # run time search path of shared libraries in an executable.
> + #
> +-# Copyright 1996-2007 Free Software Foundation, Inc.
> ++# Copyright 1996-2010 Free Software Foundation, Inc.
> + # Taken from GNU libtool, 2001
> + # Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
> + #
> +@@ -47,7 +47,7 @@ for cc_temp in $CC""; do
> + done
> + cc_basename=`echo "$cc_temp" | sed -e 's%^.*/%%'`
> +
> +-# Code taken from libtool.m4's AC_LIBTOOL_PROG_COMPILER_PIC.
> ++# Code taken from libtool.m4's _LT_COMPILER_PIC.
> +
> + wl=
> + if test "$GCC" = yes; then
> +@@ -64,7 +64,7 @@ else
> + ;;
> + esac
> + ;;
> +- mingw* | cygwin* | pw32* | os2*)
> ++ mingw* | cygwin* | pw32* | os2* | cegcc*)
> + ;;
> + hpux9* | hpux10* | hpux11*)
> + wl='-Wl,'
> +@@ -76,7 +76,13 @@ else
> + ;;
> + linux* | k*bsd*-gnu)
> + case $cc_basename in
> +- icc* | ecc*)
> ++ ecc*)
> ++ wl='-Wl,'
> ++ ;;
> ++ icc* | ifort*)
> ++ wl='-Wl,'
> ++ ;;
> ++ lf95*)
> + wl='-Wl,'
> + ;;
> + pgcc | pgf77 | pgf90)
> +@@ -124,7 +130,7 @@ else
> + esac
> + fi
> +
> +-# Code taken from libtool.m4's AC_LIBTOOL_PROG_LD_SHLIBS.
> ++# Code taken from libtool.m4's _LT_LINKER_SHLIBS.
> +
> + hardcode_libdir_flag_spec=
> + hardcode_libdir_separator=
> +@@ -132,7 +138,7 @@ hardcode_direct=no
> + hardcode_minus_L=no
> +
> + case "$host_os" in
> +- cygwin* | mingw* | pw32*)
> ++ cygwin* | mingw* | pw32* | cegcc*)
> + # FIXME: the MSVC++ port hasn't been tested in a loooong time
> + # When not using gcc, we currently assume that we are using
> + # Microsoft Visual C++.
> +@@ -158,7 +164,7 @@ if test "$with_gnu_ld" = yes; then
> + # option of GNU ld is called -rpath, not --rpath.
> + hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
> + case "$host_os" in
> +- aix3* | aix4* | aix5*)
> ++ aix[3-9]*)
> + # On AIX/PPC, the GNU linker is very broken
> + if test "$host_cpu" != ia64; then
> + ld_shlibs=no
> +@@ -182,7 +188,7 @@ if test "$with_gnu_ld" = yes; then
> + ld_shlibs=no
> + fi
> + ;;
> +- cygwin* | mingw* | pw32*)
> ++ cygwin* | mingw* | pw32* | cegcc*)
> + # hardcode_libdir_flag_spec is actually meaningless, as there is
> + # no search path for DLLs.
> + hardcode_libdir_flag_spec='-L$libdir'
> +@@ -254,7 +260,7 @@ else
> + hardcode_direct=unsupported
> + fi
> + ;;
> +- aix4* | aix5*)
> ++ aix[4-9]*)
> + if test "$host_cpu" = ia64; then
> + # On IA64, the linker does run time linking by default, so we don't
> + # have to do anything special.
> +@@ -264,7 +270,7 @@ else
> + # Test if we are trying to use run time linking or normal
> + # AIX style linking. If -brtl is somewhere in LDFLAGS, we
> + # need to do runtime linking.
> +- case $host_os in aix4.[23]|aix4.[23].*|aix5*)
> ++ case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
> + for ld_flag in $LDFLAGS; do
> + if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
> + aix_use_runtimelinking=yes
> +@@ -326,7 +332,7 @@ else
> + ;;
> + bsdi[45]*)
> + ;;
> +- cygwin* | mingw* | pw32*)
> ++ cygwin* | mingw* | pw32* | cegcc*)
> + # When not using gcc, we currently assume that we are using
> + # Microsoft Visual C++.
> + # hardcode_libdir_flag_spec is actually meaningless, as there is
> +@@ -494,7 +500,7 @@ else
> + fi
> +
> + # Check dynamic linker characteristics
> +-# Code taken from libtool.m4's AC_LIBTOOL_SYS_DYNAMIC_LINKER.
> ++# Code taken from libtool.m4's _LT_SYS_DYNAMIC_LINKER.
> + # Unlike libtool.m4, here we don't care about _all_ names of the library, but
> + # only about the one the linker finds when passed -lNAME. This is the last
> + # element of library_names_spec in libtool.m4, or possibly two of them if the
> +@@ -505,7 +511,7 @@ case "$host_os" in
> + aix3*)
> + library_names_spec='$libname.a'
> + ;;
> +- aix4* | aix5*)
> ++ aix[4-9]*)
> + library_names_spec='$libname$shrext'
> + ;;
> + amigaos*)
> +@@ -517,7 +523,7 @@ case "$host_os" in
> + bsdi[45]*)
> + library_names_spec='$libname$shrext'
> + ;;
> +- cygwin* | mingw* | pw32*)
> ++ cygwin* | mingw* | pw32* | cegcc*)
> + shrext=.dll
> + library_names_spec='$libname.dll.a $libname.lib'
> + ;;
> +diff -urp -x '*~' findutils-4.5.9.org/ChangeLog findutils-4.5.9/ChangeLog
> +--- findutils-4.5.9.org/ChangeLog 2010-04-29 14:45:22.000000000 -0700
> ++++ findutils-4.5.9/ChangeLog 2010-05-23 09:08:52.645152214 -0700
> +@@ -1,3 +1,15 @@
> ++2010-05-23 gettextize <bug-gnu-gettext@gnu.org>
> ++
> ++ * gnulib/m4/gettext.m4: Upgrade to gettext-0.18.
> ++ * gnulib/m4/iconv.m4: Upgrade to gettext-0.18.
> ++ * gnulib/m4/lib-ld.m4: Upgrade to gettext-0.18.
> ++ * gnulib/m4/lib-link.m4: Upgrade to gettext-0.18.
> ++ * gnulib/m4/lib-prefix.m4: Upgrade to gettext-0.18.
> ++ * gnulib/m4/nls.m4: Upgrade to gettext-0.18.
> ++ * gnulib/m4/po.m4: Upgrade to gettext-0.18.
> ++ * gnulib/m4/progtest.m4: Upgrade to gettext-0.18.
> ++ * configure.ac (AM_GNU_GETTEXT_VERSION): Bump to 0.18.
> ++
> + 2010-04-29 James Youngman <jay@gnu.org>
> +
> + Prepare for the release of findutils version 4.5.9.
> +diff -urp -x '*~' findutils-4.5.9.org/configure.ac findutils-4.5.9/configure.ac
> +--- findutils-4.5.9.org/configure.ac 2010-04-29 14:19:30.000000000 -0700
> ++++ findutils-4.5.9/configure.ac 2010-05-23 09:08:52.635147870 -0700
> +@@ -200,7 +200,7 @@ jy_AC_ATTRIBUTE_NORETURN
> +
> + dnl internationalization macros
> + AM_GNU_GETTEXT([external])
> +-AM_GNU_GETTEXT_VERSION([0.17])
> ++AM_GNU_GETTEXT_VERSION([0.18])
> +
> + dnl regextype.c and regexprops.c are designed to be usable outside findutils,
> + dnl but findutils doesn't want to support all the regex types in gnulib,
> +diff -urp -x '*~' findutils-4.5.9.org/gnulib/m4/gettext.m4 findutils-4.5.9/gnulib/m4/gettext.m4
> +--- findutils-4.5.9.org/gnulib/m4/gettext.m4 2010-04-17 12:33:46.000000000 -0700
> ++++ findutils-4.5.9/gnulib/m4/gettext.m4 2010-05-23 09:08:52.475161618 -0700
> +@@ -1,5 +1,5 @@
> +-# gettext.m4 serial 60 (gettext-0.17)
> +-dnl Copyright (C) 1995-2007 Free Software Foundation, Inc.
> ++# gettext.m4 serial 63 (gettext-0.18)
> ++dnl Copyright (C) 1995-2010 Free Software Foundation, Inc.
> + dnl This file is free software; the Free Software Foundation
> + dnl gives unlimited permission to copy and/or distribute it,
> + dnl with or without modifications, as long as this notice is preserved.
> +@@ -15,7 +15,7 @@ dnl They are *not* in the public domain.
> +
> + dnl Authors:
> + dnl Ulrich Drepper <drepper@cygnus.com>, 1995-2000.
> +-dnl Bruno Haible <haible@clisp.cons.org>, 2000-2006.
> ++dnl Bruno Haible <haible@clisp.cons.org>, 2000-2006, 2008-2010.
> +
> + dnl Macro to add for using GNU gettext.
> +
> +@@ -60,6 +60,8 @@ AC_DEFUN([AM_GNU_GETTEXT],
> + ifelse([$1], [], , [ifelse([$1], [external], , [ifelse([$1], [no-libtool], , [ifelse([$1], [use-libtool], ,
> + [errprint([ERROR: invalid first argument to AM_GNU_GETTEXT
> + ])])])])])
> ++ ifelse(ifelse([$1], [], [old])[]ifelse([$1], [no-libtool], [old]), [old],
> ++ [AC_DIAGNOSE([obsolete], [Use of AM_GNU_GETTEXT without [external] argument is deprecated.])])
> + ifelse([$2], [], , [ifelse([$2], [need-ngettext], , [ifelse([$2], [need-formatstring-macros], ,
> + [errprint([ERROR: invalid second argument to AM_GNU_GETTEXT
> + ])])])])
> +@@ -123,11 +125,11 @@ AC_DEFUN([AM_GNU_GETTEXT],
> + gt_use_preinstalled_gnugettext=no
> + ifelse(gt_included_intl, yes, [
> + AC_MSG_CHECKING([whether included gettext is requested])
> +- AC_ARG_WITH(included-gettext,
> ++ AC_ARG_WITH([included-gettext],
> + [ --with-included-gettext use the GNU gettext library included here],
> + nls_cv_force_use_gnu_gettext=$withval,
> + nls_cv_force_use_gnu_gettext=no)
> +- AC_MSG_RESULT($nls_cv_force_use_gnu_gettext)
> ++ AC_MSG_RESULT([$nls_cv_force_use_gnu_gettext])
> +
> + nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext"
> + if test "$nls_cv_force_use_gnu_gettext" != "yes"; then
> +@@ -267,7 +269,7 @@ return * gettext ("")$gt_expression_test
> +
> + if test "$gt_use_preinstalled_gnugettext" = "yes" \
> + || test "$nls_cv_use_gnu_gettext" = "yes"; then
> +- AC_DEFINE(ENABLE_NLS, 1,
> ++ AC_DEFINE([ENABLE_NLS], [1],
> + [Define to 1 if translation of program messages to the user's native language
> + is requested.])
> + else
> +@@ -301,9 +303,9 @@ return * gettext ("")$gt_expression_test
> + fi
> +
> + dnl For backward compatibility. Some packages may be using this.
> +- AC_DEFINE(HAVE_GETTEXT, 1,
> ++ AC_DEFINE([HAVE_GETTEXT], [1],
> + [Define if the GNU gettext() function is already present or preinstalled.])
> +- AC_DEFINE(HAVE_DCGETTEXT, 1,
> ++ AC_DEFINE([HAVE_DCGETTEXT], [1],
> + [Define if the GNU dcgettext() function is already present or preinstalled.])
> + fi
> +
> +@@ -319,9 +321,9 @@ return * gettext ("")$gt_expression_test
> + fi
> +
> + dnl Make all variables we use known to autoconf.
> +- AC_SUBST(BUILD_INCLUDED_LIBINTL)
> +- AC_SUBST(USE_INCLUDED_LIBINTL)
> +- AC_SUBST(CATOBJEXT)
> ++ AC_SUBST([BUILD_INCLUDED_LIBINTL])
> ++ AC_SUBST([USE_INCLUDED_LIBINTL])
> ++ AC_SUBST([CATOBJEXT])
> +
> + dnl For backward compatibility. Some configure.ins may be using this.
> + nls_cv_header_intl=
> +@@ -329,36 +331,36 @@ return * gettext ("")$gt_expression_test
> +
> + dnl For backward compatibility. Some Makefiles may be using this.
> + DATADIRNAME=share
> +- AC_SUBST(DATADIRNAME)
> ++ AC_SUBST([DATADIRNAME])
> +
> + dnl For backward compatibility. Some Makefiles may be using this.
> + INSTOBJEXT=.mo
> +- AC_SUBST(INSTOBJEXT)
> ++ AC_SUBST([INSTOBJEXT])
> +
> + dnl For backward compatibility. Some Makefiles may be using this.
> + GENCAT=gencat
> +- AC_SUBST(GENCAT)
> ++ AC_SUBST([GENCAT])
> +
> + dnl For backward compatibility. Some Makefiles may be using this.
> + INTLOBJS=
> + if test "$USE_INCLUDED_LIBINTL" = yes; then
> + INTLOBJS="\$(GETTOBJS)"
> + fi
> +- AC_SUBST(INTLOBJS)
> ++ AC_SUBST([INTLOBJS])
> +
> + dnl Enable libtool support if the surrounding package wishes it.
> + INTL_LIBTOOL_SUFFIX_PREFIX=gt_libtool_suffix_prefix
> +- AC_SUBST(INTL_LIBTOOL_SUFFIX_PREFIX)
> ++ AC_SUBST([INTL_LIBTOOL_SUFFIX_PREFIX])
> + ])
> +
> + dnl For backward compatibility. Some Makefiles may be using this.
> + INTLLIBS="$LIBINTL"
> +- AC_SUBST(INTLLIBS)
> ++ AC_SUBST([INTLLIBS])
> +
> + dnl Make all documented variables known to autoconf.
> +- AC_SUBST(LIBINTL)
> +- AC_SUBST(LTLIBINTL)
> +- AC_SUBST(POSUB)
> ++ AC_SUBST([LIBINTL])
> ++ AC_SUBST([LTLIBINTL])
> ++ AC_SUBST([POSUB])
> + ])
> +
> +
> +diff -urp -x '*~' findutils-4.5.9.org/gnulib/m4/iconv.m4 findutils-4.5.9/gnulib/m4/iconv.m4
> +--- findutils-4.5.9.org/gnulib/m4/iconv.m4 2010-04-17 12:33:46.000000000 -0700
> ++++ findutils-4.5.9/gnulib/m4/iconv.m4 2010-05-23 09:08:52.485168547 -0700
> +@@ -1,5 +1,5 @@
> +-# iconv.m4 serial AM6 (gettext-0.17)
> +-dnl Copyright (C) 2000-2002, 2007 Free Software Foundation, Inc.
> ++# iconv.m4 serial 9 (gettext-0.18)
> ++dnl Copyright (C) 2000-2002, 2007-2010 Free Software Foundation, Inc.
> + dnl This file is free software; the Free Software Foundation
> + dnl gives unlimited permission to copy and/or distribute it,
> + dnl with or without modifications, as long as this notice is preserved.
> +@@ -34,7 +34,7 @@ AC_DEFUN([AM_ICONV_LINK],
> + am_save_CPPFLAGS="$CPPFLAGS"
> + AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCICONV])
> +
> +- AC_CACHE_CHECK([for iconv], am_cv_func_iconv, [
> ++ AC_CACHE_CHECK([for iconv], [am_cv_func_iconv], [
> + am_cv_func_iconv="no, consider installing GNU libiconv"
> + am_cv_lib_iconv=no
> + AC_TRY_LINK([#include <stdlib.h>
> +@@ -42,7 +42,7 @@ AC_DEFUN([AM_ICONV_LINK],
> + [iconv_t cd = iconv_open("","");
> + iconv(cd,NULL,NULL,NULL,NULL);
> + iconv_close(cd);],
> +- am_cv_func_iconv=yes)
> ++ [am_cv_func_iconv=yes])
> + if test "$am_cv_func_iconv" != yes; then
> + am_save_LIBS="$LIBS"
> + LIBS="$LIBS $LIBICONV"
> +@@ -51,14 +51,14 @@ AC_DEFUN([AM_ICONV_LINK],
> + [iconv_t cd = iconv_open("","");
> + iconv(cd,NULL,NULL,NULL,NULL);
> + iconv_close(cd);],
> +- am_cv_lib_iconv=yes
> +- am_cv_func_iconv=yes)
> ++ [am_cv_lib_iconv=yes]
> ++ [am_cv_func_iconv=yes])
> + LIBS="$am_save_LIBS"
> + fi
> + ])
> + if test "$am_cv_func_iconv" = yes; then
> +- AC_CACHE_CHECK([for working iconv], am_cv_func_iconv_works, [
> +- dnl This tests against bugs in AIX 5.1 and HP-UX 11.11.
> ++ AC_CACHE_CHECK([for working iconv], [am_cv_func_iconv_works], [
> ++ dnl This tests against bugs in AIX 5.1, HP-UX 11.11, Solaris 10.
> + am_save_LIBS="$LIBS"
> + if test $am_cv_lib_iconv = yes; then
> + LIBS="$LIBS $LIBICONV"
> +@@ -87,6 +87,25 @@ int main ()
> + return 1;
> + }
> + }
> ++ /* Test against Solaris 10 bug: Failures are not distinguishable from
> ++ successful returns. */
> ++ {
> ++ iconv_t cd_ascii_to_88591 = iconv_open ("ISO8859-1", "646");
> ++ if (cd_ascii_to_88591 != (iconv_t)(-1))
> ++ {
> ++ static const char input[] = "\263";
> ++ char buf[10];
> ++ const char *inptr = input;
> ++ size_t inbytesleft = strlen (input);
> ++ char *outptr = buf;
> ++ size_t outbytesleft = sizeof (buf);
> ++ size_t res = iconv (cd_ascii_to_88591,
> ++ (char **) &inptr, &inbytesleft,
> ++ &outptr, &outbytesleft);
> ++ if (res == 0)
> ++ return 1;
> ++ }
> ++ }
> + #if 0 /* This bug could be worked around by the caller. */
> + /* Test against HP-UX 11.11 bug: Positive return value instead of 0. */
> + {
> +@@ -134,7 +153,7 @@ int main ()
> + am_func_iconv=no am_cv_lib_iconv=no
> + fi
> + if test "$am_func_iconv" = yes; then
> +- AC_DEFINE(HAVE_ICONV, 1,
> ++ AC_DEFINE([HAVE_ICONV], [1],
> + [Define if you have the iconv() function and it works.])
> + fi
> + if test "$am_cv_lib_iconv" = yes; then
> +@@ -147,8 +166,8 @@ int main ()
> + LIBICONV=
> + LTLIBICONV=
> + fi
> +- AC_SUBST(LIBICONV)
> +- AC_SUBST(LTLIBICONV)
> ++ AC_SUBST([LIBICONV])
> ++ AC_SUBST([LTLIBICONV])
> + ])
> +
> + AC_DEFUN([AM_ICONV],
> +@@ -156,7 +175,7 @@ AC_DEFUN([AM_ICONV],
> + AM_ICONV_LINK
> + if test "$am_cv_func_iconv" = yes; then
> + AC_MSG_CHECKING([for iconv declaration])
> +- AC_CACHE_VAL(am_cv_proto_iconv, [
> ++ AC_CACHE_VAL([am_cv_proto_iconv], [
> + AC_TRY_COMPILE([
> + #include <stdlib.h>
> + #include <iconv.h>
> +@@ -169,12 +188,12 @@ size_t iconv (iconv_t cd, char * *inbuf,
> + #else
> + size_t iconv();
> + #endif
> +-], [], am_cv_proto_iconv_arg1="", am_cv_proto_iconv_arg1="const")
> ++], [], [am_cv_proto_iconv_arg1=""], [am_cv_proto_iconv_arg1="const"])
> + am_cv_proto_iconv="extern size_t iconv (iconv_t cd, $am_cv_proto_iconv_arg1 char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);"])
> + am_cv_proto_iconv=`echo "[$]am_cv_proto_iconv" | tr -s ' ' | sed -e 's/( /(/'`
> +- AC_MSG_RESULT([$]{ac_t:-
> +- }[$]am_cv_proto_iconv)
> +- AC_DEFINE_UNQUOTED(ICONV_CONST, $am_cv_proto_iconv_arg1,
> ++ AC_MSG_RESULT([
> ++ $am_cv_proto_iconv])
> ++ AC_DEFINE_UNQUOTED([ICONV_CONST], [$am_cv_proto_iconv_arg1],
> + [Define as const if the declaration of iconv() needs const.])
> + fi
> + ])
> +diff -urp -x '*~' findutils-4.5.9.org/gnulib/m4/lib-ld.m4 findutils-4.5.9/gnulib/m4/lib-ld.m4
> +--- findutils-4.5.9.org/gnulib/m4/lib-ld.m4 2010-04-17 12:33:47.000000000 -0700
> ++++ findutils-4.5.9/gnulib/m4/lib-ld.m4 2010-05-23 09:08:52.505155095 -0700
> +@@ -1,5 +1,5 @@
> +-# lib-ld.m4 serial 3 (gettext-0.13)
> +-dnl Copyright (C) 1996-2003 Free Software Foundation, Inc.
> ++# lib-ld.m4 serial 4 (gettext-0.18)
> ++dnl Copyright (C) 1996-2003, 2009-2010 Free Software Foundation, Inc.
> + dnl This file is free software; the Free Software Foundation
> + dnl gives unlimited permission to copy and/or distribute it,
> + dnl with or without modifications, as long as this notice is preserved.
> +@@ -10,7 +10,7 @@ dnl with libtool.m4.
> +
> + dnl From libtool-1.4. Sets the variable with_gnu_ld to yes or no.
> + AC_DEFUN([AC_LIB_PROG_LD_GNU],
> +-[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], acl_cv_prog_gnu_ld,
> ++[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], [acl_cv_prog_gnu_ld],
> + [# I'd rather use --version here, but apparently some GNU ld's only accept -v.
> + case `$LD -v 2>&1 </dev/null` in
> + *GNU* | *'with BFD'*)
> +@@ -23,7 +23,7 @@ with_gnu_ld=$acl_cv_prog_gnu_ld
> +
> + dnl From libtool-1.4. Sets the variable LD.
> + AC_DEFUN([AC_LIB_PROG_LD],
> +-[AC_ARG_WITH(gnu-ld,
> ++[AC_ARG_WITH([gnu-ld],
> + [ --with-gnu-ld assume the C compiler uses GNU ld [default=no]],
> + test "$withval" = no || with_gnu_ld=yes, with_gnu_ld=no)
> + AC_REQUIRE([AC_PROG_CC])dnl
> +@@ -59,7 +59,7 @@ if test "$GCC" = yes; then
> + # Canonicalize the path of ld
> + ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'`
> + while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
> +- ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`
> ++ ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`
> + done
> + test -z "$LD" && LD="$ac_prog"
> + ;;
> +@@ -77,7 +77,7 @@ elif test "$with_gnu_ld" = yes; then
> + else
> + AC_MSG_CHECKING([for non-GNU ld])
> + fi
> +-AC_CACHE_VAL(acl_cv_path_LD,
> ++AC_CACHE_VAL([acl_cv_path_LD],
> + [if test -z "$LD"; then
> + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
> + for ac_dir in $PATH; do
> +@@ -89,9 +89,9 @@ AC_CACHE_VAL(acl_cv_path_LD,
> + # Break only if it was the GNU/non-GNU ld that we prefer.
> + case `"$acl_cv_path_LD" -v 2>&1 < /dev/null` in
> + *GNU* | *'with BFD'*)
> +- test "$with_gnu_ld" != no && break ;;
> ++ test "$with_gnu_ld" != no && break ;;
> + *)
> +- test "$with_gnu_ld" != yes && break ;;
> ++ test "$with_gnu_ld" != yes && break ;;
> + esac
> + fi
> + done
> +@@ -101,9 +101,9 @@ else
> + fi])
> + LD="$acl_cv_path_LD"
> + if test -n "$LD"; then
> +- AC_MSG_RESULT($LD)
> ++ AC_MSG_RESULT([$LD])
> + else
> +- AC_MSG_RESULT(no)
> ++ AC_MSG_RESULT([no])
> + fi
> + test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
> + AC_LIB_PROG_LD_GNU
> +diff -urp -x '*~' findutils-4.5.9.org/gnulib/m4/lib-link.m4 findutils-4.5.9/gnulib/m4/lib-link.m4
> +--- findutils-4.5.9.org/gnulib/m4/lib-link.m4 2010-04-17 12:33:47.000000000 -0700
> ++++ findutils-4.5.9/gnulib/m4/lib-link.m4 2010-05-23 09:08:52.525149605 -0700
> +@@ -1,12 +1,12 @@
> +-# lib-link.m4 serial 13 (gettext-0.17)
> +-dnl Copyright (C) 2001-2007 Free Software Foundation, Inc.
> ++# lib-link.m4 serial 21 (gettext-0.18)
> ++dnl Copyright (C) 2001-2010 Free Software Foundation, Inc.
> + dnl This file is free software; the Free Software Foundation
> + dnl gives unlimited permission to copy and/or distribute it,
> + dnl with or without modifications, as long as this notice is preserved.
> +
> + dnl From Bruno Haible.
> +
> +-AC_PREREQ(2.54)
> ++AC_PREREQ([2.54])
> +
> + dnl AC_LIB_LINKFLAGS(name [, dependencies]) searches for libname and
> + dnl the libraries corresponding to explicit and implicit dependencies.
> +@@ -18,9 +18,9 @@ AC_DEFUN([AC_LIB_LINKFLAGS],
> + [
> + AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
> + AC_REQUIRE([AC_LIB_RPATH])
> +- define([Name],[translit([$1],[./-], [___])])
> +- define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
> +- [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
> ++ pushdef([Name],[translit([$1],[./-], [___])])
> ++ pushdef([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
> ++ [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
> + AC_CACHE_CHECK([how to link with lib[]$1], [ac_cv_lib[]Name[]_libs], [
> + AC_LIB_LINKFLAGS_BODY([$1], [$2])
> + ac_cv_lib[]Name[]_libs="$LIB[]NAME"
> +@@ -39,16 +39,17 @@ AC_DEFUN([AC_LIB_LINKFLAGS],
> + dnl Also set HAVE_LIB[]NAME so that AC_LIB_HAVE_LINKFLAGS can reuse the
> + dnl results of this search when this library appears as a dependency.
> + HAVE_LIB[]NAME=yes
> +- undefine([Name])
> +- undefine([NAME])
> ++ popdef([NAME])
> ++ popdef([Name])
> + ])
> +
> +-dnl AC_LIB_HAVE_LINKFLAGS(name, dependencies, includes, testcode)
> ++dnl AC_LIB_HAVE_LINKFLAGS(name, dependencies, includes, testcode, [missing-message])
> + dnl searches for libname and the libraries corresponding to explicit and
> + dnl implicit dependencies, together with the specified include files and
> +-dnl the ability to compile and link the specified testcode. If found, it
> +-dnl sets and AC_SUBSTs HAVE_LIB${NAME}=yes and the LIB${NAME} and
> +-dnl LTLIB${NAME} variables and augments the CPPFLAGS variable, and
> ++dnl the ability to compile and link the specified testcode. The missing-message
> ++dnl defaults to 'no' and may contain additional hints for the user.
> ++dnl If found, it sets and AC_SUBSTs HAVE_LIB${NAME}=yes and the LIB${NAME}
> ++dnl and LTLIB${NAME} variables and augments the CPPFLAGS variable, and
> + dnl #defines HAVE_LIB${NAME} to 1. Otherwise, it sets and AC_SUBSTs
> + dnl HAVE_LIB${NAME}=no and LIB${NAME} and LTLIB${NAME} to empty.
> + dnl Sets and AC_SUBSTs the LIB${NAME}_PREFIX variable to nonempty if libname
> +@@ -57,9 +58,9 @@ AC_DEFUN([AC_LIB_HAVE_LINKFLAGS],
> + [
> + AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
> + AC_REQUIRE([AC_LIB_RPATH])
> +- define([Name],[translit([$1],[./-], [___])])
> +- define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
> +- [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
> ++ pushdef([Name],[translit([$1],[./-], [___])])
> ++ pushdef([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
> ++ [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
> +
> + dnl Search for lib[]Name and define LIB[]NAME, LTLIB[]NAME and INC[]NAME
> + dnl accordingly.
> +@@ -73,13 +74,25 @@ AC_DEFUN([AC_LIB_HAVE_LINKFLAGS],
> +
> + AC_CACHE_CHECK([for lib[]$1], [ac_cv_lib[]Name], [
> + ac_save_LIBS="$LIBS"
> +- LIBS="$LIBS $LIB[]NAME"
> +- AC_TRY_LINK([$3], [$4], [ac_cv_lib[]Name=yes], [ac_cv_lib[]Name=no])
> ++ dnl If $LIB[]NAME contains some -l options, add it to the end of LIBS,
> ++ dnl because these -l options might require -L options that are present in
> ++ dnl LIBS. -l options benefit only from the -L options listed before it.
> ++ dnl Otherwise, add it to the front of LIBS, because it may be a static
> ++ dnl library that depends on another static library that is present in LIBS.
> ++ dnl Static libraries benefit only from the static libraries listed after
> ++ dnl it.
> ++ case " $LIB[]NAME" in
> ++ *" -l"*) LIBS="$LIBS $LIB[]NAME" ;;
> ++ *) LIBS="$LIB[]NAME $LIBS" ;;
> ++ esac
> ++ AC_TRY_LINK([$3], [$4],
> ++ [ac_cv_lib[]Name=yes],
> ++ [ac_cv_lib[]Name='m4_if([$5], [], [no], [[$5]])'])
> + LIBS="$ac_save_LIBS"
> + ])
> + if test "$ac_cv_lib[]Name" = yes; then
> + HAVE_LIB[]NAME=yes
> +- AC_DEFINE([HAVE_LIB]NAME, 1, [Define if you have the $1 library.])
> ++ AC_DEFINE([HAVE_LIB]NAME, 1, [Define if you have the lib][$1 library.])
> + AC_MSG_CHECKING([how to link with lib[]$1])
> + AC_MSG_RESULT([$LIB[]NAME])
> + else
> +@@ -95,8 +108,8 @@ AC_DEFUN([AC_LIB_HAVE_LINKFLAGS],
> + AC_SUBST([LIB]NAME)
> + AC_SUBST([LTLIB]NAME)
> + AC_SUBST([LIB]NAME[_PREFIX])
> +- undefine([Name])
> +- undefine([NAME])
> ++ popdef([NAME])
> ++ popdef([Name])
> + ])
> +
> + dnl Determine the platform dependent parameters needed to use rpath:
> +@@ -114,7 +127,7 @@ AC_DEFUN([AC_LIB_RPATH],
> + AC_REQUIRE([AC_LIB_PROG_LD]) dnl we use $LD, $with_gnu_ld
> + AC_REQUIRE([AC_CANONICAL_HOST]) dnl we use $host
> + AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT]) dnl we use $ac_aux_dir
> +- AC_CACHE_CHECK([for shared library run path origin], acl_cv_rpath, [
> ++ AC_CACHE_CHECK([for shared library run path origin], [acl_cv_rpath], [
> + CC="$CC" GCC="$GCC" LDFLAGS="$LDFLAGS" LD="$LD" with_gnu_ld="$with_gnu_ld" \
> + ${CONFIG_SHELL-/bin/sh} "$ac_aux_dir/config.rpath" "$host" > conftest.sh
> + . ./conftest.sh
> +@@ -131,11 +144,32 @@ AC_DEFUN([AC_LIB_RPATH],
> + acl_hardcode_direct="$acl_cv_hardcode_direct"
> + acl_hardcode_minus_L="$acl_cv_hardcode_minus_L"
> + dnl Determine whether the user wants rpath handling at all.
> +- AC_ARG_ENABLE(rpath,
> ++ AC_ARG_ENABLE([rpath],
> + [ --disable-rpath do not hardcode runtime library paths],
> + :, enable_rpath=yes)
> + ])
> +
> ++dnl AC_LIB_FROMPACKAGE(name, package)
> ++dnl declares that libname comes from the given package. The configure file
> ++dnl will then not have a --with-libname-prefix option but a
> ++dnl --with-package-prefix option. Several libraries can come from the same
> ++dnl package. This declaration must occur before an AC_LIB_LINKFLAGS or similar
> ++dnl macro call that searches for libname.
> ++AC_DEFUN([AC_LIB_FROMPACKAGE],
> ++[
> ++ pushdef([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
> ++ [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
> ++ define([acl_frompackage_]NAME, [$2])
> ++ popdef([NAME])
> ++ pushdef([PACK],[$2])
> ++ pushdef([PACKUP],[translit(PACK,[abcdefghijklmnopqrstuvwxyz./-],
> ++ [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
> ++ define([acl_libsinpackage_]PACKUP,
> ++ m4_ifdef([acl_libsinpackage_]PACKUP, [acl_libsinpackage_]PACKUP[[, ]],)[lib$1])
> ++ popdef([PACKUP])
> ++ popdef([PACK])
> ++])
> ++
> + dnl AC_LIB_LINKFLAGS_BODY(name [, dependencies]) searches for libname and
> + dnl the libraries corresponding to explicit and implicit dependencies.
> + dnl Sets the LIB${NAME}, LTLIB${NAME} and INC${NAME} variables.
> +@@ -144,19 +178,23 @@ dnl in ${LIB${NAME}_PREFIX}/$acl_libdirs
> + AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
> + [
> + AC_REQUIRE([AC_LIB_PREPARE_MULTILIB])
> +- define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
> +- [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
> ++ pushdef([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
> ++ [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
> ++ pushdef([PACK],[m4_ifdef([acl_frompackage_]NAME, [acl_frompackage_]NAME, lib[$1])])
> ++ pushdef([PACKUP],[translit(PACK,[abcdefghijklmnopqrstuvwxyz./-],
> ++ [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
> ++ pushdef([PACKLIBS],[m4_ifdef([acl_frompackage_]NAME, [acl_libsinpackage_]PACKUP, lib[$1])])
> + dnl Autoconf >= 2.61 supports dots in --with options.
> +- define([N_A_M_E],[m4_if(m4_version_compare(m4_defn([m4_PACKAGE_VERSION]),[2.61]),[-1],[translit([$1],[.],[_])],[$1])])
> ++ pushdef([P_A_C_K],[m4_if(m4_version_compare(m4_defn([m4_PACKAGE_VERSION]),[2.61]),[-1],[translit(PACK,[.],[_])],PACK)])
> + dnl By default, look in $includedir and $libdir.
> + use_additional=yes
> + AC_LIB_WITH_FINAL_PREFIX([
> + eval additional_includedir=\"$includedir\"
> + eval additional_libdir=\"$libdir\"
> + ])
> +- AC_LIB_ARG_WITH([lib]N_A_M_E[-prefix],
> +-[ --with-lib]N_A_M_E[-prefix[=DIR] search for lib$1 in DIR/include and DIR/lib
> +- --without-lib]N_A_M_E[-prefix don't search for lib$1 in includedir and libdir],
> ++ AC_ARG_WITH(P_A_C_K[-prefix],
> ++[[ --with-]]P_A_C_K[[-prefix[=DIR] search for ]PACKLIBS[ in DIR/include and DIR/lib
> ++ --without-]]P_A_C_K[[-prefix don't search for ]PACKLIBS[ in includedir and libdir]],
> + [
> + if test "X$withval" = "Xno"; then
> + use_additional=no
> +@@ -169,6 +207,10 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
> + else
> + additional_includedir="$withval/include"
> + additional_libdir="$withval/$acl_libdirstem"
> ++ if test "$acl_libdirstem2" != "$acl_libdirstem" \
> ++ && ! test -d "$withval/$acl_libdirstem"; then
> ++ additional_libdir="$withval/$acl_libdirstem2"
> ++ fi
> + fi
> + fi
> + ])
> +@@ -178,6 +220,9 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
> + LTLIB[]NAME=
> + INC[]NAME=
> + LIB[]NAME[]_PREFIX=
> ++ dnl HAVE_LIB${NAME} is an indicator that LIB${NAME}, LTLIB${NAME} have been
> ++ dnl computed. So it has to be reset here.
> ++ HAVE_LIB[]NAME=
> + rpathdirs=
> + ltrpathdirs=
> + names_already_handled=
> +@@ -267,6 +312,9 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
> + fi
> + fi
> + fi
> ++ dnl Just let the compiler find the library, the compiler and user are smarter then this script
> ++ dnl when cross compiling and working with a relocated install.
> ++ found_dir=""
> + if test "X$found_dir" = "X"; then
> + for x in $LDFLAGS $LTLIB[]NAME; do
> + AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
> +@@ -327,7 +375,9 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
> + dnl Linking with a shared library. We attempt to hardcode its
> + dnl directory into the executable's runpath, unless it's the
> + dnl standard /usr/lib.
> +- if test "$enable_rpath" = no || test "X$found_dir" = "X/usr/$acl_libdirstem"; then
> ++ if test "$enable_rpath" = no \
> ++ || test "X$found_dir" = "X/usr/$acl_libdirstem" \
> ++ || test "X$found_dir" = "X/usr/$acl_libdirstem2"; then
> + dnl No hardcoding is needed.
> + LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
> + else
> +@@ -415,7 +465,16 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
> + case "$found_dir" in
> + */$acl_libdirstem | */$acl_libdirstem/)
> + basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem/"'*$,,'`
> +- LIB[]NAME[]_PREFIX="$basedir"
> ++ if test "$name" = '$1'; then
> ++ LIB[]NAME[]_PREFIX="$basedir"
> ++ fi
> ++ additional_includedir="$basedir/include"
> ++ ;;
> ++ */$acl_libdirstem2 | */$acl_libdirstem2/)
> ++ basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem2/"'*$,,'`
> ++ if test "$name" = '$1'; then
> ++ LIB[]NAME[]_PREFIX="$basedir"
> ++ fi
> + additional_includedir="$basedir/include"
> + ;;
> + esac
> +@@ -476,9 +535,11 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
> + dnl 3. if it's already present in $LDFLAGS or the already
> + dnl constructed $LIBNAME,
> + dnl 4. if it doesn't exist as a directory.
> +- if test "X$additional_libdir" != "X/usr/$acl_libdirstem"; then
> ++ if test "X$additional_libdir" != "X/usr/$acl_libdirstem" \
> ++ && test "X$additional_libdir" != "X/usr/$acl_libdirstem2"; then
> + haveit=
> +- if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem"; then
> ++ if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem" \
> ++ || test "X$additional_libdir" = "X/usr/local/$acl_libdirstem2"; then
> + if test -n "$GCC"; then
> + case $host_os in
> + linux* | gnu* | k*bsd*-gnu) haveit=yes;;
> +@@ -609,6 +670,11 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
> + LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-R$found_dir"
> + done
> + fi
> ++ popdef([P_A_C_K])
> ++ popdef([PACKLIBS])
> ++ popdef([PACKUP])
> ++ popdef([PACK])
> ++ popdef([NAME])
> + ])
> +
> + dnl AC_LIB_APPENDTOVAR(VAR, CONTENTS) appends the elements of CONTENTS to VAR,
> +@@ -654,7 +720,8 @@ AC_DEFUN([AC_LIB_LINKFLAGS_FROM_LIBS],
> + if test -n "$next"; then
> + dir="$next"
> + dnl No need to hardcode the standard /usr/lib.
> +- if test "X$dir" != "X/usr/$acl_libdirstem"; then
> ++ if test "X$dir" != "X/usr/$acl_libdirstem" \
> ++ && test "X$dir" != "X/usr/$acl_libdirstem2"; then
> + rpathdirs="$rpathdirs $dir"
> + fi
> + next=
> +@@ -663,7 +730,8 @@ AC_DEFUN([AC_LIB_LINKFLAGS_FROM_LIBS],
> + -L) next=yes ;;
> + -L*) dir=`echo "X$opt" | sed -e 's,^X-L,,'`
> + dnl No need to hardcode the standard /usr/lib.
> +- if test "X$dir" != "X/usr/$acl_libdirstem"; then
> ++ if test "X$dir" != "X/usr/$acl_libdirstem" \
> ++ && test "X$dir" != "X/usr/$acl_libdirstem2"; then
> + rpathdirs="$rpathdirs $dir"
> + fi
> + next= ;;
> +diff -urp -x '*~' findutils-4.5.9.org/gnulib/m4/lib-prefix.m4 findutils-4.5.9/gnulib/m4/lib-prefix.m4
> +--- findutils-4.5.9.org/gnulib/m4/lib-prefix.m4 2010-04-17 12:33:47.000000000 -0700
> ++++ findutils-4.5.9/gnulib/m4/lib-prefix.m4 2010-05-23 09:08:52.535152831 -0700
> +@@ -1,5 +1,5 @@
> +-# lib-prefix.m4 serial 5 (gettext-0.15)
> +-dnl Copyright (C) 2001-2005 Free Software Foundation, Inc.
> ++# lib-prefix.m4 serial 7 (gettext-0.18)
> ++dnl Copyright (C) 2001-2005, 2008-2010 Free Software Foundation, Inc.
> + dnl This file is free software; the Free Software Foundation
> + dnl gives unlimited permission to copy and/or distribute it,
> + dnl with or without modifications, as long as this notice is preserved.
> +@@ -153,33 +153,72 @@ AC_DEFUN([AC_LIB_WITH_FINAL_PREFIX],
> + prefix="$acl_save_prefix"
> + ])
> +
> +-dnl AC_LIB_PREPARE_MULTILIB creates a variable acl_libdirstem, containing
> +-dnl the basename of the libdir, either "lib" or "lib64".
> ++dnl AC_LIB_PREPARE_MULTILIB creates
> ++dnl - a variable acl_libdirstem, containing the basename of the libdir, either
> ++dnl "lib" or "lib64" or "lib/64",
> ++dnl - a variable acl_libdirstem2, as a secondary possible value for
> ++dnl acl_libdirstem, either the same as acl_libdirstem or "lib/sparcv9" or
> ++dnl "lib/amd64".
> + AC_DEFUN([AC_LIB_PREPARE_MULTILIB],
> + [
> +- dnl There is no formal standard regarding lib and lib64. The current
> +- dnl practice is that on a system supporting 32-bit and 64-bit instruction
> +- dnl sets or ABIs, 64-bit libraries go under $prefix/lib64 and 32-bit
> +- dnl libraries go under $prefix/lib. We determine the compiler's default
> +- dnl mode by looking at the compiler's library search path. If at least
> +- dnl of its elements ends in /lib64 or points to a directory whose absolute
> +- dnl pathname ends in /lib64, we assume a 64-bit ABI. Otherwise we use the
> +- dnl default, namely "lib".
> ++ dnl There is no formal standard regarding lib and lib64.
> ++ dnl On glibc systems, the current practice is that on a system supporting
> ++ dnl 32-bit and 64-bit instruction sets or ABIs, 64-bit libraries go under
> ++ dnl $prefix/lib64 and 32-bit libraries go under $prefix/lib. We determine
> ++ dnl the compiler's default mode by looking at the compiler's library search
> ++ dnl path. If at least one of its elements ends in /lib64 or points to a
> ++ dnl directory whose absolute pathname ends in /lib64, we assume a 64-bit ABI.
> ++ dnl Otherwise we use the default, namely "lib".
> ++ dnl On Solaris systems, the current practice is that on a system supporting
> ++ dnl 32-bit and 64-bit instruction sets or ABIs, 64-bit libraries go under
> ++ dnl $prefix/lib/64 (which is a symlink to either $prefix/lib/sparcv9 or
> ++ dnl $prefix/lib/amd64) and 32-bit libraries go under $prefix/lib.
> ++ AC_REQUIRE([AC_CANONICAL_HOST])
> + acl_libdirstem=lib
> +- searchpath=`(LC_ALL=C $CC -print-search-dirs) 2>/dev/null | sed -n -e 's,^libraries: ,,p' | sed -e 's,^=,,'`
> +- if test -n "$searchpath"; then
> +- acl_save_IFS="${IFS= }"; IFS=":"
> +- for searchdir in $searchpath; do
> +- if test -d "$searchdir"; then
> +- case "$searchdir" in
> +- */lib64/ | */lib64 ) acl_libdirstem=lib64 ;;
> +- *) searchdir=`cd "$searchdir" && pwd`
> +- case "$searchdir" in
> +- */lib64 ) acl_libdirstem=lib64 ;;
> +- esac ;;
> ++ acl_libdirstem2=
> ++ case "$host_os" in
> ++ solaris*)
> ++ dnl See Solaris 10 Software Developer Collection > Solaris 64-bit Developer's Guide > The Development Environment
> ++ dnl <http://docs.sun.com/app/docs/doc/816-5138/dev-env?l=en&a=view>.
> ++ dnl "Portable Makefiles should refer to any library directories using the 64 symbolic link."
> ++ dnl But we want to recognize the sparcv9 or amd64 subdirectory also if the
> ++ dnl symlink is missing, so we set acl_libdirstem2 too.
> ++ AC_CACHE_CHECK([for 64-bit host], [gl_cv_solaris_64bit],
> ++ [AC_EGREP_CPP([sixtyfour bits], [
> ++#ifdef _LP64
> ++sixtyfour bits
> ++#endif
> ++ ], [gl_cv_solaris_64bit=yes], [gl_cv_solaris_64bit=no])
> ++ ])
> ++ if test $gl_cv_solaris_64bit = yes; then
> ++ acl_libdirstem=lib/64
> ++ case "$host_cpu" in
> ++ sparc*) acl_libdirstem2=lib/sparcv9 ;;
> ++ i*86 | x86_64) acl_libdirstem2=lib/amd64 ;;
> + esac
> + fi
> +- done
> +- IFS="$acl_save_IFS"
> +- fi
> ++ ;;
> ++ *)
> ++ searchpath=`(LC_ALL=C $CC -print-search-dirs) 2>/dev/null | sed -n -e 's,^libraries: ,,p' | sed -e 's,^=,,'`
> ++ if test -n "$searchpath"; then
> ++ acl_save_IFS="${IFS= }"; IFS=":"
> ++ for searchdir in $searchpath; do
> ++ if test -d "$searchdir"; then
> ++ case "$searchdir" in
> ++ */lib64/ | */lib64 ) acl_libdirstem=lib64 ;;
> ++ */../ | */.. )
> ++ # Better ignore directories of this form. They are misleading.
> ++ ;;
> ++ *) searchdir=`cd "$searchdir" && pwd`
> ++ case "$searchdir" in
> ++ */lib64 ) acl_libdirstem=lib64 ;;
> ++ esac ;;
> ++ esac
> ++ fi
> ++ done
> ++ IFS="$acl_save_IFS"
> ++ fi
> ++ ;;
> ++ esac
> ++ test -n "$acl_libdirstem2" || acl_libdirstem2="$acl_libdirstem"
> + ])
> +diff -urp -x '*~' findutils-4.5.9.org/gnulib/m4/nls.m4 findutils-4.5.9/gnulib/m4/nls.m4
> +--- findutils-4.5.9.org/gnulib/m4/nls.m4 2010-04-17 12:33:47.000000000 -0700
> ++++ findutils-4.5.9/gnulib/m4/nls.m4 2010-05-23 09:08:52.555148389 -0700
> +@@ -1,5 +1,6 @@
> +-# nls.m4 serial 3 (gettext-0.15)
> +-dnl Copyright (C) 1995-2003, 2005-2006 Free Software Foundation, Inc.
> ++# nls.m4 serial 5 (gettext-0.18)
> ++dnl Copyright (C) 1995-2003, 2005-2006, 2008-2010 Free Software Foundation,
> ++dnl Inc.
> + dnl This file is free software; the Free Software Foundation
> + dnl gives unlimited permission to copy and/or distribute it,
> + dnl with or without modifications, as long as this notice is preserved.
> +@@ -17,15 +18,15 @@ dnl Authors:
> + dnl Ulrich Drepper <drepper@cygnus.com>, 1995-2000.
> + dnl Bruno Haible <haible@clisp.cons.org>, 2000-2003.
> +
> +-AC_PREREQ(2.50)
> ++AC_PREREQ([2.50])
> +
> + AC_DEFUN([AM_NLS],
> + [
> + AC_MSG_CHECKING([whether NLS is requested])
> + dnl Default is enabled NLS
> +- AC_ARG_ENABLE(nls,
> ++ AC_ARG_ENABLE([nls],
> + [ --disable-nls do not use Native Language Support],
> + USE_NLS=$enableval, USE_NLS=yes)
> +- AC_MSG_RESULT($USE_NLS)
> +- AC_SUBST(USE_NLS)
> ++ AC_MSG_RESULT([$USE_NLS])
> ++ AC_SUBST([USE_NLS])
> + ])
> +diff -urp -x '*~' findutils-4.5.9.org/gnulib/m4/po.m4 findutils-4.5.9/gnulib/m4/po.m4
> +--- findutils-4.5.9.org/gnulib/m4/po.m4 2010-04-17 12:33:47.000000000 -0700
> ++++ findutils-4.5.9/gnulib/m4/po.m4 2010-05-23 09:08:52.585147521 -0700
> +@@ -1,5 +1,5 @@
> +-# po.m4 serial 15 (gettext-0.17)
> +-dnl Copyright (C) 1995-2007 Free Software Foundation, Inc.
> ++# po.m4 serial 17 (gettext-0.18)
> ++dnl Copyright (C) 1995-2010 Free Software Foundation, Inc.
> + dnl This file is free software; the Free Software Foundation
> + dnl gives unlimited permission to copy and/or distribute it,
> + dnl with or without modifications, as long as this notice is preserved.
> +@@ -17,7 +17,7 @@ dnl Authors:
> + dnl Ulrich Drepper <drepper@cygnus.com>, 1995-2000.
> + dnl Bruno Haible <haible@clisp.cons.org>, 2000-2003.
> +
> +-AC_PREREQ(2.50)
> ++AC_PREREQ([2.50])
> +
> + dnl Checks for all prerequisites of the po subdirectory.
> + AC_DEFUN([AM_PO_SUBDIRS],
> +@@ -29,7 +29,7 @@ AC_DEFUN([AM_PO_SUBDIRS],
> +
> + dnl Release version of the gettext macros. This is used to ensure that
> + dnl the gettext macros and po/Makefile.in.in are in sync.
> +- AC_SUBST([GETTEXT_MACRO_VERSION], [0.17])
> ++ AC_SUBST([GETTEXT_MACRO_VERSION], [0.18])
> +
> + dnl Perform the following tests also if --disable-nls has been given,
> + dnl because they are needed for "make dist" to work.
> +@@ -41,7 +41,7 @@ AC_DEFUN([AM_PO_SUBDIRS],
> + [$ac_dir/$ac_word --statistics /dev/null >&]AS_MESSAGE_LOG_FD[ 2>&1 &&
> + (if $ac_dir/$ac_word --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi)],
> + :)
> +- AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
> ++ AC_PATH_PROG([GMSGFMT], [gmsgfmt], [$MSGFMT])
> +
> + dnl Test whether it is GNU msgfmt >= 0.15.
> + changequote(,)dnl
> +diff -urp -x '*~' findutils-4.5.9.org/gnulib/m4/progtest.m4 findutils-4.5.9/gnulib/m4/progtest.m4
> +--- findutils-4.5.9.org/gnulib/m4/progtest.m4 2010-04-17 12:33:47.000000000 -0700
> ++++ findutils-4.5.9/gnulib/m4/progtest.m4 2010-05-23 09:08:52.595148583 -0700
> +@@ -1,5 +1,5 @@
> +-# progtest.m4 serial 4 (gettext-0.14.2)
> +-dnl Copyright (C) 1996-2003, 2005 Free Software Foundation, Inc.
> ++# progtest.m4 serial 6 (gettext-0.18)
> ++dnl Copyright (C) 1996-2003, 2005, 2008-2010 Free Software Foundation, Inc.
> + dnl This file is free software; the Free Software Foundation
> + dnl gives unlimited permission to copy and/or distribute it,
> + dnl with or without modifications, as long as this notice is preserved.
> +@@ -16,7 +16,7 @@ dnl They are *not* in the public domain.
> + dnl Authors:
> + dnl Ulrich Drepper <drepper@cygnus.com>, 1996.
> +
> +-AC_PREREQ(2.50)
> ++AC_PREREQ([2.50])
> +
> + # Search path for a program which passes the given test.
> +
> +@@ -55,7 +55,7 @@ rm -f conf$$.file
> + # Extract the first word of "$2", so it can be a program name with args.
> + set dummy $2; ac_word=[$]2
> + AC_MSG_CHECKING([for $ac_word])
> +-AC_CACHE_VAL(ac_cv_path_$1,
> ++AC_CACHE_VAL([ac_cv_path_$1],
> + [case "[$]$1" in
> + [[\\/]]* | ?:[[\\/]]*)
> + ac_cv_path_$1="[$]$1" # Let the user override the test with a path.
> +@@ -84,9 +84,9 @@ ifelse([$4], , , [ test -z "[$]ac_cv_pa
> + esac])dnl
> + $1="$ac_cv_path_$1"
> + if test ifelse([$4], , [-n "[$]$1"], ["[$]$1" != "$4"]); then
> +- AC_MSG_RESULT([$]$1)
> ++ AC_MSG_RESULT([$][$1])
> + else
> +- AC_MSG_RESULT(no)
> ++ AC_MSG_RESULT([no])
> + fi
> +-AC_SUBST($1)dnl
> ++AC_SUBST([$1])dnl
> + ])
> +Only in findutils-4.5.9/po: ChangeLog
> +diff -urp -x '*~' findutils-4.5.9.org/po/Makefile.in.in findutils-4.5.9/po/Makefile.in.in
> +--- findutils-4.5.9.org/po/Makefile.in.in 2010-04-29 14:26:12.000000000 -0700
> ++++ findutils-4.5.9/po/Makefile.in.in 2010-05-23 09:08:51.885149549 -0700
> +@@ -1,5 +1,5 @@
> + # Makefile for PO directory in any package using GNU gettext.
> +-# Copyright (C) 1995-1997, 2000-2007 by Ulrich Drepper <drepper@gnu.ai.mit.edu>
> ++# Copyright (C) 1995-1997, 2000-2007, 2009-2010 by Ulrich Drepper <drepper@gnu.ai.mit.edu>
> + #
> + # This file can be copied and used freely without restrictions. It can
> + # be used in projects which are not available under the GNU General Public
> +@@ -8,8 +8,8 @@
> + # Please note that the actual code of GNU gettext is covered by the GNU
> + # General Public License and is *not* in the public domain.
> + #
> +-# Origin: gettext-0.17
> +-GETTEXT_MACRO_VERSION = 0.17
> ++# Origin: gettext-0.18
> ++GETTEXT_MACRO_VERSION = 0.18
> +
> + PACKAGE = @PACKAGE@
> + VERSION = @VERSION@
> +@@ -88,8 +88,8 @@ CATALOGS = @CATALOGS@
> + .po.gmo:
> + @lang=`echo $* | sed -e 's,.*/,,'`; \
> + test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \
> +- echo "$${cdcmd}rm -f $${lang}.gmo && $(GMSGFMT) -c --statistics -o $${lang}.gmo $${lang}.po"; \
> +- cd $(srcdir) && rm -f $${lang}.gmo && $(GMSGFMT) -c --statistics -o t-$${lang}.gmo $${lang}.po && mv t-$${lang}.gmo $${lang}.gmo
> ++ echo "$${cdcmd}rm -f $${lang}.gmo && $(GMSGFMT) -c --statistics --verbose -o $${lang}.gmo $${lang}.po"; \
> ++ cd $(srcdir) && rm -f $${lang}.gmo && $(GMSGFMT) -c --statistics --verbose -o t-$${lang}.gmo $${lang}.po && mv t-$${lang}.gmo $${lang}.gmo
> +
> + .sin.sed:
> + sed -e '/^#/d' $< > t-$@
> +@@ -193,8 +193,15 @@ $(POFILES): $(srcdir)/$(DOMAIN).pot
> + @lang=`echo $@ | sed -e 's,.*/,,' -e 's/\.po$$//'`; \
> + if test -f "$(srcdir)/$${lang}.po"; then \
> + test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \
> +- echo "$${cdcmd}$(MSGMERGE_UPDATE) $${lang}.po $(DOMAIN).pot"; \
> +- cd $(srcdir) && $(MSGMERGE_UPDATE) $${lang}.po $(DOMAIN).pot; \
> ++ echo "$${cdcmd}$(MSGMERGE_UPDATE) $(MSGMERGE_OPTIONS) --lang=$${lang} $${lang}.po $(DOMAIN).pot"; \
> ++ cd $(srcdir) \
> ++ && { case `$(MSGMERGE_UPDATE) --version | sed 1q | sed -e 's,^[^0-9]*,,'` in \
> ++ '' | 0.[0-9] | 0.[0-9].* | 0.1[0-7] | 0.1[0-7].*) \
> ++ $(MSGMERGE_UPDATE) $(MSGMERGE_OPTIONS) $${lang}.po $(DOMAIN).pot;; \
> ++ *) \
> ++ $(MSGMERGE_UPDATE) $(MSGMERGE_OPTIONS) --lang=$${lang} $${lang}.po $(DOMAIN).pot;; \
> ++ esac; \
> ++ }; \
> + else \
> + $(MAKE) $${lang}.po-create; \
> + fi
> +@@ -217,7 +224,6 @@ install-data: install-data-@USE_NLS@
> + fi
> + install-data-no: all
> + install-data-yes: all
> +- $(mkdir_p) $(DESTDIR)$(datadir)
> + @catalogs='$(CATALOGS)'; \
> + for cat in $$catalogs; do \
> + cat=`basename $$cat`; \
> +@@ -269,7 +275,6 @@ installdirs-data: installdirs-data-@USE_
> + fi
> + installdirs-data-no:
> + installdirs-data-yes:
> +- $(mkdir_p) $(DESTDIR)$(datadir)
> + @catalogs='$(CATALOGS)'; \
> + for cat in $$catalogs; do \
> + cat=`basename $$cat`; \
> +@@ -395,9 +400,15 @@ update-po: Makefile
> + tmpdir=`pwd`; \
> + echo "$$lang:"; \
> + test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \
> +- echo "$${cdcmd}$(MSGMERGE) $$lang.po $(DOMAIN).pot -o $$lang.new.po"; \
> ++ echo "$${cdcmd}$(MSGMERGE) $(MSGMERGE_OPTIONS) --lang=$$lang $$lang.po $(DOMAIN).pot -o $$lang.new.po"; \
> + cd $(srcdir); \
> +- if $(MSGMERGE) $$lang.po $(DOMAIN).pot -o $$tmpdir/$$lang.new.po; then \
> ++ if { case `$(MSGMERGE) --version | sed 1q | sed -e 's,^[^0-9]*,,'` in \
> ++ '' | 0.[0-9] | 0.[0-9].* | 0.1[0-7] | 0.1[0-7].*) \
> ++ $(MSGMERGE) $(MSGMERGE_OPTIONS) -o $$tmpdir/$$lang.new.po $$lang.po $(DOMAIN).pot;; \
> ++ *) \
> ++ $(MSGMERGE) $(MSGMERGE_OPTIONS) --lang=$$lang -o $$tmpdir/$$lang.new.po $$lang.po $(DOMAIN).pot;; \
> ++ esac; \
> ++ }; then \
> + if cmp $$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \
> + rm -f $$tmpdir/$$lang.new.po; \
> + else \
> +@@ -418,9 +429,13 @@ $(DUMMYPOFILES):
> + update-gmo: Makefile $(GMOFILES)
> + @:
> +
> ++# Recreate Makefile by invoking config.status. Explicitly invoke the shell,
> ++# because execution permission bits may not work on the current file system.
> ++# Use @SHELL@, which is the shell determined by autoconf for the use by its
> ++# scripts, not $(SHELL) which is hardwired to /bin/sh and may be deficient.
> + Makefile: Makefile.in.in Makevars $(top_builddir)/config.status @POMAKEFILEDEPS@
> + cd $(top_builddir) \
> +- && $(SHELL) ./config.status $(subdir)/$@.in po-directories
> ++ && @SHELL@ ./config.status $(subdir)/$@.in po-directories
> +
> + force:
> +
> +Only in findutils-4.5.9/po: Makevars.template
> +diff -urp -x '*~' findutils-4.5.9.org/po/Rules-quot findutils-4.5.9/po/Rules-quot
> +--- findutils-4.5.9.org/po/Rules-quot 2009-07-11 13:19:27.000000000 -0700
> ++++ findutils-4.5.9/po/Rules-quot 2010-05-23 09:08:52.035152971 -0700
> +@@ -20,7 +20,7 @@ en@boldquot.po-update: en@boldquot.po-up
> + ll=`echo $$lang | sed -e 's/@.*//'`; \
> + LC_ALL=C; export LC_ALL; \
> + cd $(srcdir); \
> +- if $(MSGINIT) -i $(DOMAIN).pot --no-translator -l $$ll -o - 2>/dev/null | sed -f $$tmpdir/$$lang.insert-header | $(MSGCONV) -t UTF-8 | $(MSGFILTER) sed -f `echo $$lang | sed -e 's/.*@//'`.sed 2>/dev/null > $$tmpdir/$$lang.new.po; then \
> ++ if $(MSGINIT) -i $(DOMAIN).pot --no-translator -l $$lang -o - 2>/dev/null | sed -f $$tmpdir/$$lang.insert-header | $(MSGCONV) -t UTF-8 | $(MSGFILTER) sed -f `echo $$lang | sed -e 's/.*@//'`.sed 2>/dev/null > $$tmpdir/$$lang.new.po; then \
> + if cmp $$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \
> + rm -f $$tmpdir/$$lang.new.po; \
> + else \
> diff --git a/recipes/findutils/findutils_4.5.9.bb b/recipes/findutils/findutils_4.5.9.bb
> new file mode 100644
> index 0000000..aa4fc38
> --- /dev/null
> +++ b/recipes/findutils/findutils_4.5.9.bb
> @@ -0,0 +1,12 @@
> +require findutils.inc
> +
> +PR = "${INC_PR}.0"
> +
> +# newer version is not available on GNU_MIRROR from .inc file, and old 4.2.29 is not available on alpha.gnu.org
> +SRC_URI = "ftp://alpha.gnu.org/gnu/${BPN}/${BPN}-${PV}.tar.gz \
> + file://gettext-0.18-update.patch \
> + "
> +
> +SRC_URI[md5sum] = "f0276639a824f57e78916d3c207ee618"
> +SRC_URI[sha256sum] = "ee7fad47a8ee62f335f8415e48d3836052b2d00c4df568cac808e25cd42653cc"
> +
> --
> 1.7.0.4
>
>
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
>
^ permalink raw reply [flat|nested] 45+ messages in thread
* Re: [PATCH 12/16] gstreamer_0.10.28.bb: Fix to build with gettext 0.18
2010-06-02 20:34 ` [PATCH 12/16] gstreamer_0.10.28.bb: Fix to build with gettext 0.18 Khem Raj
@ 2010-06-04 7:41 ` Martin Jansa
0 siblings, 0 replies; 45+ messages in thread
From: Martin Jansa @ 2010-06-04 7:41 UTC (permalink / raw)
To: openembedded-devel
On Wed, Jun 2, 2010 at 10:34 PM, Khem Raj <raj.khem@gmail.com> wrote:
> Signed-off-by: Khem Raj <raj.khem@gmail.com>
Acked-by: Martin Jansa <Martin.Jansa@gmail.com>
> ---
> recipes/gstreamer/gstreamer/use-gettext-0.18.patch | 1012 ++++++++++++++++++++
> recipes/gstreamer/gstreamer_0.10.28.bb | 5 +
> 2 files changed, 1017 insertions(+), 0 deletions(-)
> create mode 100644 recipes/gstreamer/gstreamer/use-gettext-0.18.patch
>
> diff --git a/recipes/gstreamer/gstreamer/use-gettext-0.18.patch b/recipes/gstreamer/gstreamer/use-gettext-0.18.patch
> new file mode 100644
> index 0000000..504caa8
> --- /dev/null
> +++ b/recipes/gstreamer/gstreamer/use-gettext-0.18.patch
> @@ -0,0 +1,1012 @@
> +This patch it needed to get gstreamer upgraded to use gettext 0.18
> +
> +-Khem
> +
> +diff -Nurp -x '*.o' -x '*.gmo' -x '*.po' -x '*~' gstreamer-0.10.28.org/common/m4/gettext.m4 gstreamer-0.10.28/common/m4/gettext.m4
> +--- gstreamer-0.10.28.org/common/m4/gettext.m4 2010-03-08 08:58:16.000000000 -0800
> ++++ gstreamer-0.10.28/common/m4/gettext.m4 2010-05-22 08:37:17.713880839 -0700
> +@@ -1,5 +1,5 @@
> +-# gettext.m4 serial 60 (gettext-0.17)
> +-dnl Copyright (C) 1995-2007 Free Software Foundation, Inc.
> ++# gettext.m4 serial 63 (gettext-0.18)
> ++dnl Copyright (C) 1995-2010 Free Software Foundation, Inc.
> + dnl This file is free software; the Free Software Foundation
> + dnl gives unlimited permission to copy and/or distribute it,
> + dnl with or without modifications, as long as this notice is preserved.
> +@@ -15,7 +15,7 @@ dnl They are *not* in the public domain.
> +
> + dnl Authors:
> + dnl Ulrich Drepper <drepper@cygnus.com>, 1995-2000.
> +-dnl Bruno Haible <haible@clisp.cons.org>, 2000-2006.
> ++dnl Bruno Haible <haible@clisp.cons.org>, 2000-2006, 2008-2010.
> +
> + dnl Macro to add for using GNU gettext.
> +
> +@@ -60,6 +60,8 @@ AC_DEFUN([AM_GNU_GETTEXT],
> + ifelse([$1], [], , [ifelse([$1], [external], , [ifelse([$1], [no-libtool], , [ifelse([$1], [use-libtool], ,
> + [errprint([ERROR: invalid first argument to AM_GNU_GETTEXT
> + ])])])])])
> ++ ifelse(ifelse([$1], [], [old])[]ifelse([$1], [no-libtool], [old]), [old],
> ++ [AC_DIAGNOSE([obsolete], [Use of AM_GNU_GETTEXT without [external] argument is deprecated.])])
> + ifelse([$2], [], , [ifelse([$2], [need-ngettext], , [ifelse([$2], [need-formatstring-macros], ,
> + [errprint([ERROR: invalid second argument to AM_GNU_GETTEXT
> + ])])])])
> +@@ -123,11 +125,11 @@ AC_DEFUN([AM_GNU_GETTEXT],
> + gt_use_preinstalled_gnugettext=no
> + ifelse(gt_included_intl, yes, [
> + AC_MSG_CHECKING([whether included gettext is requested])
> +- AC_ARG_WITH(included-gettext,
> ++ AC_ARG_WITH([included-gettext],
> + [ --with-included-gettext use the GNU gettext library included here],
> + nls_cv_force_use_gnu_gettext=$withval,
> + nls_cv_force_use_gnu_gettext=no)
> +- AC_MSG_RESULT($nls_cv_force_use_gnu_gettext)
> ++ AC_MSG_RESULT([$nls_cv_force_use_gnu_gettext])
> +
> + nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext"
> + if test "$nls_cv_force_use_gnu_gettext" != "yes"; then
> +@@ -267,7 +269,7 @@ return * gettext ("")$gt_expression_test
> +
> + if test "$gt_use_preinstalled_gnugettext" = "yes" \
> + || test "$nls_cv_use_gnu_gettext" = "yes"; then
> +- AC_DEFINE(ENABLE_NLS, 1,
> ++ AC_DEFINE([ENABLE_NLS], [1],
> + [Define to 1 if translation of program messages to the user's native language
> + is requested.])
> + else
> +@@ -301,9 +303,9 @@ return * gettext ("")$gt_expression_test
> + fi
> +
> + dnl For backward compatibility. Some packages may be using this.
> +- AC_DEFINE(HAVE_GETTEXT, 1,
> ++ AC_DEFINE([HAVE_GETTEXT], [1],
> + [Define if the GNU gettext() function is already present or preinstalled.])
> +- AC_DEFINE(HAVE_DCGETTEXT, 1,
> ++ AC_DEFINE([HAVE_DCGETTEXT], [1],
> + [Define if the GNU dcgettext() function is already present or preinstalled.])
> + fi
> +
> +@@ -319,9 +321,9 @@ return * gettext ("")$gt_expression_test
> + fi
> +
> + dnl Make all variables we use known to autoconf.
> +- AC_SUBST(BUILD_INCLUDED_LIBINTL)
> +- AC_SUBST(USE_INCLUDED_LIBINTL)
> +- AC_SUBST(CATOBJEXT)
> ++ AC_SUBST([BUILD_INCLUDED_LIBINTL])
> ++ AC_SUBST([USE_INCLUDED_LIBINTL])
> ++ AC_SUBST([CATOBJEXT])
> +
> + dnl For backward compatibility. Some configure.ins may be using this.
> + nls_cv_header_intl=
> +@@ -329,36 +331,36 @@ return * gettext ("")$gt_expression_test
> +
> + dnl For backward compatibility. Some Makefiles may be using this.
> + DATADIRNAME=share
> +- AC_SUBST(DATADIRNAME)
> ++ AC_SUBST([DATADIRNAME])
> +
> + dnl For backward compatibility. Some Makefiles may be using this.
> + INSTOBJEXT=.mo
> +- AC_SUBST(INSTOBJEXT)
> ++ AC_SUBST([INSTOBJEXT])
> +
> + dnl For backward compatibility. Some Makefiles may be using this.
> + GENCAT=gencat
> +- AC_SUBST(GENCAT)
> ++ AC_SUBST([GENCAT])
> +
> + dnl For backward compatibility. Some Makefiles may be using this.
> + INTLOBJS=
> + if test "$USE_INCLUDED_LIBINTL" = yes; then
> + INTLOBJS="\$(GETTOBJS)"
> + fi
> +- AC_SUBST(INTLOBJS)
> ++ AC_SUBST([INTLOBJS])
> +
> + dnl Enable libtool support if the surrounding package wishes it.
> + INTL_LIBTOOL_SUFFIX_PREFIX=gt_libtool_suffix_prefix
> +- AC_SUBST(INTL_LIBTOOL_SUFFIX_PREFIX)
> ++ AC_SUBST([INTL_LIBTOOL_SUFFIX_PREFIX])
> + ])
> +
> + dnl For backward compatibility. Some Makefiles may be using this.
> + INTLLIBS="$LIBINTL"
> +- AC_SUBST(INTLLIBS)
> ++ AC_SUBST([INTLLIBS])
> +
> + dnl Make all documented variables known to autoconf.
> +- AC_SUBST(LIBINTL)
> +- AC_SUBST(LTLIBINTL)
> +- AC_SUBST(POSUB)
> ++ AC_SUBST([LIBINTL])
> ++ AC_SUBST([LTLIBINTL])
> ++ AC_SUBST([POSUB])
> + ])
> +
> +
> +diff -Nurp -x '*.o' -x '*.gmo' -x '*.po' -x '*~' gstreamer-0.10.28.org/common/m4/iconv.m4 gstreamer-0.10.28/common/m4/iconv.m4
> +--- gstreamer-0.10.28.org/common/m4/iconv.m4 2010-03-08 08:58:16.000000000 -0800
> ++++ gstreamer-0.10.28/common/m4/iconv.m4 2010-05-22 08:37:17.733798944 -0700
> +@@ -1,5 +1,5 @@
> +-# iconv.m4 serial AM6 (gettext-0.17)
> +-dnl Copyright (C) 2000-2002, 2007 Free Software Foundation, Inc.
> ++# iconv.m4 serial 9 (gettext-0.18)
> ++dnl Copyright (C) 2000-2002, 2007-2010 Free Software Foundation, Inc.
> + dnl This file is free software; the Free Software Foundation
> + dnl gives unlimited permission to copy and/or distribute it,
> + dnl with or without modifications, as long as this notice is preserved.
> +@@ -34,7 +34,7 @@ AC_DEFUN([AM_ICONV_LINK],
> + am_save_CPPFLAGS="$CPPFLAGS"
> + AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCICONV])
> +
> +- AC_CACHE_CHECK([for iconv], am_cv_func_iconv, [
> ++ AC_CACHE_CHECK([for iconv], [am_cv_func_iconv], [
> + am_cv_func_iconv="no, consider installing GNU libiconv"
> + am_cv_lib_iconv=no
> + AC_TRY_LINK([#include <stdlib.h>
> +@@ -42,7 +42,7 @@ AC_DEFUN([AM_ICONV_LINK],
> + [iconv_t cd = iconv_open("","");
> + iconv(cd,NULL,NULL,NULL,NULL);
> + iconv_close(cd);],
> +- am_cv_func_iconv=yes)
> ++ [am_cv_func_iconv=yes])
> + if test "$am_cv_func_iconv" != yes; then
> + am_save_LIBS="$LIBS"
> + LIBS="$LIBS $LIBICONV"
> +@@ -51,14 +51,14 @@ AC_DEFUN([AM_ICONV_LINK],
> + [iconv_t cd = iconv_open("","");
> + iconv(cd,NULL,NULL,NULL,NULL);
> + iconv_close(cd);],
> +- am_cv_lib_iconv=yes
> +- am_cv_func_iconv=yes)
> ++ [am_cv_lib_iconv=yes]
> ++ [am_cv_func_iconv=yes])
> + LIBS="$am_save_LIBS"
> + fi
> + ])
> + if test "$am_cv_func_iconv" = yes; then
> +- AC_CACHE_CHECK([for working iconv], am_cv_func_iconv_works, [
> +- dnl This tests against bugs in AIX 5.1 and HP-UX 11.11.
> ++ AC_CACHE_CHECK([for working iconv], [am_cv_func_iconv_works], [
> ++ dnl This tests against bugs in AIX 5.1, HP-UX 11.11, Solaris 10.
> + am_save_LIBS="$LIBS"
> + if test $am_cv_lib_iconv = yes; then
> + LIBS="$LIBS $LIBICONV"
> +@@ -87,6 +87,25 @@ int main ()
> + return 1;
> + }
> + }
> ++ /* Test against Solaris 10 bug: Failures are not distinguishable from
> ++ successful returns. */
> ++ {
> ++ iconv_t cd_ascii_to_88591 = iconv_open ("ISO8859-1", "646");
> ++ if (cd_ascii_to_88591 != (iconv_t)(-1))
> ++ {
> ++ static const char input[] = "\263";
> ++ char buf[10];
> ++ const char *inptr = input;
> ++ size_t inbytesleft = strlen (input);
> ++ char *outptr = buf;
> ++ size_t outbytesleft = sizeof (buf);
> ++ size_t res = iconv (cd_ascii_to_88591,
> ++ (char **) &inptr, &inbytesleft,
> ++ &outptr, &outbytesleft);
> ++ if (res == 0)
> ++ return 1;
> ++ }
> ++ }
> + #if 0 /* This bug could be worked around by the caller. */
> + /* Test against HP-UX 11.11 bug: Positive return value instead of 0. */
> + {
> +@@ -134,7 +153,7 @@ int main ()
> + am_func_iconv=no am_cv_lib_iconv=no
> + fi
> + if test "$am_func_iconv" = yes; then
> +- AC_DEFINE(HAVE_ICONV, 1,
> ++ AC_DEFINE([HAVE_ICONV], [1],
> + [Define if you have the iconv() function and it works.])
> + fi
> + if test "$am_cv_lib_iconv" = yes; then
> +@@ -147,8 +166,8 @@ int main ()
> + LIBICONV=
> + LTLIBICONV=
> + fi
> +- AC_SUBST(LIBICONV)
> +- AC_SUBST(LTLIBICONV)
> ++ AC_SUBST([LIBICONV])
> ++ AC_SUBST([LTLIBICONV])
> + ])
> +
> + AC_DEFUN([AM_ICONV],
> +@@ -156,7 +175,7 @@ AC_DEFUN([AM_ICONV],
> + AM_ICONV_LINK
> + if test "$am_cv_func_iconv" = yes; then
> + AC_MSG_CHECKING([for iconv declaration])
> +- AC_CACHE_VAL(am_cv_proto_iconv, [
> ++ AC_CACHE_VAL([am_cv_proto_iconv], [
> + AC_TRY_COMPILE([
> + #include <stdlib.h>
> + #include <iconv.h>
> +@@ -169,12 +188,12 @@ size_t iconv (iconv_t cd, char * *inbuf,
> + #else
> + size_t iconv();
> + #endif
> +-], [], am_cv_proto_iconv_arg1="", am_cv_proto_iconv_arg1="const")
> ++], [], [am_cv_proto_iconv_arg1=""], [am_cv_proto_iconv_arg1="const"])
> + am_cv_proto_iconv="extern size_t iconv (iconv_t cd, $am_cv_proto_iconv_arg1 char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);"])
> + am_cv_proto_iconv=`echo "[$]am_cv_proto_iconv" | tr -s ' ' | sed -e 's/( /(/'`
> +- AC_MSG_RESULT([$]{ac_t:-
> +- }[$]am_cv_proto_iconv)
> +- AC_DEFINE_UNQUOTED(ICONV_CONST, $am_cv_proto_iconv_arg1,
> ++ AC_MSG_RESULT([
> ++ $am_cv_proto_iconv])
> ++ AC_DEFINE_UNQUOTED([ICONV_CONST], [$am_cv_proto_iconv_arg1],
> + [Define as const if the declaration of iconv() needs const.])
> + fi
> + ])
> +diff -Nurp -x '*.o' -x '*.gmo' -x '*.po' -x '*~' gstreamer-0.10.28.org/common/m4/lib-ld.m4 gstreamer-0.10.28/common/m4/lib-ld.m4
> +--- gstreamer-0.10.28.org/common/m4/lib-ld.m4 2010-03-08 08:58:16.000000000 -0800
> ++++ gstreamer-0.10.28/common/m4/lib-ld.m4 2010-05-22 08:37:17.753795900 -0700
> +@@ -1,5 +1,5 @@
> +-# lib-ld.m4 serial 3 (gettext-0.13)
> +-dnl Copyright (C) 1996-2003 Free Software Foundation, Inc.
> ++# lib-ld.m4 serial 4 (gettext-0.18)
> ++dnl Copyright (C) 1996-2003, 2009-2010 Free Software Foundation, Inc.
> + dnl This file is free software; the Free Software Foundation
> + dnl gives unlimited permission to copy and/or distribute it,
> + dnl with or without modifications, as long as this notice is preserved.
> +@@ -10,7 +10,7 @@ dnl with libtool.m4.
> +
> + dnl From libtool-1.4. Sets the variable with_gnu_ld to yes or no.
> + AC_DEFUN([AC_LIB_PROG_LD_GNU],
> +-[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], acl_cv_prog_gnu_ld,
> ++[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], [acl_cv_prog_gnu_ld],
> + [# I'd rather use --version here, but apparently some GNU ld's only accept -v.
> + case `$LD -v 2>&1 </dev/null` in
> + *GNU* | *'with BFD'*)
> +@@ -23,7 +23,7 @@ with_gnu_ld=$acl_cv_prog_gnu_ld
> +
> + dnl From libtool-1.4. Sets the variable LD.
> + AC_DEFUN([AC_LIB_PROG_LD],
> +-[AC_ARG_WITH(gnu-ld,
> ++[AC_ARG_WITH([gnu-ld],
> + [ --with-gnu-ld assume the C compiler uses GNU ld [default=no]],
> + test "$withval" = no || with_gnu_ld=yes, with_gnu_ld=no)
> + AC_REQUIRE([AC_PROG_CC])dnl
> +@@ -59,7 +59,7 @@ if test "$GCC" = yes; then
> + # Canonicalize the path of ld
> + ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'`
> + while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
> +- ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`
> ++ ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`
> + done
> + test -z "$LD" && LD="$ac_prog"
> + ;;
> +@@ -77,7 +77,7 @@ elif test "$with_gnu_ld" = yes; then
> + else
> + AC_MSG_CHECKING([for non-GNU ld])
> + fi
> +-AC_CACHE_VAL(acl_cv_path_LD,
> ++AC_CACHE_VAL([acl_cv_path_LD],
> + [if test -z "$LD"; then
> + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
> + for ac_dir in $PATH; do
> +@@ -89,9 +89,9 @@ AC_CACHE_VAL(acl_cv_path_LD,
> + # Break only if it was the GNU/non-GNU ld that we prefer.
> + case `"$acl_cv_path_LD" -v 2>&1 < /dev/null` in
> + *GNU* | *'with BFD'*)
> +- test "$with_gnu_ld" != no && break ;;
> ++ test "$with_gnu_ld" != no && break ;;
> + *)
> +- test "$with_gnu_ld" != yes && break ;;
> ++ test "$with_gnu_ld" != yes && break ;;
> + esac
> + fi
> + done
> +@@ -101,9 +101,9 @@ else
> + fi])
> + LD="$acl_cv_path_LD"
> + if test -n "$LD"; then
> +- AC_MSG_RESULT($LD)
> ++ AC_MSG_RESULT([$LD])
> + else
> +- AC_MSG_RESULT(no)
> ++ AC_MSG_RESULT([no])
> + fi
> + test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
> + AC_LIB_PROG_LD_GNU
> +diff -Nurp -x '*.o' -x '*.gmo' -x '*.po' -x '*~' gstreamer-0.10.28.org/common/m4/lib-link.m4 gstreamer-0.10.28/common/m4/lib-link.m4
> +--- gstreamer-0.10.28.org/common/m4/lib-link.m4 2010-03-08 08:58:16.000000000 -0800
> ++++ gstreamer-0.10.28/common/m4/lib-link.m4 2010-05-22 08:37:17.763792911 -0700
> +@@ -1,12 +1,12 @@
> +-# lib-link.m4 serial 13 (gettext-0.17)
> +-dnl Copyright (C) 2001-2007 Free Software Foundation, Inc.
> ++# lib-link.m4 serial 21 (gettext-0.18)
> ++dnl Copyright (C) 2001-2010 Free Software Foundation, Inc.
> + dnl This file is free software; the Free Software Foundation
> + dnl gives unlimited permission to copy and/or distribute it,
> + dnl with or without modifications, as long as this notice is preserved.
> +
> + dnl From Bruno Haible.
> +
> +-AC_PREREQ(2.54)
> ++AC_PREREQ([2.54])
> +
> + dnl AC_LIB_LINKFLAGS(name [, dependencies]) searches for libname and
> + dnl the libraries corresponding to explicit and implicit dependencies.
> +@@ -18,9 +18,9 @@ AC_DEFUN([AC_LIB_LINKFLAGS],
> + [
> + AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
> + AC_REQUIRE([AC_LIB_RPATH])
> +- define([Name],[translit([$1],[./-], [___])])
> +- define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
> +- [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
> ++ pushdef([Name],[translit([$1],[./-], [___])])
> ++ pushdef([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
> ++ [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
> + AC_CACHE_CHECK([how to link with lib[]$1], [ac_cv_lib[]Name[]_libs], [
> + AC_LIB_LINKFLAGS_BODY([$1], [$2])
> + ac_cv_lib[]Name[]_libs="$LIB[]NAME"
> +@@ -39,16 +39,17 @@ AC_DEFUN([AC_LIB_LINKFLAGS],
> + dnl Also set HAVE_LIB[]NAME so that AC_LIB_HAVE_LINKFLAGS can reuse the
> + dnl results of this search when this library appears as a dependency.
> + HAVE_LIB[]NAME=yes
> +- undefine([Name])
> +- undefine([NAME])
> ++ popdef([NAME])
> ++ popdef([Name])
> + ])
> +
> +-dnl AC_LIB_HAVE_LINKFLAGS(name, dependencies, includes, testcode)
> ++dnl AC_LIB_HAVE_LINKFLAGS(name, dependencies, includes, testcode, [missing-message])
> + dnl searches for libname and the libraries corresponding to explicit and
> + dnl implicit dependencies, together with the specified include files and
> +-dnl the ability to compile and link the specified testcode. If found, it
> +-dnl sets and AC_SUBSTs HAVE_LIB${NAME}=yes and the LIB${NAME} and
> +-dnl LTLIB${NAME} variables and augments the CPPFLAGS variable, and
> ++dnl the ability to compile and link the specified testcode. The missing-message
> ++dnl defaults to 'no' and may contain additional hints for the user.
> ++dnl If found, it sets and AC_SUBSTs HAVE_LIB${NAME}=yes and the LIB${NAME}
> ++dnl and LTLIB${NAME} variables and augments the CPPFLAGS variable, and
> + dnl #defines HAVE_LIB${NAME} to 1. Otherwise, it sets and AC_SUBSTs
> + dnl HAVE_LIB${NAME}=no and LIB${NAME} and LTLIB${NAME} to empty.
> + dnl Sets and AC_SUBSTs the LIB${NAME}_PREFIX variable to nonempty if libname
> +@@ -57,9 +58,9 @@ AC_DEFUN([AC_LIB_HAVE_LINKFLAGS],
> + [
> + AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
> + AC_REQUIRE([AC_LIB_RPATH])
> +- define([Name],[translit([$1],[./-], [___])])
> +- define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
> +- [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
> ++ pushdef([Name],[translit([$1],[./-], [___])])
> ++ pushdef([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
> ++ [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
> +
> + dnl Search for lib[]Name and define LIB[]NAME, LTLIB[]NAME and INC[]NAME
> + dnl accordingly.
> +@@ -73,13 +74,25 @@ AC_DEFUN([AC_LIB_HAVE_LINKFLAGS],
> +
> + AC_CACHE_CHECK([for lib[]$1], [ac_cv_lib[]Name], [
> + ac_save_LIBS="$LIBS"
> +- LIBS="$LIBS $LIB[]NAME"
> +- AC_TRY_LINK([$3], [$4], [ac_cv_lib[]Name=yes], [ac_cv_lib[]Name=no])
> ++ dnl If $LIB[]NAME contains some -l options, add it to the end of LIBS,
> ++ dnl because these -l options might require -L options that are present in
> ++ dnl LIBS. -l options benefit only from the -L options listed before it.
> ++ dnl Otherwise, add it to the front of LIBS, because it may be a static
> ++ dnl library that depends on another static library that is present in LIBS.
> ++ dnl Static libraries benefit only from the static libraries listed after
> ++ dnl it.
> ++ case " $LIB[]NAME" in
> ++ *" -l"*) LIBS="$LIBS $LIB[]NAME" ;;
> ++ *) LIBS="$LIB[]NAME $LIBS" ;;
> ++ esac
> ++ AC_TRY_LINK([$3], [$4],
> ++ [ac_cv_lib[]Name=yes],
> ++ [ac_cv_lib[]Name='m4_if([$5], [], [no], [[$5]])'])
> + LIBS="$ac_save_LIBS"
> + ])
> + if test "$ac_cv_lib[]Name" = yes; then
> + HAVE_LIB[]NAME=yes
> +- AC_DEFINE([HAVE_LIB]NAME, 1, [Define if you have the $1 library.])
> ++ AC_DEFINE([HAVE_LIB]NAME, 1, [Define if you have the lib][$1 library.])
> + AC_MSG_CHECKING([how to link with lib[]$1])
> + AC_MSG_RESULT([$LIB[]NAME])
> + else
> +@@ -95,8 +108,8 @@ AC_DEFUN([AC_LIB_HAVE_LINKFLAGS],
> + AC_SUBST([LIB]NAME)
> + AC_SUBST([LTLIB]NAME)
> + AC_SUBST([LIB]NAME[_PREFIX])
> +- undefine([Name])
> +- undefine([NAME])
> ++ popdef([NAME])
> ++ popdef([Name])
> + ])
> +
> + dnl Determine the platform dependent parameters needed to use rpath:
> +@@ -114,7 +127,7 @@ AC_DEFUN([AC_LIB_RPATH],
> + AC_REQUIRE([AC_LIB_PROG_LD]) dnl we use $LD, $with_gnu_ld
> + AC_REQUIRE([AC_CANONICAL_HOST]) dnl we use $host
> + AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT]) dnl we use $ac_aux_dir
> +- AC_CACHE_CHECK([for shared library run path origin], acl_cv_rpath, [
> ++ AC_CACHE_CHECK([for shared library run path origin], [acl_cv_rpath], [
> + CC="$CC" GCC="$GCC" LDFLAGS="$LDFLAGS" LD="$LD" with_gnu_ld="$with_gnu_ld" \
> + ${CONFIG_SHELL-/bin/sh} "$ac_aux_dir/config.rpath" "$host" > conftest.sh
> + . ./conftest.sh
> +@@ -131,11 +144,32 @@ AC_DEFUN([AC_LIB_RPATH],
> + acl_hardcode_direct="$acl_cv_hardcode_direct"
> + acl_hardcode_minus_L="$acl_cv_hardcode_minus_L"
> + dnl Determine whether the user wants rpath handling at all.
> +- AC_ARG_ENABLE(rpath,
> ++ AC_ARG_ENABLE([rpath],
> + [ --disable-rpath do not hardcode runtime library paths],
> + :, enable_rpath=yes)
> + ])
> +
> ++dnl AC_LIB_FROMPACKAGE(name, package)
> ++dnl declares that libname comes from the given package. The configure file
> ++dnl will then not have a --with-libname-prefix option but a
> ++dnl --with-package-prefix option. Several libraries can come from the same
> ++dnl package. This declaration must occur before an AC_LIB_LINKFLAGS or similar
> ++dnl macro call that searches for libname.
> ++AC_DEFUN([AC_LIB_FROMPACKAGE],
> ++[
> ++ pushdef([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
> ++ [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
> ++ define([acl_frompackage_]NAME, [$2])
> ++ popdef([NAME])
> ++ pushdef([PACK],[$2])
> ++ pushdef([PACKUP],[translit(PACK,[abcdefghijklmnopqrstuvwxyz./-],
> ++ [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
> ++ define([acl_libsinpackage_]PACKUP,
> ++ m4_ifdef([acl_libsinpackage_]PACKUP, [acl_libsinpackage_]PACKUP[[, ]],)[lib$1])
> ++ popdef([PACKUP])
> ++ popdef([PACK])
> ++])
> ++
> + dnl AC_LIB_LINKFLAGS_BODY(name [, dependencies]) searches for libname and
> + dnl the libraries corresponding to explicit and implicit dependencies.
> + dnl Sets the LIB${NAME}, LTLIB${NAME} and INC${NAME} variables.
> +@@ -144,19 +178,23 @@ dnl in ${LIB${NAME}_PREFIX}/$acl_libdirs
> + AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
> + [
> + AC_REQUIRE([AC_LIB_PREPARE_MULTILIB])
> +- define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
> +- [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
> ++ pushdef([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
> ++ [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
> ++ pushdef([PACK],[m4_ifdef([acl_frompackage_]NAME, [acl_frompackage_]NAME, lib[$1])])
> ++ pushdef([PACKUP],[translit(PACK,[abcdefghijklmnopqrstuvwxyz./-],
> ++ [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
> ++ pushdef([PACKLIBS],[m4_ifdef([acl_frompackage_]NAME, [acl_libsinpackage_]PACKUP, lib[$1])])
> + dnl Autoconf >= 2.61 supports dots in --with options.
> +- define([N_A_M_E],[m4_if(m4_version_compare(m4_defn([m4_PACKAGE_VERSION]),[2.61]),[-1],[translit([$1],[.],[_])],[$1])])
> ++ pushdef([P_A_C_K],[m4_if(m4_version_compare(m4_defn([m4_PACKAGE_VERSION]),[2.61]),[-1],[translit(PACK,[.],[_])],PACK)])
> + dnl By default, look in $includedir and $libdir.
> + use_additional=yes
> + AC_LIB_WITH_FINAL_PREFIX([
> + eval additional_includedir=\"$includedir\"
> + eval additional_libdir=\"$libdir\"
> + ])
> +- AC_LIB_ARG_WITH([lib]N_A_M_E[-prefix],
> +-[ --with-lib]N_A_M_E[-prefix[=DIR] search for lib$1 in DIR/include and DIR/lib
> +- --without-lib]N_A_M_E[-prefix don't search for lib$1 in includedir and libdir],
> ++ AC_ARG_WITH(P_A_C_K[-prefix],
> ++[[ --with-]]P_A_C_K[[-prefix[=DIR] search for ]PACKLIBS[ in DIR/include and DIR/lib
> ++ --without-]]P_A_C_K[[-prefix don't search for ]PACKLIBS[ in includedir and libdir]],
> + [
> + if test "X$withval" = "Xno"; then
> + use_additional=no
> +@@ -169,6 +207,10 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
> + else
> + additional_includedir="$withval/include"
> + additional_libdir="$withval/$acl_libdirstem"
> ++ if test "$acl_libdirstem2" != "$acl_libdirstem" \
> ++ && ! test -d "$withval/$acl_libdirstem"; then
> ++ additional_libdir="$withval/$acl_libdirstem2"
> ++ fi
> + fi
> + fi
> + ])
> +@@ -178,6 +220,9 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
> + LTLIB[]NAME=
> + INC[]NAME=
> + LIB[]NAME[]_PREFIX=
> ++ dnl HAVE_LIB${NAME} is an indicator that LIB${NAME}, LTLIB${NAME} have been
> ++ dnl computed. So it has to be reset here.
> ++ HAVE_LIB[]NAME=
> + rpathdirs=
> + ltrpathdirs=
> + names_already_handled=
> +@@ -267,6 +312,9 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
> + fi
> + fi
> + fi
> ++ dnl Just let the compiler find the library, the compiler and user are smarter then this script
> ++ dnl when cross compiling and working with a relocated install.
> ++ found_dir=""
> + if test "X$found_dir" = "X"; then
> + for x in $LDFLAGS $LTLIB[]NAME; do
> + AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
> +@@ -327,7 +375,9 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
> + dnl Linking with a shared library. We attempt to hardcode its
> + dnl directory into the executable's runpath, unless it's the
> + dnl standard /usr/lib.
> +- if test "$enable_rpath" = no || test "X$found_dir" = "X/usr/$acl_libdirstem"; then
> ++ if test "$enable_rpath" = no \
> ++ || test "X$found_dir" = "X/usr/$acl_libdirstem" \
> ++ || test "X$found_dir" = "X/usr/$acl_libdirstem2"; then
> + dnl No hardcoding is needed.
> + LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
> + else
> +@@ -415,7 +465,16 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
> + case "$found_dir" in
> + */$acl_libdirstem | */$acl_libdirstem/)
> + basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem/"'*$,,'`
> +- LIB[]NAME[]_PREFIX="$basedir"
> ++ if test "$name" = '$1'; then
> ++ LIB[]NAME[]_PREFIX="$basedir"
> ++ fi
> ++ additional_includedir="$basedir/include"
> ++ ;;
> ++ */$acl_libdirstem2 | */$acl_libdirstem2/)
> ++ basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem2/"'*$,,'`
> ++ if test "$name" = '$1'; then
> ++ LIB[]NAME[]_PREFIX="$basedir"
> ++ fi
> + additional_includedir="$basedir/include"
> + ;;
> + esac
> +@@ -476,9 +535,11 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
> + dnl 3. if it's already present in $LDFLAGS or the already
> + dnl constructed $LIBNAME,
> + dnl 4. if it doesn't exist as a directory.
> +- if test "X$additional_libdir" != "X/usr/$acl_libdirstem"; then
> ++ if test "X$additional_libdir" != "X/usr/$acl_libdirstem" \
> ++ && test "X$additional_libdir" != "X/usr/$acl_libdirstem2"; then
> + haveit=
> +- if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem"; then
> ++ if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem" \
> ++ || test "X$additional_libdir" = "X/usr/local/$acl_libdirstem2"; then
> + if test -n "$GCC"; then
> + case $host_os in
> + linux* | gnu* | k*bsd*-gnu) haveit=yes;;
> +@@ -609,6 +670,11 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
> + LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-R$found_dir"
> + done
> + fi
> ++ popdef([P_A_C_K])
> ++ popdef([PACKLIBS])
> ++ popdef([PACKUP])
> ++ popdef([PACK])
> ++ popdef([NAME])
> + ])
> +
> + dnl AC_LIB_APPENDTOVAR(VAR, CONTENTS) appends the elements of CONTENTS to VAR,
> +@@ -654,7 +720,8 @@ AC_DEFUN([AC_LIB_LINKFLAGS_FROM_LIBS],
> + if test -n "$next"; then
> + dir="$next"
> + dnl No need to hardcode the standard /usr/lib.
> +- if test "X$dir" != "X/usr/$acl_libdirstem"; then
> ++ if test "X$dir" != "X/usr/$acl_libdirstem" \
> ++ && test "X$dir" != "X/usr/$acl_libdirstem2"; then
> + rpathdirs="$rpathdirs $dir"
> + fi
> + next=
> +@@ -663,7 +730,8 @@ AC_DEFUN([AC_LIB_LINKFLAGS_FROM_LIBS],
> + -L) next=yes ;;
> + -L*) dir=`echo "X$opt" | sed -e 's,^X-L,,'`
> + dnl No need to hardcode the standard /usr/lib.
> +- if test "X$dir" != "X/usr/$acl_libdirstem"; then
> ++ if test "X$dir" != "X/usr/$acl_libdirstem" \
> ++ && test "X$dir" != "X/usr/$acl_libdirstem2"; then
> + rpathdirs="$rpathdirs $dir"
> + fi
> + next= ;;
> +diff -Nurp -x '*.o' -x '*.gmo' -x '*.po' -x '*~' gstreamer-0.10.28.org/common/m4/lib-prefix.m4 gstreamer-0.10.28/common/m4/lib-prefix.m4
> +--- gstreamer-0.10.28.org/common/m4/lib-prefix.m4 2010-03-08 08:58:16.000000000 -0800
> ++++ gstreamer-0.10.28/common/m4/lib-prefix.m4 2010-05-22 08:37:17.773783356 -0700
> +@@ -1,5 +1,5 @@
> +-# lib-prefix.m4 serial 5 (gettext-0.15)
> +-dnl Copyright (C) 2001-2005 Free Software Foundation, Inc.
> ++# lib-prefix.m4 serial 7 (gettext-0.18)
> ++dnl Copyright (C) 2001-2005, 2008-2010 Free Software Foundation, Inc.
> + dnl This file is free software; the Free Software Foundation
> + dnl gives unlimited permission to copy and/or distribute it,
> + dnl with or without modifications, as long as this notice is preserved.
> +@@ -153,33 +153,72 @@ AC_DEFUN([AC_LIB_WITH_FINAL_PREFIX],
> + prefix="$acl_save_prefix"
> + ])
> +
> +-dnl AC_LIB_PREPARE_MULTILIB creates a variable acl_libdirstem, containing
> +-dnl the basename of the libdir, either "lib" or "lib64".
> ++dnl AC_LIB_PREPARE_MULTILIB creates
> ++dnl - a variable acl_libdirstem, containing the basename of the libdir, either
> ++dnl "lib" or "lib64" or "lib/64",
> ++dnl - a variable acl_libdirstem2, as a secondary possible value for
> ++dnl acl_libdirstem, either the same as acl_libdirstem or "lib/sparcv9" or
> ++dnl "lib/amd64".
> + AC_DEFUN([AC_LIB_PREPARE_MULTILIB],
> + [
> +- dnl There is no formal standard regarding lib and lib64. The current
> +- dnl practice is that on a system supporting 32-bit and 64-bit instruction
> +- dnl sets or ABIs, 64-bit libraries go under $prefix/lib64 and 32-bit
> +- dnl libraries go under $prefix/lib. We determine the compiler's default
> +- dnl mode by looking at the compiler's library search path. If at least
> +- dnl of its elements ends in /lib64 or points to a directory whose absolute
> +- dnl pathname ends in /lib64, we assume a 64-bit ABI. Otherwise we use the
> +- dnl default, namely "lib".
> ++ dnl There is no formal standard regarding lib and lib64.
> ++ dnl On glibc systems, the current practice is that on a system supporting
> ++ dnl 32-bit and 64-bit instruction sets or ABIs, 64-bit libraries go under
> ++ dnl $prefix/lib64 and 32-bit libraries go under $prefix/lib. We determine
> ++ dnl the compiler's default mode by looking at the compiler's library search
> ++ dnl path. If at least one of its elements ends in /lib64 or points to a
> ++ dnl directory whose absolute pathname ends in /lib64, we assume a 64-bit ABI.
> ++ dnl Otherwise we use the default, namely "lib".
> ++ dnl On Solaris systems, the current practice is that on a system supporting
> ++ dnl 32-bit and 64-bit instruction sets or ABIs, 64-bit libraries go under
> ++ dnl $prefix/lib/64 (which is a symlink to either $prefix/lib/sparcv9 or
> ++ dnl $prefix/lib/amd64) and 32-bit libraries go under $prefix/lib.
> ++ AC_REQUIRE([AC_CANONICAL_HOST])
> + acl_libdirstem=lib
> +- searchpath=`(LC_ALL=C $CC -print-search-dirs) 2>/dev/null | sed -n -e 's,^libraries: ,,p' | sed -e 's,^=,,'`
> +- if test -n "$searchpath"; then
> +- acl_save_IFS="${IFS= }"; IFS=":"
> +- for searchdir in $searchpath; do
> +- if test -d "$searchdir"; then
> +- case "$searchdir" in
> +- */lib64/ | */lib64 ) acl_libdirstem=lib64 ;;
> +- *) searchdir=`cd "$searchdir" && pwd`
> +- case "$searchdir" in
> +- */lib64 ) acl_libdirstem=lib64 ;;
> +- esac ;;
> ++ acl_libdirstem2=
> ++ case "$host_os" in
> ++ solaris*)
> ++ dnl See Solaris 10 Software Developer Collection > Solaris 64-bit Developer's Guide > The Development Environment
> ++ dnl <http://docs.sun.com/app/docs/doc/816-5138/dev-env?l=en&a=view>.
> ++ dnl "Portable Makefiles should refer to any library directories using the 64 symbolic link."
> ++ dnl But we want to recognize the sparcv9 or amd64 subdirectory also if the
> ++ dnl symlink is missing, so we set acl_libdirstem2 too.
> ++ AC_CACHE_CHECK([for 64-bit host], [gl_cv_solaris_64bit],
> ++ [AC_EGREP_CPP([sixtyfour bits], [
> ++#ifdef _LP64
> ++sixtyfour bits
> ++#endif
> ++ ], [gl_cv_solaris_64bit=yes], [gl_cv_solaris_64bit=no])
> ++ ])
> ++ if test $gl_cv_solaris_64bit = yes; then
> ++ acl_libdirstem=lib/64
> ++ case "$host_cpu" in
> ++ sparc*) acl_libdirstem2=lib/sparcv9 ;;
> ++ i*86 | x86_64) acl_libdirstem2=lib/amd64 ;;
> + esac
> + fi
> +- done
> +- IFS="$acl_save_IFS"
> +- fi
> ++ ;;
> ++ *)
> ++ searchpath=`(LC_ALL=C $CC -print-search-dirs) 2>/dev/null | sed -n -e 's,^libraries: ,,p' | sed -e 's,^=,,'`
> ++ if test -n "$searchpath"; then
> ++ acl_save_IFS="${IFS= }"; IFS=":"
> ++ for searchdir in $searchpath; do
> ++ if test -d "$searchdir"; then
> ++ case "$searchdir" in
> ++ */lib64/ | */lib64 ) acl_libdirstem=lib64 ;;
> ++ */../ | */.. )
> ++ # Better ignore directories of this form. They are misleading.
> ++ ;;
> ++ *) searchdir=`cd "$searchdir" && pwd`
> ++ case "$searchdir" in
> ++ */lib64 ) acl_libdirstem=lib64 ;;
> ++ esac ;;
> ++ esac
> ++ fi
> ++ done
> ++ IFS="$acl_save_IFS"
> ++ fi
> ++ ;;
> ++ esac
> ++ test -n "$acl_libdirstem2" || acl_libdirstem2="$acl_libdirstem"
> + ])
> +diff -Nurp -x '*.o' -x '*.gmo' -x '*.po' -x '*~' gstreamer-0.10.28.org/common/m4/nls.m4 gstreamer-0.10.28/common/m4/nls.m4
> +--- gstreamer-0.10.28.org/common/m4/nls.m4 2010-03-08 08:58:16.000000000 -0800
> ++++ gstreamer-0.10.28/common/m4/nls.m4 2010-05-22 08:37:17.793786388 -0700
> +@@ -1,5 +1,6 @@
> +-# nls.m4 serial 3 (gettext-0.15)
> +-dnl Copyright (C) 1995-2003, 2005-2006 Free Software Foundation, Inc.
> ++# nls.m4 serial 5 (gettext-0.18)
> ++dnl Copyright (C) 1995-2003, 2005-2006, 2008-2010 Free Software Foundation,
> ++dnl Inc.
> + dnl This file is free software; the Free Software Foundation
> + dnl gives unlimited permission to copy and/or distribute it,
> + dnl with or without modifications, as long as this notice is preserved.
> +@@ -17,15 +18,15 @@ dnl Authors:
> + dnl Ulrich Drepper <drepper@cygnus.com>, 1995-2000.
> + dnl Bruno Haible <haible@clisp.cons.org>, 2000-2003.
> +
> +-AC_PREREQ(2.50)
> ++AC_PREREQ([2.50])
> +
> + AC_DEFUN([AM_NLS],
> + [
> + AC_MSG_CHECKING([whether NLS is requested])
> + dnl Default is enabled NLS
> +- AC_ARG_ENABLE(nls,
> ++ AC_ARG_ENABLE([nls],
> + [ --disable-nls do not use Native Language Support],
> + USE_NLS=$enableval, USE_NLS=yes)
> +- AC_MSG_RESULT($USE_NLS)
> +- AC_SUBST(USE_NLS)
> ++ AC_MSG_RESULT([$USE_NLS])
> ++ AC_SUBST([USE_NLS])
> + ])
> +diff -Nurp -x '*.o' -x '*.gmo' -x '*.po' -x '*~' gstreamer-0.10.28.org/common/m4/po.m4 gstreamer-0.10.28/common/m4/po.m4
> +--- gstreamer-0.10.28.org/common/m4/po.m4 2010-03-08 08:58:16.000000000 -0800
> ++++ gstreamer-0.10.28/common/m4/po.m4 2010-05-22 08:37:17.803788218 -0700
> +@@ -1,5 +1,5 @@
> +-# po.m4 serial 15 (gettext-0.17)
> +-dnl Copyright (C) 1995-2007 Free Software Foundation, Inc.
> ++# po.m4 serial 17 (gettext-0.18)
> ++dnl Copyright (C) 1995-2010 Free Software Foundation, Inc.
> + dnl This file is free software; the Free Software Foundation
> + dnl gives unlimited permission to copy and/or distribute it,
> + dnl with or without modifications, as long as this notice is preserved.
> +@@ -17,7 +17,7 @@ dnl Authors:
> + dnl Ulrich Drepper <drepper@cygnus.com>, 1995-2000.
> + dnl Bruno Haible <haible@clisp.cons.org>, 2000-2003.
> +
> +-AC_PREREQ(2.50)
> ++AC_PREREQ([2.50])
> +
> + dnl Checks for all prerequisites of the po subdirectory.
> + AC_DEFUN([AM_PO_SUBDIRS],
> +@@ -29,7 +29,7 @@ AC_DEFUN([AM_PO_SUBDIRS],
> +
> + dnl Release version of the gettext macros. This is used to ensure that
> + dnl the gettext macros and po/Makefile.in.in are in sync.
> +- AC_SUBST([GETTEXT_MACRO_VERSION], [0.17])
> ++ AC_SUBST([GETTEXT_MACRO_VERSION], [0.18])
> +
> + dnl Perform the following tests also if --disable-nls has been given,
> + dnl because they are needed for "make dist" to work.
> +@@ -41,7 +41,7 @@ AC_DEFUN([AM_PO_SUBDIRS],
> + [$ac_dir/$ac_word --statistics /dev/null >&]AS_MESSAGE_LOG_FD[ 2>&1 &&
> + (if $ac_dir/$ac_word --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi)],
> + :)
> +- AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
> ++ AC_PATH_PROG([GMSGFMT], [gmsgfmt], [$MSGFMT])
> +
> + dnl Test whether it is GNU msgfmt >= 0.15.
> + changequote(,)dnl
> +diff -Nurp -x '*.o' -x '*.gmo' -x '*.po' -x '*~' gstreamer-0.10.28.org/common/m4/progtest.m4 gstreamer-0.10.28/common/m4/progtest.m4
> +--- gstreamer-0.10.28.org/common/m4/progtest.m4 2010-03-08 08:58:16.000000000 -0800
> ++++ gstreamer-0.10.28/common/m4/progtest.m4 2010-05-22 08:37:17.833809771 -0700
> +@@ -1,5 +1,5 @@
> +-# progtest.m4 serial 4 (gettext-0.14.2)
> +-dnl Copyright (C) 1996-2003, 2005 Free Software Foundation, Inc.
> ++# progtest.m4 serial 6 (gettext-0.18)
> ++dnl Copyright (C) 1996-2003, 2005, 2008-2010 Free Software Foundation, Inc.
> + dnl This file is free software; the Free Software Foundation
> + dnl gives unlimited permission to copy and/or distribute it,
> + dnl with or without modifications, as long as this notice is preserved.
> +@@ -16,7 +16,7 @@ dnl They are *not* in the public domain.
> + dnl Authors:
> + dnl Ulrich Drepper <drepper@cygnus.com>, 1996.
> +
> +-AC_PREREQ(2.50)
> ++AC_PREREQ([2.50])
> +
> + # Search path for a program which passes the given test.
> +
> +@@ -55,7 +55,7 @@ rm -f conf$$.file
> + # Extract the first word of "$2", so it can be a program name with args.
> + set dummy $2; ac_word=[$]2
> + AC_MSG_CHECKING([for $ac_word])
> +-AC_CACHE_VAL(ac_cv_path_$1,
> ++AC_CACHE_VAL([ac_cv_path_$1],
> + [case "[$]$1" in
> + [[\\/]]* | ?:[[\\/]]*)
> + ac_cv_path_$1="[$]$1" # Let the user override the test with a path.
> +@@ -84,9 +84,9 @@ ifelse([$4], , , [ test -z "[$]ac_cv_pa
> + esac])dnl
> + $1="$ac_cv_path_$1"
> + if test ifelse([$4], , [-n "[$]$1"], ["[$]$1" != "$4"]); then
> +- AC_MSG_RESULT([$]$1)
> ++ AC_MSG_RESULT([$][$1])
> + else
> +- AC_MSG_RESULT(no)
> ++ AC_MSG_RESULT([no])
> + fi
> +-AC_SUBST($1)dnl
> ++AC_SUBST([$1])dnl
> + ])
> +diff -Nurp -x '*.o' -x '*.gmo' -x '*.po' -x '*~' gstreamer-0.10.28.org/configure.ac gstreamer-0.10.28/configure.ac
> +--- gstreamer-0.10.28.org/configure.ac 2010-03-08 14:52:43.000000000 -0800
> ++++ gstreamer-0.10.28/configure.ac 2010-05-22 08:37:17.873785452 -0700
> +@@ -63,7 +63,7 @@ AC_SUBST(ACLOCAL_AMFLAGS, "-I common/m4
> +
> + dnl set up gettext
> + dnl the version check needs to stay here because autopoint greps for it
> +-AM_GNU_GETTEXT_VERSION([0.17])
> ++AM_GNU_GETTEXT_VERSION([0.18])
> + AM_GNU_GETTEXT([external])
> + AG_GST_GETTEXT([gstreamer-$GST_MAJORMINOR])
> +
> +diff -Nurp -x '*.o' -x '*.gmo' -x '*.po' -x '*~' gstreamer-0.10.28.org/gst-element-check-0.10.m4 gstreamer-0.10.28/gst-element-check-0.10.m4
> +--- gstreamer-0.10.28.org/gst-element-check-0.10.m4 1969-12-31 16:00:00.000000000 -0800
> ++++ gstreamer-0.10.28/gst-element-check-0.10.m4 2010-05-22 08:38:27.301286153 -0700
> +@@ -0,0 +1,23 @@
> ++dnl Perform a check for a GStreamer element using gst-inspect
> ++dnl Thomas Vander Stichele <thomas at apestaart dot org>
> ++dnl Last modification: 25/01/2005
> ++
> ++dnl AM_GST_ELEMENT_CHECK(ELEMENT-NAME, ACTION-IF-FOUND, ACTION-IF-NOT-FOUND)
> ++
> ++AC_DEFUN([AM_GST_ELEMENT_CHECK],
> ++[
> ++ if test "x$GST_INSPECT" == "x"; then
> ++ AC_CHECK_PROG(GST_INSPECT, gst-inspect-0.10, gst-inspect-0.10, [])
> ++ fi
> ++
> ++ if test "x$GST_INSPECT" != "x"; then
> ++ AC_MSG_CHECKING(GStreamer 0.10 element $1)
> ++ if [ $GST_INSPECT $1 > /dev/null 2> /dev/null ]; then
> ++ AC_MSG_RESULT(found.)
> ++ $2
> ++ else
> ++ AC_MSG_RESULT(not found.)
> ++ $3
> ++ fi
> ++ fi
> ++])
> +Binary files gstreamer-0.10.28.org/libs/gst/check/.libs/libgstcheck-0.10.a and gstreamer-0.10.28/libs/gst/check/.libs/libgstcheck-0.10.a differ
> +diff -Nurp -x '*.o' -x '*.gmo' -x '*.po' -x '*~' gstreamer-0.10.28.org/po/ChangeLog gstreamer-0.10.28/po/ChangeLog
> +--- gstreamer-0.10.28.org/po/ChangeLog 1969-12-31 16:00:00.000000000 -0800
> ++++ gstreamer-0.10.28/po/ChangeLog 2010-05-22 08:37:16.941476173 -0700
> +@@ -0,0 +1,5 @@
> ++2010-05-22 gettextize <bug-gnu-gettext@gnu.org>
> ++
> ++ * Makefile.in.in: Upgrade to gettext-0.18.
> ++ * Rules-quot: Upgrade to gettext-0.18.
> ++
> +diff -Nurp -x '*.o' -x '*.gmo' -x '*.po' -x '*~' gstreamer-0.10.28.org/po/Makefile.in.in gstreamer-0.10.28/po/Makefile.in.in
> +--- gstreamer-0.10.28.org/po/Makefile.in.in 2010-03-08 13:31:23.000000000 -0800
> ++++ gstreamer-0.10.28/po/Makefile.in.in 2010-05-22 08:37:16.801299560 -0700
> +@@ -1,5 +1,5 @@
> + # Makefile for PO directory in any package using GNU gettext.
> +-# Copyright (C) 1995-1997, 2000-2007 by Ulrich Drepper <drepper@gnu.ai.mit.edu>
> ++# Copyright (C) 1995-1997, 2000-2007, 2009-2010 by Ulrich Drepper <drepper@gnu.ai.mit.edu>
> + #
> + # This file can be copied and used freely without restrictions. It can
> + # be used in projects which are not available under the GNU General Public
> +@@ -8,16 +8,13 @@
> + # Please note that the actual code of GNU gettext is covered by the GNU
> + # General Public License and is *not* in the public domain.
> + #
> +-# Origin: gettext-0.17
> +-GETTEXT_MACRO_VERSION = 0.17
> ++# Origin: gettext-0.18
> ++GETTEXT_MACRO_VERSION = 0.18
> +
> + PACKAGE = @PACKAGE@
> + VERSION = @VERSION@
> + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
> +
> +-# thomas: add GETTEXT_PACKAGE substitution as used in Makevars
> +-GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
> +-
> + SHELL = /bin/sh
> + @SET_MAKE@
> +
> +@@ -91,8 +88,8 @@ CATALOGS = @CATALOGS@
> + .po.gmo:
> + @lang=`echo $* | sed -e 's,.*/,,'`; \
> + test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \
> +- echo "$${cdcmd}rm -f $${lang}.gmo && $(GMSGFMT) -c --statistics -o $${lang}.gmo $${lang}.po"; \
> +- cd $(srcdir) && rm -f $${lang}.gmo && $(GMSGFMT) -c --statistics -o t-$${lang}.gmo $${lang}.po && mv t-$${lang}.gmo $${lang}.gmo
> ++ echo "$${cdcmd}rm -f $${lang}.gmo && $(GMSGFMT) -c --statistics --verbose -o $${lang}.gmo $${lang}.po"; \
> ++ cd $(srcdir) && rm -f $${lang}.gmo && $(GMSGFMT) -c --statistics --verbose -o t-$${lang}.gmo $${lang}.po && mv t-$${lang}.gmo $${lang}.gmo
> +
> + .sin.sed:
> + sed -e '/^#/d' $< > t-$@
> +@@ -196,8 +193,15 @@ $(POFILES): $(srcdir)/$(DOMAIN).pot
> + @lang=`echo $@ | sed -e 's,.*/,,' -e 's/\.po$$//'`; \
> + if test -f "$(srcdir)/$${lang}.po"; then \
> + test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \
> +- echo "$${cdcmd}$(MSGMERGE_UPDATE) $${lang}.po $(DOMAIN).pot"; \
> +- cd $(srcdir) && $(MSGMERGE_UPDATE) $${lang}.po $(DOMAIN).pot; \
> ++ echo "$${cdcmd}$(MSGMERGE_UPDATE) $(MSGMERGE_OPTIONS) --lang=$${lang} $${lang}.po $(DOMAIN).pot"; \
> ++ cd $(srcdir) \
> ++ && { case `$(MSGMERGE_UPDATE) --version | sed 1q | sed -e 's,^[^0-9]*,,'` in \
> ++ '' | 0.[0-9] | 0.[0-9].* | 0.1[0-7] | 0.1[0-7].*) \
> ++ $(MSGMERGE_UPDATE) $(MSGMERGE_OPTIONS) $${lang}.po $(DOMAIN).pot;; \
> ++ *) \
> ++ $(MSGMERGE_UPDATE) $(MSGMERGE_OPTIONS) --lang=$${lang} $${lang}.po $(DOMAIN).pot;; \
> ++ esac; \
> ++ }; \
> + else \
> + $(MAKE) $${lang}.po-create; \
> + fi
> +@@ -220,7 +224,6 @@ install-data: install-data-@USE_NLS@
> + fi
> + install-data-no: all
> + install-data-yes: all
> +- $(mkdir_p) $(DESTDIR)$(datadir)
> + @catalogs='$(CATALOGS)'; \
> + for cat in $$catalogs; do \
> + cat=`basename $$cat`; \
> +@@ -272,7 +275,6 @@ installdirs-data: installdirs-data-@USE_
> + fi
> + installdirs-data-no:
> + installdirs-data-yes:
> +- $(mkdir_p) $(DESTDIR)$(datadir)
> + @catalogs='$(CATALOGS)'; \
> + for cat in $$catalogs; do \
> + cat=`basename $$cat`; \
> +@@ -398,9 +400,15 @@ update-po: Makefile
> + tmpdir=`pwd`; \
> + echo "$$lang:"; \
> + test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \
> +- echo "$${cdcmd}$(MSGMERGE) $$lang.po $(DOMAIN).pot -o $$lang.new.po"; \
> ++ echo "$${cdcmd}$(MSGMERGE) $(MSGMERGE_OPTIONS) --lang=$$lang $$lang.po $(DOMAIN).pot -o $$lang.new.po"; \
> + cd $(srcdir); \
> +- if $(MSGMERGE) $$lang.po $(DOMAIN).pot -o $$tmpdir/$$lang.new.po; then \
> ++ if { case `$(MSGMERGE) --version | sed 1q | sed -e 's,^[^0-9]*,,'` in \
> ++ '' | 0.[0-9] | 0.[0-9].* | 0.1[0-7] | 0.1[0-7].*) \
> ++ $(MSGMERGE) $(MSGMERGE_OPTIONS) -o $$tmpdir/$$lang.new.po $$lang.po $(DOMAIN).pot;; \
> ++ *) \
> ++ $(MSGMERGE) $(MSGMERGE_OPTIONS) --lang=$$lang -o $$tmpdir/$$lang.new.po $$lang.po $(DOMAIN).pot;; \
> ++ esac; \
> ++ }; then \
> + if cmp $$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \
> + rm -f $$tmpdir/$$lang.new.po; \
> + else \
> +@@ -421,9 +429,13 @@ $(DUMMYPOFILES):
> + update-gmo: Makefile $(GMOFILES)
> + @:
> +
> ++# Recreate Makefile by invoking config.status. Explicitly invoke the shell,
> ++# because execution permission bits may not work on the current file system.
> ++# Use @SHELL@, which is the shell determined by autoconf for the use by its
> ++# scripts, not $(SHELL) which is hardwired to /bin/sh and may be deficient.
> + Makefile: Makefile.in.in Makevars $(top_builddir)/config.status @POMAKEFILEDEPS@
> + cd $(top_builddir) \
> +- && $(SHELL) ./config.status $(subdir)/$@.in po-directories
> ++ && @SHELL@ ./config.status $(subdir)/$@.in po-directories
> +
> + force:
> +
> +diff -Nurp -x '*.o' -x '*.gmo' -x '*.po' -x '*~' gstreamer-0.10.28.org/po/Rules-quot gstreamer-0.10.28/po/Rules-quot
> +--- gstreamer-0.10.28.org/po/Rules-quot 2010-03-08 08:58:17.000000000 -0800
> ++++ gstreamer-0.10.28/po/Rules-quot 2010-05-22 08:37:16.941476173 -0700
> +@@ -20,7 +20,7 @@ en@boldquot.po-update: en@boldquot.po-up
> + ll=`echo $$lang | sed -e 's/@.*//'`; \
> + LC_ALL=C; export LC_ALL; \
> + cd $(srcdir); \
> +- if $(MSGINIT) -i $(DOMAIN).pot --no-translator -l $$ll -o - 2>/dev/null | sed -f $$tmpdir/$$lang.insert-header | $(MSGCONV) -t UTF-8 | $(MSGFILTER) sed -f `echo $$lang | sed -e 's/.*@//'`.sed 2>/dev/null > $$tmpdir/$$lang.new.po; then \
> ++ if $(MSGINIT) -i $(DOMAIN).pot --no-translator -l $$lang -o - 2>/dev/null | sed -f $$tmpdir/$$lang.insert-header | $(MSGCONV) -t UTF-8 | $(MSGFILTER) sed -f `echo $$lang | sed -e 's/.*@//'`.sed 2>/dev/null > $$tmpdir/$$lang.new.po; then \
> + if cmp $$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \
> + rm -f $$tmpdir/$$lang.new.po; \
> + else \
> +--- gstreamer-0.10.28.org/ChangeLog 2010-03-08 14:54:29.000000000 -0800
> ++++ gstreamer-0.10.28/ChangeLog 2010-05-22 09:06:29.863813510 -0700
> +@@ -1,3 +1,15 @@
> ++2010-05-22 Khem Raj <raj.khem@gmail.com>
> ++
> ++ * common/m4/gettext.m4: Upgrade to gettext-0.18.
> ++ * common/m4/iconv.m4: Upgrade to gettext-0.18.
> ++ * common/m4/lib-ld.m4: Upgrade to gettext-0.18.
> ++ * common/m4/lib-link.m4: Upgrade to gettext-0.18.
> ++ * common/m4/lib-prefix.m4: Upgrade to gettext-0.18.
> ++ * common/m4/nls.m4: Upgrade to gettext-0.18.
> ++ * common/m4/po.m4: Upgrade to gettext-0.18.
> ++ * common/m4/progtest.m4: Upgrade to gettext-0.18.
> ++ * configure.ac (AM_GNU_GETTEXT_VERSION): Bump to 0.18.
> ++
> + === release 0.10.28 ===
> +
> + 2010-03-08 Tim-Philipp Müller <tim.muller@collabora.co.uk>
> diff --git a/recipes/gstreamer/gstreamer_0.10.28.bb b/recipes/gstreamer/gstreamer_0.10.28.bb
> index c44646c..ababa47 100644
> --- a/recipes/gstreamer/gstreamer_0.10.28.bb
> +++ b/recipes/gstreamer/gstreamer_0.10.28.bb
> @@ -1,5 +1,10 @@
> require gstreamer.inc
>
> +PR = "r1"
> +
> +SRC_URI += "file://use-gettext-0.18.patch \
> + "
> +
> SRC_URI[archive.md5sum] = "1c7accac718fe211ff91323c27d4ae02"
> SRC_URI[archive.sha256sum] = "61613ec7574d22230e8cc893f91b66faec6b21288a22d2f21c9d9eeb7667eb2c"
>
> --
> 1.7.0.4
>
>
>
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
>
>
^ permalink raw reply [flat|nested] 45+ messages in thread
* Re: [PATCH 13/16] ncurses: Add -fforward-propagate on arm.
2010-06-02 20:34 ` [PATCH 13/16] ncurses: Add -fforward-propagate on arm Khem Raj
@ 2010-06-04 7:41 ` Martin Jansa
0 siblings, 0 replies; 45+ messages in thread
From: Martin Jansa @ 2010-06-04 7:41 UTC (permalink / raw)
To: openembedded-devel
On Wed, Jun 2, 2010 at 10:34 PM, Khem Raj <raj.khem@gmail.com> wrote:
> * Needed on -O1 compile. Generally we use -Os where
> this option is already enabled. But we enable is anyway
> so it gets picked at -O1 too which we use with DEBUG builds.
>
> Signed-off-by: Khem Raj <raj.khem@gmail.com>
Acked-by: Martin Jansa <Martin.Jansa@gmail.com>
> ---
> recipes/ncurses/ncurses.inc | 11 ++++++-----
> recipes/ncurses/ncurses_5.4.bb | 2 +-
> 2 files changed, 7 insertions(+), 6 deletions(-)
>
> diff --git a/recipes/ncurses/ncurses.inc b/recipes/ncurses/ncurses.inc
> index bfecfff..337d670 100644
> --- a/recipes/ncurses/ncurses.inc
> +++ b/recipes/ncurses/ncurses.inc
> @@ -30,6 +30,12 @@ export BUILD_CCFLAGS = "-I${S}/ncurses -I${S}/include ${BUILD_CFLAGS}"
> export BUILD_LDFLAGS = ""
> export EXTRA_OEMAKE = '"BUILD_LDFLAGS=" "BUILD_CCFLAGS=${BUILD_CCFLAGS}"'
>
> +# Below option is added to overcome the GCC bug on ARM
> +# see http://gcc.gnu.org/PR42981 for further details.
> +# We could potentially take it off when its fixed in gcc 4.5
> +
> +CFLAGS_append_arm = " -fforward-propagate "
> +
> # This is necessary so that the "tic" command executed during the install can
> # link with the correct libary in staging.
> export LD_LIBRARY_PATH = "${STAGING_LIBDIR_NATIVE}"
> @@ -70,16 +76,12 @@ do_install() {
> mv ${D}${bindir}/reset ${D}${bindir}/reset.${PN}
> fi
> }
> -
> -
> pkg_postinst_ncurses-tools () {
> if [ "${PN}" = "ncurses" ]; then
> update-alternatives --install ${bindir}/clear clear clear.${PN} 100
> update-alternatives --install ${bindir}/reset reset reset.${PN} 100
> fi
> }
> -
> -
> pkg_prerm_ncurses-tools () {
> if [ "${PN}" = "ncurses" ]; then
> update-alternatives --remove clear clear.${PN}
> @@ -110,7 +112,6 @@ FILES_${PN}-tools = "\
> FILES_${PN}-terminfo = "\
> ${datadir}/terminfo \
> "
> -
> RSUGGESTS_${PN} = "ncurses-terminfo"
> RPROVIDES_${PN} = "libncurses5"
> RCONFLICTS_${PN} = "libncurses5"
> diff --git a/recipes/ncurses/ncurses_5.4.bb b/recipes/ncurses/ncurses_5.4.bb
> index a6aed6d..8c0f62c 100644
> --- a/recipes/ncurses/ncurses_5.4.bb
> +++ b/recipes/ncurses/ncurses_5.4.bb
> @@ -1,4 +1,4 @@
> -PR = "r19"
> +PR = "r20"
>
> SRC_URI = "${GNU_MIRROR}/ncurses/ncurses-${PV}.tar.gz \
> file://makefile_tweak.patch \
> --
> 1.7.0.4
>
>
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
>
^ permalink raw reply [flat|nested] 45+ messages in thread
* Re: [PATCH 14/16] zlib.inc: Add -fforward-propagate on arm.
2010-06-02 20:34 ` [PATCH 14/16] zlib.inc: " Khem Raj
@ 2010-06-04 7:42 ` Martin Jansa
0 siblings, 0 replies; 45+ messages in thread
From: Martin Jansa @ 2010-06-04 7:42 UTC (permalink / raw)
To: openembedded-devel
On Wed, Jun 2, 2010 at 10:34 PM, Khem Raj <raj.khem@gmail.com> wrote:
> * Needed on -O1 compile. Generally we use -Os where
> this option is already enabled. But we enable is anyway
> so it gets picked at -O1 too which we use with DEBUG builds.
>
> Signed-off-by: Khem Raj <raj.khem@gmail.com>
Acked-by: Martin Jansa <Martin.Jansa@gmail.com>
> ---
> recipes/zlib/zlib.inc | 8 +++++++-
> 1 files changed, 7 insertions(+), 1 deletions(-)
>
> diff --git a/recipes/zlib/zlib.inc b/recipes/zlib/zlib.inc
> index 0f7bea0..5b00ccf 100644
> --- a/recipes/zlib/zlib.inc
> +++ b/recipes/zlib/zlib.inc
> @@ -3,7 +3,13 @@ SECTION = "libs"
> PRIORITY = "required"
> HOMEPAGE = "http://www.gzip.org/zlib/"
> LICENSE = "zlib"
> -INC_PR ="r6"
> +INC_PR ="r7"
> +
> +# Below option is added to overcome the GCC bug on ARM
> +# see http://gcc.gnu.org/PR42981 for further details.
> +# We could potentially take it off when its fixed in gcc 4.5
> +
> +CFLAGS_append_arm = " -fforward-propagate "
>
> BBCLASSEXTEND = "native sdk"
>
> --
> 1.7.0.4
>
>
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
>
^ permalink raw reply [flat|nested] 45+ messages in thread
* Re: [PATCH 15/16] libx11_1.3.2.bb: Add -fforward-propagate on arm.
2010-06-02 20:34 ` [PATCH 15/16] libx11_1.3.2.bb: " Khem Raj
@ 2010-06-04 7:42 ` Martin Jansa
0 siblings, 0 replies; 45+ messages in thread
From: Martin Jansa @ 2010-06-04 7:42 UTC (permalink / raw)
To: openembedded-devel
On Wed, Jun 2, 2010 at 10:34 PM, Khem Raj <raj.khem@gmail.com> wrote:
> * Needed on -O1 compile. Generally we use -Os where
> this option is already enabled. But we enable is anyway
> so it gets picked at -O1 too which we use with DEBUG builds.
>
> Signed-off-by: Khem Raj <raj.khem@gmail.com>
Acked-by: Martin Jansa <Martin.Jansa@gmail.com>
> ---
> recipes/xorg-lib/libx11_1.3.2.bb | 8 +++++++-
> 1 files changed, 7 insertions(+), 1 deletions(-)
>
> diff --git a/recipes/xorg-lib/libx11_1.3.2.bb b/recipes/xorg-lib/libx11_1.3.2.bb
> index 855dfa2..291486b 100644
> --- a/recipes/xorg-lib/libx11_1.3.2.bb
> +++ b/recipes/xorg-lib/libx11_1.3.2.bb
> @@ -5,7 +5,7 @@ DEPENDS += "bigreqsproto xproto xextproto xtrans libxau xcmiscproto \
> libxdmcp xf86bigfontproto kbproto inputproto xproto-native"
> PROVIDES = "virtual/libx11"
> PE = "1"
> -PR = "r3"
> +PR = "r4"
>
> XORG_PN = "libX11"
>
> @@ -15,6 +15,12 @@ SRC_URI += "file://x11_disable_makekeys.1.6.3.patch \
>
> EXTRA_OECONF += "--without-xcb --with-keysymdef=${STAGING_INCDIR}/X11/keysymdef.h"
>
> +# Below option is added to overcome the GCC bug on ARM
> +# see http://gcc.gnu.org/PR42981 for further details.
> +# We could potentially take it off when its fixed in gcc 4.5
> +
> +CFLAGS_append_arm = " -fforward-propagate "
> +
> do_compile() {
> (
> unset CC LD CXX CCLD CFLAGS CPPFLAGS LDFLAGS CXXFLAGS
> --
> 1.7.0.4
>
>
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
>
^ permalink raw reply [flat|nested] 45+ messages in thread
* Re: [PATCH 00/16] Upgrade gettext, GNU utilities, fix general build issues with uclibc distros.
2010-06-02 20:34 [PATCH 00/16] Upgrade gettext, GNU utilities, fix general build issues with uclibc distros Khem Raj
` (15 preceding siblings ...)
2010-06-02 20:34 ` [PATCH 16/16] shadow_4.1.4.2.bb: add --with-nscd=no when compiling for uclibc Khem Raj
@ 2010-06-04 7:45 ` Martin Jansa
2010-06-05 18:15 ` Koen Kooi
17 siblings, 0 replies; 45+ messages in thread
From: Martin Jansa @ 2010-06-04 7:45 UTC (permalink / raw)
To: openembedded-devel
On Wed, Jun 2, 2010 at 10:34 PM, Khem Raj <raj.khem@gmail.com> wrote:
> Hi
>
> These patches are for three things mainly.
>
> 1. Upgrade to gettext 0.18
> 3. General gnu utilities updates
> 4. uclibc based distro builds
>
> I have tested several images for qemu based machines
> mainly qemuarm and qemux86
>
> Please provide feedback
I've tested all in last build from scratch for armv4t (om-gta02) and
armv5te (spitz), both with eglibc. Works OK, ACKed (except 16/16
because I don't use uclibc - but looks ok too).
Regards,
^ permalink raw reply [flat|nested] 45+ messages in thread
* Re: [PATCH 03/16] gettext-0.18: Add recipe for 0.18
2010-06-04 7:37 ` Martin Jansa
@ 2010-06-04 9:41 ` Martin Jansa
2010-06-04 9:49 ` Koen Kooi
0 siblings, 1 reply; 45+ messages in thread
From: Martin Jansa @ 2010-06-04 9:41 UTC (permalink / raw)
To: openembedded-devel
On Fri, Jun 4, 2010 at 9:37 AM, Martin Jansa <martin.jansa@gmail.com> wrote:
> On Wed, Jun 2, 2010 at 10:34 PM, Khem Raj <raj.khem@gmail.com> wrote:
>> * gl_cv_func_unsetenv_works is not computed correctly in cross
>> environment so cache it.
>>
>> Signed-off-by: Khem Raj <raj.khem@gmail.com>
>
> Acked-by: Martin Jansa <Martin.Jansa@gmail.com>
I've forgotten to add that it needs automake-1.11 and
angstrom-2008-preferred-versions.inc is locking older version
PREFERRED_VERSION_automake-native = "1.10.3" - maybe not need anymore?
Regards,
^ permalink raw reply [flat|nested] 45+ messages in thread
* Re: [PATCH 03/16] gettext-0.18: Add recipe for 0.18
2010-06-04 9:41 ` Martin Jansa
@ 2010-06-04 9:49 ` Koen Kooi
0 siblings, 0 replies; 45+ messages in thread
From: Koen Kooi @ 2010-06-04 9:49 UTC (permalink / raw)
To: openembedded-devel
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
On 04-06-10 11:41, Martin Jansa wrote:
> On Fri, Jun 4, 2010 at 9:37 AM, Martin Jansa <martin.jansa@gmail.com> wrote:
>> On Wed, Jun 2, 2010 at 10:34 PM, Khem Raj <raj.khem@gmail.com> wrote:
>>> * gl_cv_func_unsetenv_works is not computed correctly in cross
>>> environment so cache it.
>>>
>>> Signed-off-by: Khem Raj <raj.khem@gmail.com>
>>
>> Acked-by: Martin Jansa <Martin.Jansa@gmail.com>
>
> I've forgotten to add that it needs automake-1.11 and
> angstrom-2008-preferred-versions.inc is locking older version
> PREFERRED_VERSION_automake-native = "1.10.3" - maybe not need anymore?
I'm not a big fan of bumping such basic toolchain bits, but fortunately
Graeme and I have already tested 1.11 and found it to be safe for the
important bits we build, so I guess angstrom can move to 1.11 if needed.
regards,
Koen
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)
iD8DBQFMCMwZMkyGM64RGpERAlX/AJ9KGlCl6LCXWVvf2U9QTH8odwgYRgCffApp
K6tQDNl9VsJFZFZ00GOlA4k=
=X0X/
-----END PGP SIGNATURE-----
^ permalink raw reply [flat|nested] 45+ messages in thread
* Re: [PATCH 00/16] Upgrade gettext, GNU utilities, fix general build issues with uclibc distros.
2010-06-02 20:34 [PATCH 00/16] Upgrade gettext, GNU utilities, fix general build issues with uclibc distros Khem Raj
` (16 preceding siblings ...)
2010-06-04 7:45 ` [PATCH 00/16] Upgrade gettext, GNU utilities, fix general build issues with uclibc distros Martin Jansa
@ 2010-06-05 18:15 ` Koen Kooi
17 siblings, 0 replies; 45+ messages in thread
From: Koen Kooi @ 2010-06-05 18:15 UTC (permalink / raw)
To: openembedded-devel
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
On 02-06-10 22:34, Khem Raj wrote:
> Hi
>
> These patches are for three things mainly.
>
> 1. Upgrade to gettext 0.18
> 3. General gnu utilities updates
> 4. uclibc based distro builds
>
> I have tested several images for qemu based machines
> mainly qemuarm and qemux86
>
> Please provide feedback
FWIW, on a existing build tree
http://cgit.openembedded.org/cgit.cgi/openembedded/commit/?id=f8f9419d7177642540d5af366fb6eb3cfedb9e5b
isn't enough, I had to delete /tmp to make things work again.
That isn't a problem, since changing gettext and automake pretty much
requires rebuilding everything.
regards,
Koen
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)
iD8DBQFMCpQpMkyGM64RGpERAm4GAJ9rlUig2nmIMKNj1+DuuBlpDDbiVQCgtxnR
1NzdwfJNI1AUPkwVf9gL+4s=
=Ktnh
-----END PGP SIGNATURE-----
^ permalink raw reply [flat|nested] 45+ messages in thread
* Re: [PATCH 07/16] grep-2.6.3: Add recipe.
2010-06-04 7:39 ` Martin Jansa
@ 2010-06-07 7:35 ` Jan Paesmans
2010-06-07 14:11 ` Khem Raj
0 siblings, 1 reply; 45+ messages in thread
From: Jan Paesmans @ 2010-06-07 7:35 UTC (permalink / raw)
To: openembedded-devel
Hi,
I was having problems with building grep both native and for target on
our build system.
Seems that there is a dependency missing on gettext. Adding gettext to
the inherit directive solves the build failure.
Regards,
Jan
On Fri, Jun 4, 2010 at 9:39 AM, Martin Jansa <martin.jansa@gmail.com> wrote:
> On Wed, Jun 2, 2010 at 10:34 PM, Khem Raj <raj.khem@gmail.com> wrote:
>> * Fix build for uclibc as well.
>>
>> Signed-off-by: Khem Raj <raj.khem@gmail.com>
>
> Acked-by: Martin Jansa <Martin.Jansa@gmail.com>
>
>> ---
>> recipes/grep/grep-2.6.3/uclibc-fix.patch | 50 ++++++++++++++++++++++++++++++
>> recipes/grep/grep_2.6.3.bb | 47 ++++++++++++++++++++++++++++
>> 2 files changed, 97 insertions(+), 0 deletions(-)
>> create mode 100644 recipes/grep/grep-2.6.3/uclibc-fix.patch
>> create mode 100644 recipes/grep/grep_2.6.3.bb
>>
>> diff --git a/recipes/grep/grep-2.6.3/uclibc-fix.patch b/recipes/grep/grep-2.6.3/uclibc-fix.patch
>> new file mode 100644
>> index 0000000..2e1c584
>> --- /dev/null
>> +++ b/recipes/grep/grep-2.6.3/uclibc-fix.patch
>> @@ -0,0 +1,50 @@
>> +Fix to use mempcpy instead of __mempcpy. This is needed for uclibc which
>> +doesn't define __mempcpy only mempcpy. Since both uclibc and glibc have
>> +mempcpy we'll just use that instead.
>> +
>> +Index: grep-2.6.3/lib/getopt.c
>> +===================================================================
>> +--- grep-2.6.3.orig/lib/getopt.c 2010-03-21 00:34:02.000000000 -0700
>> ++++ grep-2.6.3/lib/getopt.c 2010-05-22 21:37:11.352740539 -0700
>> +@@ -41,6 +41,10 @@
>> + # include <wchar.h>
>> + #endif
>> +
>> ++#ifdef __UCLIBC__
>> ++#define __mempcpy mempcpy
>> ++#endif
>> ++
>> + /* This version of `getopt' appears to the caller like standard Unix `getopt'
>> + but it behaves differently for the user, since it allows the user
>> + to intersperse the options with the other arguments.
>> +Index: grep-2.6.3/gnulib-tests/setenv.c
>> +===================================================================
>> +--- grep-2.6.3.orig/gnulib-tests/setenv.c 2010-05-22 21:37:53.655168151 -0700
>> ++++ grep-2.6.3/gnulib-tests/setenv.c 2010-05-22 21:38:42.792745476 -0700
>> +@@ -68,6 +68,10 @@ __libc_lock_define_initialized (static,
>> + # define tsearch __tsearch
>> + #endif
>> +
>> ++#ifdef __UCLIBC__
>> ++#define __mempcpy mempcpy
>> ++#endif
>> ++
>> + /* In the GNU C library implementation we try to be more clever and
>> + allow arbitrarily many changes of the environment given that the used
>> + values are from a small set. Outside glibc this will eat up all
>> +Index: grep-2.6.3/lib/regexec.c
>> +===================================================================
>> +--- grep-2.6.3.orig/lib/regexec.c 2010-05-22 21:36:02.655154671 -0700
>> ++++ grep-2.6.3/lib/regexec.c 2010-05-22 21:37:26.212743273 -0700
>> +@@ -22,6 +22,11 @@
>> +
>> + #include "verify.h"
>> + #include "intprops.h"
>> ++
>> ++#ifdef __UCLIBC__
>> ++#define __mempcpy mempcpy
>> ++#endif
>> ++
>> + static reg_errcode_t match_ctx_init (re_match_context_t *cache, int eflags,
>> + Idx n) internal_function;
>> + static void match_ctx_clean (re_match_context_t *mctx) internal_function;
>> diff --git a/recipes/grep/grep_2.6.3.bb b/recipes/grep/grep_2.6.3.bb
>> new file mode 100644
>> index 0000000..c887ca0
>> --- /dev/null
>> +++ b/recipes/grep/grep_2.6.3.bb
>> @@ -0,0 +1,47 @@
>> +LICENSE = "GPL"
>> +SECTION = "console/utils"
>> +DESCRIPTION = "grep GNU utility"
>> +PR = "r0"
>> +
>> +SRC_URI = "${GNU_MIRROR}/grep/grep-${PV}.tar.xz \
>> + file://uclibc-fix.patch"
>> +
>> +inherit autotools
>> +
>> +EXTRA_OECONF = "--disable-perl-regexp --disable-ncurses"
>> +EXTRA_OECONF_virtclass-native = "--with-included-regex --disable-ncurses"
>> +
>> +do_configure () {
>> + rm -f ${S}/m4/init.m4
>> + autotools_do_configure
>> +}
>> +
>> +do_install () {
>> + autotools_do_install
>> + install -d ${D}${base_bindir}
>> + mv ${D}${bindir}/grep ${D}${base_bindir}/grep.${PN}
>> + mv ${D}${bindir}/egrep ${D}${base_bindir}/egrep.${PN}
>> + mv ${D}${bindir}/fgrep ${D}${base_bindir}/fgrep.${PN}
>> +}
>> +
>> +do_install_virtclass-native () {
>> + autotools_do_install
>> +}
>> +
>> +pkg_postinst_${PN} () {
>> + update-alternatives --install ${base_bindir}/grep grep grep.${PN} 100
>> + update-alternatives --install ${base_bindir}/egrep egrep egrep.${PN} 100
>> + update-alternatives --install ${base_bindir}/fgrep fgrep fgrep.${PN} 100
>> +}
>> +
>> +pkg_prerm_${PN} () {
>> + update-alternatives --remove grep grep.${PN}
>> + update-alternatives --remove egrep egrep.${PN}
>> + update-alternatives --remove fgrep fgrep.${PN}
>> +}
>> +
>> +BBCLASSEXTEND = "native"
>> +
>> +SRC_URI[md5sum] = "69a3bf508a3f14d12369e0e1c7a92763"
>> +SRC_URI[sha256sum] = "ba745e2ff297ab225bf870740d35593d402a1d92999cf0d7e56840f10218db7c"
>> +
>> --
>> 1.7.0.4
>>
>>
>> _______________________________________________
>> Openembedded-devel mailing list
>> Openembedded-devel@lists.openembedded.org
>> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
>>
>
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
>
^ permalink raw reply [flat|nested] 45+ messages in thread
* Re: [PATCH 07/16] grep-2.6.3: Add recipe.
2010-06-07 7:35 ` Jan Paesmans
@ 2010-06-07 14:11 ` Khem Raj
2010-06-07 14:19 ` Jan Paesmans
0 siblings, 1 reply; 45+ messages in thread
From: Khem Raj @ 2010-06-07 14:11 UTC (permalink / raw)
To: Jan Paesmans; +Cc: openembedded-devel
On (07/06/10 09:35), Jan Paesmans wrote:
> Hi,
> I was having problems with building grep both native and for target on
> our build system.
> Seems that there is a dependency missing on gettext. Adding gettext to
> the inherit directive solves the build failure.
thanks for report. I will test a fix today.
-Khem
^ permalink raw reply [flat|nested] 45+ messages in thread
* Re: [PATCH 07/16] grep-2.6.3: Add recipe.
2010-06-07 14:11 ` Khem Raj
@ 2010-06-07 14:19 ` Jan Paesmans
2010-06-07 14:22 ` Jan Paesmans
0 siblings, 1 reply; 45+ messages in thread
From: Jan Paesmans @ 2010-06-07 14:19 UTC (permalink / raw)
To: Khem Raj; +Cc: openembedded-devel
Hi Khem,
Updated to latest org.openembedded.dev and tried building the latest
grep-native.
I added the inherit to gettext but there seems to be something wrong.
The new grep bb file needs xz-native.
It is specified in the dependencies but for some reason bitbake
doesn't take the dependency into account and grep-native fails with a
missing xz.
First running 'bitbake xz-native' by hand and then running 'bitbake
grep-native' succeeds.
This indicates that xz-native is indeed the correct dependency but for
some reason it is not taken into account.
Regards, Jan
On Mon, Jun 7, 2010 at 4:11 PM, Khem Raj <raj.khem@gmail.com> wrote:
> On (07/06/10 09:35), Jan Paesmans wrote:
>> Hi,
>> I was having problems with building grep both native and for target on
>> our build system.
>> Seems that there is a dependency missing on gettext. Adding gettext to
>> the inherit directive solves the build failure.
>
> thanks for report. I will test a fix today.
> -Khem
>
^ permalink raw reply [flat|nested] 45+ messages in thread
* Re: [PATCH 07/16] grep-2.6.3: Add recipe.
2010-06-07 14:19 ` Jan Paesmans
@ 2010-06-07 14:22 ` Jan Paesmans
2010-06-07 17:14 ` Bernhard Reutner-Fischer
0 siblings, 1 reply; 45+ messages in thread
From: Jan Paesmans @ 2010-06-07 14:22 UTC (permalink / raw)
To: Khem Raj; +Cc: openembedded-devel
Hi Khem,
Just a wild and stupid idea, could it be that bitbake doesn't take
dependencies into account for unpacking the source?
Regards,
Jan
On Mon, Jun 7, 2010 at 4:19 PM, Jan Paesmans <jan.paesmans@gmail.com> wrote:
> Hi Khem,
>
> Updated to latest org.openembedded.dev and tried building the latest
> grep-native.
> I added the inherit to gettext but there seems to be something wrong.
> The new grep bb file needs xz-native.
> It is specified in the dependencies but for some reason bitbake
> doesn't take the dependency into account and grep-native fails with a
> missing xz.
> First running 'bitbake xz-native' by hand and then running 'bitbake
> grep-native' succeeds.
> This indicates that xz-native is indeed the correct dependency but for
> some reason it is not taken into account.
>
> Regards, Jan
>
> On Mon, Jun 7, 2010 at 4:11 PM, Khem Raj <raj.khem@gmail.com> wrote:
>> On (07/06/10 09:35), Jan Paesmans wrote:
>>> Hi,
>>> I was having problems with building grep both native and for target on
>>> our build system.
>>> Seems that there is a dependency missing on gettext. Adding gettext to
>>> the inherit directive solves the build failure.
>>
>> thanks for report. I will test a fix today.
>> -Khem
>>
>
^ permalink raw reply [flat|nested] 45+ messages in thread
* Re: [PATCH 07/16] grep-2.6.3: Add recipe.
2010-06-07 14:22 ` Jan Paesmans
@ 2010-06-07 17:14 ` Bernhard Reutner-Fischer
0 siblings, 0 replies; 45+ messages in thread
From: Bernhard Reutner-Fischer @ 2010-06-07 17:14 UTC (permalink / raw)
To: openembedded-devel
On Mon, Jun 07, 2010 at 04:22:54PM +0200, Jan Paesmans wrote:
>Hi Khem,
>
>Just a wild and stupid idea, could it be that bitbake doesn't take
>dependencies into account for unpacking the source?
unpackers are completely ignored. Look at the default depends:
virtual/coreutils, shasum, stagemanager
Missing feature (and a can of worms, dependency wise; you end up with a
somewhat sane set iff you rely on the unpacker e.g. xz being pre-configured,
autotools-wise. Don't try to use xz_git for such stuff, believe me ;).
>Regards,
>
>Jan
>
>On Mon, Jun 7, 2010 at 4:19 PM, Jan Paesmans <jan.paesmans@gmail.com> wrote:
>> Hi Khem,
>>
>> Updated to latest org.openembedded.dev and tried building the latest
>> grep-native.
>> I added the inherit to gettext but there seems to be something wrong.
>> The new grep bb file needs xz-native.
>> It is specified in the dependencies but for some reason bitbake
>> doesn't take the dependency into account and grep-native fails with a
>> missing xz.
>> First running 'bitbake xz-native' by hand and then running 'bitbake
>> grep-native' succeeds.
>> This indicates that xz-native is indeed the correct dependency but for
>> some reason it is not taken into account.
>>
>> Regards, Jan
>>
>> On Mon, Jun 7, 2010 at 4:11 PM, Khem Raj <raj.khem@gmail.com> wrote:
>>> On (07/06/10 09:35), Jan Paesmans wrote:
>>>> Hi,
>>>> I was having problems with building grep both native and for target on
>>>> our build system.
>>>> Seems that there is a dependency missing on gettext. Adding gettext to
>>>> the inherit directive solves the build failure.
>>>
>>> thanks for report. I will test a fix today.
>>> -Khem
>>>
>>
>
>_______________________________________________
>Openembedded-devel mailing list
>Openembedded-devel@lists.openembedded.org
>http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
^ permalink raw reply [flat|nested] 45+ messages in thread
* Re: [PATCH 06/16] db_5.0.21: Add recipes for target and native packages.
2010-06-04 7:38 ` Martin Jansa
@ 2010-06-08 19:53 ` Jan Paesmans
2010-06-08 21:14 ` Khem Raj
0 siblings, 1 reply; 45+ messages in thread
From: Jan Paesmans @ 2010-06-08 19:53 UTC (permalink / raw)
To: openembedded-devel
On 06/04/2010 09:38 AM, Martin Jansa wrote:
> On Fri, Jun 4, 2010 at 2:29 AM, Khem Raj <raj.khem@gmail.com> wrote:
>> On (02/06/10 22:41), Koen Kooi wrote:
> On 02-06-10 22:34, Khem Raj wrote:
> >>>> * Get rid of old style staging.
> >>>>
> >>>> Signed-off-by: Khem Raj <raj.khem@gmail.com>
> >>>> ---
> >>>> recipes/db/db-native_4.2.52.bb | 1 -
> >>>> recipes/db/db-native_5.0.21.bb | 2 +
>
> Can these get converted to BBCLASSEXTEND?
> >>
> >> Yes. I have intended to do that afterwards
>
> > Then
>
> > Acked-by: Martin Jansa <Martin.Jansa@gmail.com>
>
> >>
>
> regards,
>
> Koen
Sorry to be the bearer of bad news, but libpam_1.1.0.bb doesn't like
this new berkley db.
Got compile errors on module/pam_userdb.c, anything related to dbm_...
functions that return and assign a value. As far as I can tell from the
source of db.h there is a define missing: HAVE_DBM. Adding this to the
compile line: -DHAVE_DBM=1 makes it compile fine but I haven't found
where to set it from the configure flags and if indeed this is the
correct thing to do.
For now, might I suggest a DEFAULT_PREFERENCE = "-1" to be added to
db_5.0.21.bb.
Regards,
Jan
^ permalink raw reply [flat|nested] 45+ messages in thread
* Re: [PATCH 06/16] db_5.0.21: Add recipes for target and native packages.
2010-06-08 19:53 ` Jan Paesmans
@ 2010-06-08 21:14 ` Khem Raj
0 siblings, 0 replies; 45+ messages in thread
From: Khem Raj @ 2010-06-08 21:14 UTC (permalink / raw)
To: openembedded-devel
On Tue, Jun 8, 2010 at 12:53 PM, Jan Paesmans <jan.paesmans@gmail.com> wrote:
> On 06/04/2010 09:38 AM, Martin Jansa wrote:
>> On Fri, Jun 4, 2010 at 2:29 AM, Khem Raj <raj.khem@gmail.com> wrote:
>>> On (02/06/10 22:41), Koen Kooi wrote:
>> On 02-06-10 22:34, Khem Raj wrote:
>> >>>> * Get rid of old style staging.
>> >>>>
>> >>>> Signed-off-by: Khem Raj <raj.khem@gmail.com>
>> >>>> ---
>> >>>> recipes/db/db-native_4.2.52.bb | 1 -
>> >>>> recipes/db/db-native_5.0.21.bb | 2 +
>>
>> Can these get converted to BBCLASSEXTEND?
>> >>
>> >> Yes. I have intended to do that afterwards
>>
>> > Then
>>
>> > Acked-by: Martin Jansa <Martin.Jansa@gmail.com>
>>
>> >>
>>
>> regards,
>>
>> Koen
> Sorry to be the bearer of bad news, but libpam_1.1.0.bb doesn't like
> this new berkley db.
> Got compile errors on module/pam_userdb.c, anything related to dbm_...
> functions that return and assign a value. As far as I can tell from the
> source of db.h there is a define missing: HAVE_DBM. Adding this to the
> compile line: -DHAVE_DBM=1 makes it compile fine but I haven't found
> where to set it from the configure flags and if indeed this is the
> correct thing to do.
> For now, might I suggest a DEFAULT_PREFERENCE = "-1" to be added to
> db_5.0.21.bb.
I have hit into this problem I am in process of patching pam.
>
> Regards,
>
> Jan
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
>
^ permalink raw reply [flat|nested] 45+ messages in thread
end of thread, other threads:[~2010-06-08 21:18 UTC | newest]
Thread overview: 45+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2010-06-02 20:34 [PATCH 00/16] Upgrade gettext, GNU utilities, fix general build issues with uclibc distros Khem Raj
2010-06-02 20:34 ` [PATCH 01/16] classes/autotools.bbclass: Dont bail out if gettext/config.rpath does not exist Khem Raj
2010-06-04 7:35 ` Martin Jansa
2010-06-02 20:34 ` [PATCH 02/16] classes/gettext.bbclass: Account for libiconv and libintl too Khem Raj
2010-06-04 7:36 ` Martin Jansa
2010-06-02 20:34 ` [PATCH 03/16] gettext-0.18: Add recipe for 0.18 Khem Raj
2010-06-04 7:37 ` Martin Jansa
2010-06-04 9:41 ` Martin Jansa
2010-06-04 9:49 ` Koen Kooi
2010-06-02 20:34 ` [PATCH 04/16] coreutils-8.5: Add recipes for version 8.5 Khem Raj
2010-06-04 7:37 ` Martin Jansa
2010-06-02 20:34 ` [PATCH 05/16] libiconv-1.13.1: Add recipes Khem Raj
2010-06-04 7:38 ` Martin Jansa
2010-06-02 20:34 ` [PATCH 06/16] db_5.0.21: Add recipes for target and native packages Khem Raj
2010-06-02 20:41 ` Koen Kooi
2010-06-04 0:29 ` Khem Raj
2010-06-04 7:38 ` Martin Jansa
2010-06-08 19:53 ` Jan Paesmans
2010-06-08 21:14 ` Khem Raj
2010-06-02 20:34 ` [PATCH 07/16] grep-2.6.3: Add recipe Khem Raj
2010-06-04 7:39 ` Martin Jansa
2010-06-07 7:35 ` Jan Paesmans
2010-06-07 14:11 ` Khem Raj
2010-06-07 14:19 ` Jan Paesmans
2010-06-07 14:22 ` Jan Paesmans
2010-06-07 17:14 ` Bernhard Reutner-Fischer
2010-06-02 20:34 ` [PATCH 08/16] glib-2.0_2.24.0.bb: Remove virtual/libiconv virtual/libintl from DEPENDS Khem Raj
2010-06-04 7:39 ` Martin Jansa
2010-06-02 20:34 ` [PATCH 09/16] gnutls_2.8.6.bb: Add recipe for version 2.8.6 Khem Raj
2010-06-04 7:40 ` Martin Jansa
2010-06-02 20:34 ` [PATCH 10/16] inetutils_1.8.bb: Add recipe Khem Raj
2010-06-04 7:40 ` Martin Jansa
2010-06-02 20:34 ` [PATCH 11/16] findutils_4.5.9.bb: " Khem Raj
2010-06-04 7:41 ` Martin Jansa
2010-06-02 20:34 ` [PATCH 12/16] gstreamer_0.10.28.bb: Fix to build with gettext 0.18 Khem Raj
2010-06-04 7:41 ` Martin Jansa
2010-06-02 20:34 ` [PATCH 13/16] ncurses: Add -fforward-propagate on arm Khem Raj
2010-06-04 7:41 ` Martin Jansa
2010-06-02 20:34 ` [PATCH 14/16] zlib.inc: " Khem Raj
2010-06-04 7:42 ` Martin Jansa
2010-06-02 20:34 ` [PATCH 15/16] libx11_1.3.2.bb: " Khem Raj
2010-06-04 7:42 ` Martin Jansa
2010-06-02 20:34 ` [PATCH 16/16] shadow_4.1.4.2.bb: add --with-nscd=no when compiling for uclibc Khem Raj
2010-06-04 7:45 ` [PATCH 00/16] Upgrade gettext, GNU utilities, fix general build issues with uclibc distros Martin Jansa
2010-06-05 18:15 ` Koen Kooi
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.