* [Buildroot] [PATCH] gettext: bump to version 0.18.1.1
@ 2012-12-13 20:02 Gustavo Zacarias
2012-12-14 11:02 ` Peter Korsgaard
0 siblings, 1 reply; 7+ messages in thread
From: Gustavo Zacarias @ 2012-12-13 20:02 UTC (permalink / raw)
To: buildroot
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
package/gettext/Config.in | 3 +
package/gettext/gettext-disable-tests.patch | 37 -----
.../gettext/gettext-uclibc-sched_param-def.patch | 20 +++
package/gettext/gettext.mk | 12 ++-
package/gettext/libdir-la.patch | 154 --------------------
5 files changed, 34 insertions(+), 192 deletions(-)
delete mode 100644 package/gettext/gettext-disable-tests.patch
create mode 100644 package/gettext/gettext-uclibc-sched_param-def.patch
delete mode 100644 package/gettext/libdir-la.patch
diff --git a/package/gettext/Config.in b/package/gettext/Config.in
index ee7d8cb..a97b835 100644
--- a/package/gettext/Config.in
+++ b/package/gettext/Config.in
@@ -16,6 +16,9 @@ config BR2_PACKAGE_GETTEXT
config BR2_PACKAGE_GETTEXT_TOOLS
bool "Install gettext tools"
depends on BR2_PACKAGE_GETTEXT
+ depends on BR2_USE_MMU # fork()
+ depends on BR2_LARGEFILE
+ select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE
help
This option allows to install the complete gettext suite in
the target filesystem. This is typically not useful for
diff --git a/package/gettext/gettext-disable-tests.patch b/package/gettext/gettext-disable-tests.patch
deleted file mode 100644
index eded261..0000000
--- a/package/gettext/gettext-disable-tests.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-Disable gettext tests that require threads
-
-gettext fails to build with a toolchain with no threads support just
-because some gettext tests (that aren't used in Buildroot) require
-threads. We therefore disable the build of such tests.
-
-Since the change in Makefile.in is simple, we also make it in this
-patch, which avoids the need to autoreconf the gettext package.
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-
-Index: b/gettext-tools/Makefile.am
-===================================================================
---- a/gettext-tools/Makefile.am
-+++ b/gettext-tools/Makefile.am
-@@ -20,7 +20,7 @@
- AUTOMAKE_OPTIONS = 1.5 gnu no-dependencies
- ACLOCAL_AMFLAGS = -I m4 -I ../gettext-runtime/m4 -I ../autoconf-lib-link/m4 -I ../m4 -I gnulib-m4 -I libgettextpo/gnulib-m4
-
--SUBDIRS = doc intl gnulib-lib libgrep libuniname src libgettextpo po projects misc man m4 tests examples
-+SUBDIRS = doc intl gnulib-lib libgrep libuniname src libgettextpo po projects misc man m4 examples
-
- EXTRA_DIST = misc/DISCLAIM
- MOSTLYCLEANFILES = core *.stackdump
-Index: b/gettext-tools/Makefile.in
-===================================================================
---- a/gettext-tools/Makefile.in
-+++ b/gettext-tools/Makefile.in
-@@ -484,7 +484,7 @@
- top_srcdir = @top_srcdir@
- AUTOMAKE_OPTIONS = 1.5 gnu no-dependencies
- ACLOCAL_AMFLAGS = -I m4 -I ../gettext-runtime/m4 -I ../autoconf-lib-link/m4 -I ../m4 -I gnulib-m4 -I libgettextpo/gnulib-m4
--SUBDIRS = doc intl gnulib-lib libgrep libuniname src libgettextpo po projects misc man m4 tests examples
-+SUBDIRS = doc intl gnulib-lib libgrep libuniname src libgettextpo po projects misc man m4 examples
-
- # Allow users to use "gnulib-tool --update".
-
diff --git a/package/gettext/gettext-uclibc-sched_param-def.patch b/package/gettext/gettext-uclibc-sched_param-def.patch
new file mode 100644
index 0000000..4e39278
--- /dev/null
+++ b/package/gettext/gettext-uclibc-sched_param-def.patch
@@ -0,0 +1,20 @@
+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
+
+http://bugs.gentoo.org/336484
+http://bugs.gentoo.org/323377
+
+--- gettext/gettext-tools/gnulib-lib/spawn.in.h
++++ gettext/gettext-tools/gnulib-lib/spawn.in.h
+@@ -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/package/gettext/gettext.mk b/package/gettext/gettext.mk
index 74f5218..77881d3 100644
--- a/package/gettext/gettext.mk
+++ b/package/gettext/gettext.mk
@@ -3,14 +3,18 @@
# gettext
#
#############################################################
-GETTEXT_VERSION = 0.16.1
+
+GETTEXT_VERSION = 0.18.1.1
GETTEXT_SITE = $(BR2_GNU_MIRROR)/gettext
GETTEXT_INSTALL_STAGING = YES
GETTEXT_LICENSE = GPLv2+
GETTEXT_LICENSE_FILES = COPYING
+GETTEXT_DEPENDENCIES = $(if $(BR2_PACKAGE_LIBICONV),libiconv)
+
GETTEXT_CONF_OPT += \
--disable-libasprintf \
+ --disable-acl \
--disable-openmp \
--disable-rpath \
--disable-java \
@@ -34,6 +38,12 @@ ifeq ($(BR2_PACKAGE_GETTEXT_TOOLS),)
define GETTEXT_INSTALL_TARGET_CMDS
cp -dpf $(STAGING_DIR)/usr/lib/libintl*.so* $(TARGET_DIR)/usr/lib/
endef
+# Ditch the tools since they're off and pull other dependencies
+define GETTEXT_DISABLE_TOOLS
+ $(SED) 's/runtime gettext-tools/runtime/' $(@D)/Makefile.in
+endef
endif # GETTEXT_TOOLS = n
+GETTEXT_POST_PATCH_HOOKS += GETTEXT_DISABLE_TOOLS
+
$(eval $(autotools-package))
diff --git a/package/gettext/libdir-la.patch b/package/gettext/libdir-la.patch
deleted file mode 100644
index d5076c1..0000000
--- a/package/gettext/libdir-la.patch
+++ /dev/null
@@ -1,154 +0,0 @@
---- gettext-0.14.6/autoconf-lib-link/build-aux/ltmain.sh.orig 2007-01-13 14:33:23.000000000 -0700
-+++ gettext-0.14.6/autoconf-lib-link/build-aux/ltmain.sh 2007-01-13 14:35:10.000000000 -0700
-@@ -234,8 +234,9 @@
- # line option must be used.
- if test -z "$tagname"; then
- $echo "$modename: unable to infer tagged configuration"
-- $echo "$modename: specify a tag with \`--tag'" 1>&2
-- exit $EXIT_FAILURE
-+ $echo "$modename: defaulting to \`CC'"
-+ $echo "$modename: if this is not correct, specify a tag with \`--tag'"
-+# exit $EXIT_FAILURE
- # else
- # $echo "$modename: using $tagname tagged configuration"
- fi
-@@ -2324,8 +2325,14 @@
- absdir="$abs_ladir"
- libdir="$abs_ladir"
- else
-- dir="$libdir"
-- absdir="$libdir"
-+ # Adding 'libdir' from the .la file to our library search paths
-+ # breaks crosscompilation horribly. We cheat here and don't add
-+ # it, instead adding the path where we found the .la. -CL
-+ dir="$abs_ladir"
-+ absdir="$abs_ladir"
-+ libdir="$abs_ladir"
-+ #dir="$libdir"
-+ #absdir="$libdir"
- fi
- test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes
- else
-@@ -2800,6 +2807,16 @@
- esac
- if grep "^installed=no" $deplib > /dev/null; then
- path="$absdir/$objdir"
-+# This interferes with crosscompilation. -CL
-+# else
-+# eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
-+# if test -z "$libdir"; then
-+# $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2
-+# exit 1
-+# fi
-+# if test "$absdir" != "$libdir"; then
-+# $echo "$modename: warning: \`$deplib' seems to be moved" 1>&2
-+# fi
- else
- eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
- if test -z "$libdir"; then
-@@ -5210,6 +5227,10 @@
- # Replace all uninstalled libtool libraries with the installed ones
- newdependency_libs=
- for deplib in $dependency_libs; do
-+ # Replacing uninstalled with installed can easily break crosscompilation,
-+ # since the installed path is generally the wrong architecture. -CL
-+ newdependency_libs="$newdependency_libs $deplib"
-+ continue
- case $deplib in
- *.la)
- name=`$echo "X$deplib" | $Xsed -e 's%^.*/%%'`
-@@ -5528,10 +5549,13 @@
- # At present, this check doesn't affect windows .dll's that
- # are installed into $libdir/../bin (currently, that works fine)
- # but it's something to keep an eye on.
-- if test "$inst_prefix_dir" = "$destdir"; then
-- $echo "$modename: error: cannot install \`$file' to a directory not ending in $libdir" 1>&2
-- exit $EXIT_FAILURE
-- fi
-+ #
-+ # This breaks install into our staging area. -PB
-+ #
-+ # if test "$inst_prefix_dir" = "$destdir"; then
-+ # $echo "$modename: error: cannot install \`$file' to a directory not ending in $libdir" 1>&2
-+ # exit $EXIT_FAILURE
-+ # fi
-
- if test -n "$inst_prefix_dir"; then
- # Stick the inst_prefix_dir data into the link command.
---- gettext-0.14.6/build-aux/ltmain.sh.orig 2005-05-20 15:03:38.000000000 -0600
-+++ gettext-0.14.6/build-aux/ltmain.sh 2007-01-13 14:34:27.000000000 -0700
-@@ -234,8 +234,9 @@
- # line option must be used.
- if test -z "$tagname"; then
- $echo "$modename: unable to infer tagged configuration"
-- $echo "$modename: specify a tag with \`--tag'" 1>&2
-- exit $EXIT_FAILURE
-+ $echo "$modename: defaulting to \`CC'"
-+ $echo "$modename: if this is not correct, specify a tag with \`--tag'"
-+# exit $EXIT_FAILURE
- # else
- # $echo "$modename: using $tagname tagged configuration"
- fi
-@@ -2324,8 +2325,14 @@
- absdir="$abs_ladir"
- libdir="$abs_ladir"
- else
-- dir="$libdir"
-- absdir="$libdir"
-+ # Adding 'libdir' from the .la file to our library search paths
-+ # breaks crosscompilation horribly. We cheat here and don't add
-+ # it, instead adding the path where we found the .la. -CL
-+ dir="$abs_ladir"
-+ absdir="$abs_ladir"
-+ libdir="$abs_ladir"
-+ #dir="$libdir"
-+ #absdir="$libdir"
- fi
- test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes
- else
-@@ -2800,6 +2807,16 @@
- esac
- if grep "^installed=no" $deplib > /dev/null; then
- path="$absdir/$objdir"
-+# This interferes with crosscompilation. -CL
-+# else
-+# eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
-+# if test -z "$libdir"; then
-+# $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2
-+# exit 1
-+# fi
-+# if test "$absdir" != "$libdir"; then
-+# $echo "$modename: warning: \`$deplib' seems to be moved" 1>&2
-+# fi
- else
- eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
- if test -z "$libdir"; then
-@@ -5210,6 +5227,10 @@
- # Replace all uninstalled libtool libraries with the installed ones
- newdependency_libs=
- for deplib in $dependency_libs; do
-+ # Replacing uninstalled with installed can easily break crosscompilation,
-+ # since the installed path is generally the wrong architecture. -CL
-+ newdependency_libs="$newdependency_libs $deplib"
-+ continue
- case $deplib in
- *.la)
- name=`$echo "X$deplib" | $Xsed -e 's%^.*/%%'`
-@@ -5528,10 +5549,13 @@
- # At present, this check doesn't affect windows .dll's that
- # are installed into $libdir/../bin (currently, that works fine)
- # but it's something to keep an eye on.
-- if test "$inst_prefix_dir" = "$destdir"; then
-- $echo "$modename: error: cannot install \`$file' to a directory not ending in $libdir" 1>&2
-- exit $EXIT_FAILURE
-- fi
-+ #
-+ # This breaks install into our staging area. -PB
-+ #
-+ # if test "$inst_prefix_dir" = "$destdir"; then
-+ # $echo "$modename: error: cannot install \`$file' to a directory not ending in $libdir" 1>&2
-+ # exit $EXIT_FAILURE
-+ # fi
-
- if test -n "$inst_prefix_dir"; then
- # Stick the inst_prefix_dir data into the link command.
--
1.7.8.6
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [Buildroot] [PATCH] gettext: bump to version 0.18.1.1
2012-12-13 20:02 [Buildroot] [PATCH] gettext: bump to version 0.18.1.1 Gustavo Zacarias
@ 2012-12-14 11:02 ` Peter Korsgaard
2012-12-14 18:08 ` Sagaert Johan
0 siblings, 1 reply; 7+ messages in thread
From: Peter Korsgaard @ 2012-12-14 11:02 UTC (permalink / raw)
To: buildroot
>>>>> "Gustavo" == Gustavo Zacarias <gustavo@zacarias.com.ar> writes:
Gustavo> Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Committed, thanks.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 7+ messages in thread
* [Buildroot] [PATCH] gettext: bump to version 0.18.1.1
2012-12-14 11:02 ` Peter Korsgaard
@ 2012-12-14 18:08 ` Sagaert Johan
2012-12-14 18:12 ` Gustavo Zacarias
2012-12-14 21:01 ` Stefan Fröberg
0 siblings, 2 replies; 7+ messages in thread
From: Sagaert Johan @ 2012-12-14 18:08 UTC (permalink / raw)
To: buildroot
Hi
After pulling the latest commits :
libtool: compile: /home/buildroot12git/output/host/usr/bin/arm-buildroot-linux-uclibcgnueabi-gcc -c
-DLOCALEDIR=\"/usr/share/locale\" -DLOCALE_ALIAS_PATH=\"/usr/share/locale\" -DLIBDIR=\"/usr/lib\" -DBUILDING_LIBINTL -DBUILDING_DLL
-DIN_LIBINTL -DENABLE_RELOCATABLE=1 -DIN_LIBRARY -DINSTALLDIR=\"/usr/lib\" -DNO_XMALLOC
-Dset_relocation_prefix=libintl_set_relocation_prefix -Drelocate=libintl_relocate -DDEPENDS_ON_LIBICONV=1 -DHAVE_CONFIG_H -I. -I.
-I.. -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE
-D_FILE_OFFSET_BITS=64 -pipe -Os -fvisibility=hidden ./printf.c -o printf.o >/dev/null 2>&1
./localename.c: In function '_nl_locale_name_thread_unsafe':
./localename.c:2619:31: error: dereferencing pointer to incomplete type
make[4]: *** [localename.lo] Error 1
make[4]: *** Waiting for unfinished jobs....
Using uClibc 0.9.33.1 (NTPL)
Regards , Johan
-----Oorspronkelijk bericht-----
Van: buildroot-bounces at busybox.net [mailto:buildroot-bounces at busybox.net] Namens Peter Korsgaard
Verzonden: vrijdag 14 december 2012 12:03
Aan: Gustavo Zacarias
CC: buildroot at busybox.net
Onderwerp: Re: [Buildroot] [PATCH] gettext: bump to version 0.18.1.1
>>>>> "Gustavo" == Gustavo Zacarias <gustavo@zacarias.com.ar> writes:
Gustavo> Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Committed, thanks.
--
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 7+ messages in thread
* [Buildroot] [PATCH] gettext: bump to version 0.18.1.1
2012-12-14 18:08 ` Sagaert Johan
@ 2012-12-14 18:12 ` Gustavo Zacarias
[not found] ` <E47E6E48A97345C3A1DB1002FEE1CBB6@JohanW7>
2012-12-14 21:01 ` Stefan Fröberg
1 sibling, 1 reply; 7+ messages in thread
From: Gustavo Zacarias @ 2012-12-14 18:12 UTC (permalink / raw)
To: buildroot
On 12/14/2012 03:08 PM, Sagaert Johan wrote:
> Hi
>
> After pulling the latest commits :
>
> libtool: compile: /home/buildroot12git/output/host/usr/bin/arm-buildroot-linux-uclibcgnueabi-gcc -c
> -DLOCALEDIR=\"/usr/share/locale\" -DLOCALE_ALIAS_PATH=\"/usr/share/locale\" -DLIBDIR=\"/usr/lib\" -DBUILDING_LIBINTL -DBUILDING_DLL
> -DIN_LIBINTL -DENABLE_RELOCATABLE=1 -DIN_LIBRARY -DINSTALLDIR=\"/usr/lib\" -DNO_XMALLOC
> -Dset_relocation_prefix=libintl_set_relocation_prefix -Drelocate=libintl_relocate -DDEPENDS_ON_LIBICONV=1 -DHAVE_CONFIG_H -I. -I.
> -I.. -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE
> -D_FILE_OFFSET_BITS=64 -pipe -Os -fvisibility=hidden ./printf.c -o printf.o >/dev/null 2>&1
> ./localename.c: In function '_nl_locale_name_thread_unsafe':
> ./localename.c:2619:31: error: dereferencing pointer to incomplete type
> make[4]: *** [localename.lo] Error 1
> make[4]: *** Waiting for unfinished jobs....
>
> Using uClibc 0.9.33.1 (NTPL)
>
> Regards , Johan
.config please
And 0.9.33.1? That's not current.
Regards.
^ permalink raw reply [flat|nested] 7+ messages in thread
* [Buildroot] [PATCH] gettext: bump to version 0.18.1.1
[not found] ` <E47E6E48A97345C3A1DB1002FEE1CBB6@JohanW7>
@ 2012-12-14 19:16 ` Gustavo Zacarias
0 siblings, 0 replies; 7+ messages in thread
From: Gustavo Zacarias @ 2012-12-14 19:16 UTC (permalink / raw)
To: buildroot
On 12/14/2012 03:27 PM, Sagaert Johan wrote:
> Hi
>
> Oops it is uClibc 0.9.33.2 that I use.
> Here my buildroot .config and my uClibc config file:
Hi.
Patch sent to the list, thanks for the headsup!
Regards.
^ permalink raw reply [flat|nested] 7+ messages in thread
* [Buildroot] [PATCH] gettext: bump to version 0.18.1.1
2012-12-14 18:08 ` Sagaert Johan
2012-12-14 18:12 ` Gustavo Zacarias
@ 2012-12-14 21:01 ` Stefan Fröberg
2012-12-14 21:05 ` Stefan Fröberg
1 sibling, 1 reply; 7+ messages in thread
From: Stefan Fröberg @ 2012-12-14 21:01 UTC (permalink / raw)
To: buildroot
Hello Johan
14.12.2012 20:08, Sagaert Johan kirjoitti:
> Hi
>
> After pulling the latest commits :
>
> libtool: compile: /home/buildroot12git/output/host/usr/bin/arm-buildroot-linux-uclibcgnueabi-gcc -c
> -DLOCALEDIR=\"/usr/share/locale\" -DLOCALE_ALIAS_PATH=\"/usr/share/locale\" -DLIBDIR=\"/usr/lib\" -DBUILDING_LIBINTL -DBUILDING_DLL
> -DIN_LIBINTL -DENABLE_RELOCATABLE=1 -DIN_LIBRARY -DINSTALLDIR=\"/usr/lib\" -DNO_XMALLOC
> -Dset_relocation_prefix=libintl_set_relocation_prefix -Drelocate=libintl_relocate -DDEPENDS_ON_LIBICONV=1 -DHAVE_CONFIG_H -I. -I.
> -I.. -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE
> -D_FILE_OFFSET_BITS=64 -pipe -Os -fvisibility=hidden ./printf.c -o printf.o >/dev/null 2>&1
> ./localename.c: In function '_nl_locale_name_thread_unsafe':
> ./localename.c:2619:31: error: dereferencing pointer to incomplete type
> make[4]: *** [localename.lo] Error 1
> make[4]: *** Waiting for unfinished jobs....
>
> Using uClibc 0.9.33.1 (NTPL)
>
> Regards , Johan
>
Hmmm...
That sounds familiar. If I remember correctly I hit exactly into same
problem in my own Linux distro
some time ago.
Could you please try the following lil patch ?
(I will include it as an separete attachment here also)
diff --git a/gettext-runtime/intl/localename.c
b/gettext-runtime/intl/localename.c
index 89a9692..5e86bc4 100644
--- a/gettext-runtime/intl/localename.c
+++ b/gettext-runtime/intl/localename.c
@@ -2607,7 +2607,7 @@ gl_locale_name_thread_unsafe (int category, const
char *categoryname)
locale_t thread_locale = uselocale (NULL);
if (thread_locale != LC_GLOBAL_LOCALE)
{
-# if __GLIBC__ >= 2
+# if __GLIBC__ >= 2 && !defined __UCLIBC__
/* Work around an incorrect definition of the _NL_LOCALE_NAME
macro in
glibc < 2.12.
See <http://sourceware.org/bugzilla/show_bug.cgi?id=10968>. */
diff --git a/gettext-tools/gnulib-lib/localename.c
b/gettext-tools/gnulib-lib/localename.c
index dab5e5b..85149ac 100644
--- a/gettext-tools/gnulib-lib/localename.c
+++ b/gettext-tools/gnulib-lib/localename.c
@@ -2607,7 +2607,7 @@ gl_locale_name_thread_unsafe (int category, const
char *categoryname)
locale_t thread_locale = uselocale (NULL);
if (thread_locale != LC_GLOBAL_LOCALE)
{
-# if __GLIBC__ >= 2
+# if __GLIBC__ >= 2 && !defined __UCLIBC__
/* Work around an incorrect definition of the _NL_LOCALE_NAME
macro in
glibc < 2.12.
See <http://sourceware.org/bugzilla/show_bug.cgi?id=10968>. */
Regards
Stefan
>
> -----Oorspronkelijk bericht-----
> Van: buildroot-bounces at busybox.net [mailto:buildroot-bounces at busybox.net] Namens Peter Korsgaard
> Verzonden: vrijdag 14 december 2012 12:03
> Aan: Gustavo Zacarias
> CC: buildroot at busybox.net
> Onderwerp: Re: [Buildroot] [PATCH] gettext: bump to version 0.18.1.1
>
>>>>>> "Gustavo" == Gustavo Zacarias <gustavo@zacarias.com.ar> writes:
> Gustavo> Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
>
> Committed, thanks.
>
> --
> Bye, Peter Korsgaard
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
>
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
-------------- next part --------------
diff --git a/gettext-runtime/intl/localename.c b/gettext-runtime/intl/localename.c
index 89a9692..5e86bc4 100644
--- a/gettext-runtime/intl/localename.c
+++ b/gettext-runtime/intl/localename.c
@@ -2607,7 +2607,7 @@ gl_locale_name_thread_unsafe (int category, const char *categoryname)
locale_t thread_locale = uselocale (NULL);
if (thread_locale != LC_GLOBAL_LOCALE)
{
-# if __GLIBC__ >= 2
+# if __GLIBC__ >= 2 && !defined __UCLIBC__
/* Work around an incorrect definition of the _NL_LOCALE_NAME macro in
glibc < 2.12.
See <http://sourceware.org/bugzilla/show_bug.cgi?id=10968>. */
diff --git a/gettext-tools/gnulib-lib/localename.c b/gettext-tools/gnulib-lib/localename.c
index dab5e5b..85149ac 100644
--- a/gettext-tools/gnulib-lib/localename.c
+++ b/gettext-tools/gnulib-lib/localename.c
@@ -2607,7 +2607,7 @@ gl_locale_name_thread_unsafe (int category, const char *categoryname)
locale_t thread_locale = uselocale (NULL);
if (thread_locale != LC_GLOBAL_LOCALE)
{
-# if __GLIBC__ >= 2
+# if __GLIBC__ >= 2 && !defined __UCLIBC__
/* Work around an incorrect definition of the _NL_LOCALE_NAME macro in
glibc < 2.12.
See <http://sourceware.org/bugzilla/show_bug.cgi?id=10968>. */
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [Buildroot] [PATCH] gettext: bump to version 0.18.1.1
2012-12-14 21:01 ` Stefan Fröberg
@ 2012-12-14 21:05 ` Stefan Fröberg
0 siblings, 0 replies; 7+ messages in thread
From: Stefan Fröberg @ 2012-12-14 21:05 UTC (permalink / raw)
To: buildroot
Oh sorry, it seems that Gustavo was faster than I providing patch for this
:)
14.12.2012 23:01, Stefan Fr?berg kirjoitti:
> Hello Johan
>
> 14.12.2012 20:08, Sagaert Johan kirjoitti:
>> Hi
>>
>> After pulling the latest commits :
>>
>> libtool: compile: /home/buildroot12git/output/host/usr/bin/arm-buildroot-linux-uclibcgnueabi-gcc -c
>> -DLOCALEDIR=\"/usr/share/locale\" -DLOCALE_ALIAS_PATH=\"/usr/share/locale\" -DLIBDIR=\"/usr/lib\" -DBUILDING_LIBINTL -DBUILDING_DLL
>> -DIN_LIBINTL -DENABLE_RELOCATABLE=1 -DIN_LIBRARY -DINSTALLDIR=\"/usr/lib\" -DNO_XMALLOC
>> -Dset_relocation_prefix=libintl_set_relocation_prefix -Drelocate=libintl_relocate -DDEPENDS_ON_LIBICONV=1 -DHAVE_CONFIG_H -I. -I.
>> -I.. -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE
>> -D_FILE_OFFSET_BITS=64 -pipe -Os -fvisibility=hidden ./printf.c -o printf.o >/dev/null 2>&1
>> ./localename.c: In function '_nl_locale_name_thread_unsafe':
>> ./localename.c:2619:31: error: dereferencing pointer to incomplete type
>> make[4]: *** [localename.lo] Error 1
>> make[4]: *** Waiting for unfinished jobs....
>>
>> Using uClibc 0.9.33.1 (NTPL)
>>
>> Regards , Johan
>>
> Hmmm...
> That sounds familiar. If I remember correctly I hit exactly into same
> problem in my own Linux distro
> some time ago.
>
> Could you please try the following lil patch ?
> (I will include it as an separete attachment here also)
>
> diff --git a/gettext-runtime/intl/localename.c
> b/gettext-runtime/intl/localename.c
> index 89a9692..5e86bc4 100644
> --- a/gettext-runtime/intl/localename.c
> +++ b/gettext-runtime/intl/localename.c
> @@ -2607,7 +2607,7 @@ gl_locale_name_thread_unsafe (int category, const
> char *categoryname)
> locale_t thread_locale = uselocale (NULL);
> if (thread_locale != LC_GLOBAL_LOCALE)
> {
> -# if __GLIBC__ >= 2
> +# if __GLIBC__ >= 2 && !defined __UCLIBC__
> /* Work around an incorrect definition of the _NL_LOCALE_NAME
> macro in
> glibc < 2.12.
> See <http://sourceware.org/bugzilla/show_bug.cgi?id=10968>. */
> diff --git a/gettext-tools/gnulib-lib/localename.c
> b/gettext-tools/gnulib-lib/localename.c
> index dab5e5b..85149ac 100644
> --- a/gettext-tools/gnulib-lib/localename.c
> +++ b/gettext-tools/gnulib-lib/localename.c
> @@ -2607,7 +2607,7 @@ gl_locale_name_thread_unsafe (int category, const
> char *categoryname)
> locale_t thread_locale = uselocale (NULL);
> if (thread_locale != LC_GLOBAL_LOCALE)
> {
> -# if __GLIBC__ >= 2
> +# if __GLIBC__ >= 2 && !defined __UCLIBC__
> /* Work around an incorrect definition of the _NL_LOCALE_NAME
> macro in
> glibc < 2.12.
> See <http://sourceware.org/bugzilla/show_bug.cgi?id=10968>. */
>
> Regards
> Stefan
>
>
>> -----Oorspronkelijk bericht-----
>> Van: buildroot-bounces at busybox.net [mailto:buildroot-bounces at busybox.net] Namens Peter Korsgaard
>> Verzonden: vrijdag 14 december 2012 12:03
>> Aan: Gustavo Zacarias
>> CC: buildroot at busybox.net
>> Onderwerp: Re: [Buildroot] [PATCH] gettext: bump to version 0.18.1.1
>>
>>>>>>> "Gustavo" == Gustavo Zacarias <gustavo@zacarias.com.ar> writes:
>> Gustavo> Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
>>
>> Committed, thanks.
>>
>> --
>> Bye, Peter Korsgaard
>> _______________________________________________
>> buildroot mailing list
>> buildroot at busybox.net
>> http://lists.busybox.net/mailman/listinfo/buildroot
>>
>> _______________________________________________
>> buildroot mailing list
>> buildroot at busybox.net
>> http://lists.busybox.net/mailman/listinfo/buildroot
>
>
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20121214/16325071/attachment.html>
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2012-12-14 21:05 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-12-13 20:02 [Buildroot] [PATCH] gettext: bump to version 0.18.1.1 Gustavo Zacarias
2012-12-14 11:02 ` Peter Korsgaard
2012-12-14 18:08 ` Sagaert Johan
2012-12-14 18:12 ` Gustavo Zacarias
[not found] ` <E47E6E48A97345C3A1DB1002FEE1CBB6@JohanW7>
2012-12-14 19:16 ` Gustavo Zacarias
2012-12-14 21:01 ` Stefan Fröberg
2012-12-14 21:05 ` Stefan Fröberg
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.