[PATCH 0/2] gettext_0.16.1 build fixes for uclibc

[PATCH 0/2] gettext_0.16.1 build fixes for uclibc

[Andre McCurdy]

Assuming everything works out OK in master, fido needs these fixes too.

Andre McCurdy (2):
  gettext_0.16.1: remove obsolete uclibc specific patch
  gettext_0.16.1: add -lrt and -lpthread to LDFLAGS for uclibc builds

 .../gettext-0.16.1/gettext-error_print_progname.patch | 19 -------------------
 meta/recipes-core/gettext/gettext_0.16.1.bb           |  4 +---
 2 files changed, 1 insertion(+), 22 deletions(-)
 delete mode 100644 meta/recipes-core/gettext/gettext-0.16.1/gettext-error_print_progname.patch

-- 
1.9.1

[PATCH 1/2] gettext_0.16.1: remove obsolete uclibc specific patch

[Andre McCurdy]

gettext-error_print_progname.patch was originally created for gettext
v0.14.6 and does not apply cleanly to gettext v0.16.1.

Since the original issue addressed by the patch isn't documented and
because gettext v0.16.1 seems to be build OK for uclibc without the
patch, assume the patch is obsolete and no longer required.

Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
---
 .../gettext-0.16.1/gettext-error_print_progname.patch | 19 -------------------
 meta/recipes-core/gettext/gettext_0.16.1.bb           |  4 ----
 2 files changed, 23 deletions(-)
 delete mode 100644 meta/recipes-core/gettext/gettext-0.16.1/gettext-error_print_progname.patch

diff --git a/meta/recipes-core/gettext/gettext-0.16.1/gettext-error_print_progname.patch b/meta/recipes-core/gettext/gettext-0.16.1/gettext-error_print_progname.patch
deleted file mode 100644
index 93d9194..0000000
--- a/meta/recipes-core/gettext/gettext-0.16.1/gettext-error_print_progname.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-
-# Pulled from OpenEmbedded
-# 
-# Commented by: Saul Wold <saul.wold@intel.com>
-
-Upstream-Status: Inappropriate [licensing]
-
-diff -ur gettext-0.14.6/gettext-tools/lib/error.h gettext-0.14.6-patched/gettext-tools/lib/error.h
---- gettext-0.14.6/gettext-tools/lib/error.h	2005-05-20 16:03:42.000000000 -0500
-+++ gettext-0.14.6-patched/gettext-tools/lib/error.h	2007-01-13 20:57:24.422168053 -0600
-@@ -50,7 +50,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/meta/recipes-core/gettext/gettext_0.16.1.bb b/meta/recipes-core/gettext/gettext_0.16.1.bb
index 892194c..956d238 100644
--- a/meta/recipes-core/gettext/gettext_0.16.1.bb
+++ b/meta/recipes-core/gettext/gettext_0.16.1.bb
@@ -21,10 +21,6 @@ SRC_URI = "${GNU_MIRROR}/gettext/gettext-${PV}.tar.gz \
            file://hardcode_macro_version.patch \
           "
 
-
-SRC_URI_append_linux-uclibc = " file://gettext-error_print_progname.patch"
-SRC_URI_append_linux-uclibceabi = " file://gettext-error_print_progname.patch"
-
 SRC_URI[md5sum] = "3d9ad24301c6d6b17ec30704a13fe127"
 SRC_URI[sha256sum] = "0bf850d1a079fb5a61f0a47b1a9efd35eb44032255375e1cedb0253bc27b376d"
 
-- 
1.9.1

[PATCH 2/2] gettext_0.16.1: add -lrt and -lpthread to LDFLAGS for uclibc builds

[Andre McCurdy]

Fix linker errors due to posix_spawnp etc being in librt for uclibc.

 | sh4-rdk-linux-uclibc-libtool: link: sh4-rdk-linux-uclibc-gcc -ml -m4 --sysroot=/build-foo/tmp/sysroots/foo -O2 -pipe -g -feliminate-unused-debug-types -Wl,-O1 -Wl,--hash-style=gnu -Wl,--as-needed -o .libs/test-names test-names.o  libuniname.a ../gnulib-lib/.libs/libgettextlib.so /build-foo/tmp/work/sh4-rdk-linux-uclibc/gettext/0.16.1-r6/build/gettext-tools/intl/.libs/libintl.so -lc /build-foo/tmp/sysroots/foo/usr/lib/libiconv.so
 | ../gnulib-lib/.libs/libgettextlib.so: undefined reference to `posix_spawnp'
 | ../gnulib-lib/.libs/libgettextlib.so: undefined reference to `posix_spawn_file_actions_adddup2'
 | ../gnulib-lib/.libs/libgettextlib.so: undefined reference to `posix_spawn_file_actions_addopen'
 | ../gnulib-lib/.libs/libgettextlib.so: undefined reference to `posix_spawn_file_actions_addclose'
 | collect2: error: ld returned 1 exit status

Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
---
 meta/recipes-core/gettext/gettext_0.16.1.bb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/meta/recipes-core/gettext/gettext_0.16.1.bb b/meta/recipes-core/gettext/gettext_0.16.1.bb
index 956d238..f9f7a7f 100644
--- a/meta/recipes-core/gettext/gettext_0.16.1.bb
+++ b/meta/recipes-core/gettext/gettext_0.16.1.bb
@@ -21,6 +21,8 @@ SRC_URI = "${GNU_MIRROR}/gettext/gettext-${PV}.tar.gz \
            file://hardcode_macro_version.patch \
           "
 
+LDFLAGS_prepend_libc-uclibc = " -lrt -lpthread "
+
 SRC_URI[md5sum] = "3d9ad24301c6d6b17ec30704a13fe127"
 SRC_URI[sha256sum] = "0bf850d1a079fb5a61f0a47b1a9efd35eb44032255375e1cedb0253bc27b376d"
 
-- 
1.9.1