gettext: bump to version 0.18.1.1

PATCH New Gustavo Zacarias 4 participants 7 messages Dec 13, 2012 – Dec 14, 2012 1 message not in the archive

lore

Share & tools

lore

Gustavo Zacarias

author

2012-12-13 20:02 UTC #0 lore raw

PATCH 1/1 gettext: bump to version 0.18.1.1

Signed-off-by Gustavo Zacarias <[email protected]>

---
 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

package/gettext/Config.in +3 -0

index ee7d8cb..a97b835 100644
@@ -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

package/gettext/gettext-disable-tests.patch deleted +0 ~~-37~~

deleted file mode 100644
index eded261..0000000
@@ -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 <[email protected]>
-
-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".
-

package/gettext/gettext-uclibc-sched_param-def.patch new file +20 -0

new file mode 100644
index 0000000..4e39278
@@ -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

package/gettext/gettext.mk +11 -1

index 74f5218..77881d3 100644
@@ -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))

package/gettext/libdir-la.patch deleted +0 ~~-154~~

154 lines not on this page · raw message

Signature · 1 line

1.7.8.6

Peter Korsgaard

2012-12-14 11:02 UTC #1 lore raw

PATCH 1/1 gettext: bump to version 0.18.1.1

Quoted 1 line

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Gustavo" == Gustavo Zacarias <[email protected]> writes:

Gustavo> Signed-off-by: Gustavo Zacarias <[email protected]>

Committed, thanks.

Signature · 1 line

Bye, Peter Korsgaard

Sagaert Johan

2012-12-14 18:08 UTC #2 lore raw

PATCH 1/1 gettext: bump to version 0.18.1.1

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

Quoted 1 line

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Gustavo" == Gustavo Zacarias <[email protected]> writes:

Gustavo> Signed-off-by: Gustavo Zacarias <[email protected]>

Committed, thanks.

--
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot

Gustavo Zacarias

author

2012-12-14 18:12 UTC #3 lore raw

PATCH 1/1 gettext: bump to version 0.18.1.1

Quoted 15 lines · Sagaert Johan

Hi
After pulling the latest commits :
libtool: compile: /home/buildroot12git/output/host/usr/bin/arm-buildroot-linux-uclibcgnueabi-gcc -c
(quoted diff) +0 -5
-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....

Quoted 3 lines

Using uClibc 0.9.33.1 (NTPL)
Regards , Johan

.config please
And 0.9.33.1? That's not current.
Regards.

A message that is not in the archive (sent off-list or not yet received): E47E6E48A97345C3A1DB1002FEE1CBB6@JohanW7

Gustavo Zacarias

author

2012-12-14 19:16 UTC #5 lore raw

PATCH 1/1 gettext: bump to version 0.18.1.1

Quoted 4 lines · Sagaert Johan

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.

Stefan Fröberg

2012-12-14 21:01 UTC #6 lore raw

PATCH 1/1 gettext: bump to version 0.18.1.1

In reply to Sagaert Johan

Hello Johan

14.12.2012 20:08, Sagaert Johan kirjoitti:

Quoted 15 lines

Hi
After pulling the latest commits :
libtool: compile: /home/buildroot12git/output/host/usr/bin/arm-buildroot-linux-uclibcgnueabi-gcc -c
(quoted diff) +0 -5
-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....

Quoted 4 lines

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)

(quoted diff) +0 -0

b/gettext-runtime/intl/localename.c
index 89a9692..5e86bc4 100644

gettext-runtime/intl/localename.c +0 -0

@@ -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>.  */

(quoted diff) +0 -0

b/gettext-tools/gnulib-lib/localename.c
index dab5e5b..85149ac 100644

gettext-tools/gnulib-lib/localename.c +0 -0

@@ -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

Quoted 20 lines

-----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
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Gustavo" == Gustavo Zacarias <[email protected]> writes:
Gustavo> Signed-off-by: Gustavo Zacarias <[email protected]>
Committed, thanks.
--
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot

Quoted 4 lines

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot

-------------- next part --------------

gettext-runtime/intl/localename.c +1 -1

index 89a9692..5e86bc4 100644
@@ -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>.  */

gettext-tools/gnulib-lib/localename.c +1 -1

index dab5e5b..85149ac 100644
@@ -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>.  */

Stefan Fröberg

2012-12-14 21:05 UTC #7 lore raw

PATCH 1/1 gettext: bump to version 0.18.1.1

Oh sorry, it seems that Gustavo was faster than I providing patch for this
:)

14.12.2012 23:01, Stefan Fr?berg kirjoitti:

Quoted 92 lines

Hello Johan
14.12.2012 20:08, Sagaert Johan kirjoitti:
Quoted 15 lines
Hi
After pulling the latest commits :
libtool: compile: /home/buildroot12git/output/host/usr/bin/arm-buildroot-linux-uclibcgnueabi-gcc -c
(quoted diff) +0 -5
-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....
Quoted 4 lines
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)
gettext-runtime/intl/localename.c +1 -1
index 89a9692..5e86bc4 100644
@@ -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>.  */
gettext-tools/gnulib-lib/localename.c +1 -1
index dab5e5b..85149ac 100644
@@ -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
Quoted 19 lines
-----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
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Gustavo" == Gustavo Zacarias <[email protected]> writes:
Gustavo> Signed-off-by: Gustavo Zacarias <[email protected]>
Committed, thanks.
--
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot
Quoted 4 lines
_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot

Quoted 4 lines

_______________________________________________
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>