From 1797037e76f3bb17fb037219e5df1ee880807098 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Wed, 11 Apr 2012 23:02:53 -0700 Subject: gettext,m4: Add -lrt to LDFLAGS for uclibc uclibc has recently got posix_spawn implementation and the implementation resided in librt so we link -lrt to get the configure tests using uclibc provided definitions and not the gnu-lib wrappers Let libintl.a live in -staticdev package (From OE-Core rev: 68e07a5ff114b5f413a5eeedeb551d82bc77774c) Signed-off-by: Khem Raj Signed-off-by: Richard Purdie --- meta/recipes-core/gettext/gettext_0.18.1.1.bb | 6 +++--- meta/recipes-devtools/m4/m4-1.4.16.inc | 2 +- meta/recipes-devtools/m4/m4-1.4.9.inc | 2 +- meta/recipes-devtools/m4/m4.inc | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/meta/recipes-core/gettext/gettext_0.18.1.1.bb b/meta/recipes-core/gettext/gettext_0.18.1.1.bb index 46647512fa..5685bbeb75 100644 --- a/meta/recipes-core/gettext/gettext_0.18.1.1.bb +++ b/meta/recipes-core/gettext/gettext_0.18.1.1.bb @@ -5,7 +5,7 @@ SECTION = "libs" LICENSE = "GPLv3+ & LGPL-2.1+" LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" -PR = "r11" +PR = "r12" DEPENDS = "libxml2-native gettext-native virtual/libiconv ncurses expat" DEPENDS_virtclass-native = "libxml2-native gettext-minimal-native" PROVIDES = "virtual/libintl virtual/gettext" @@ -17,6 +17,7 @@ SRC_URI = "${GNU_MIRROR}/gettext/gettext-${PV}.tar.gz \ SRC_URI_append_libc-uclibc = " file://wchar-uclibc.patch \ file://gnulib-uclibc-sched_param-def.patch \ " +LDFLAGS_prepend_libc-uclibc = " -lrt -lpthread " SRC_URI[md5sum] = "3dd55b952826d2b32f51308f2f91aa89" SRC_URI[sha256sum] = "93ac71a7afa5b70c1b1032516663658c51e653087f42a3fc8044752c026443e9" @@ -72,8 +73,7 @@ FILES_gettext-runtime_append_libc-uclibc = " ${libdir}/libintl.so.* \ FILES_gettext-runtime-dev += "${libdir}/libasprintf.a \ ${includedir}/autosprintf.h \ " -FILES_gettext-runtime-dev_append_libc-uclibc = " ${libdir}/libintl.a \ - ${libdir}/libintl.so \ +FILES_gettext-runtime-dev_append_libc-uclibc = " ${libdir}/libintl.so \ ${includedir}/libintl.h \ " FILES_gettext-runtime-doc = "${mandir}/man1/gettext.* \ diff --git a/meta/recipes-devtools/m4/m4-1.4.16.inc b/meta/recipes-devtools/m4/m4-1.4.16.inc index 139193c958..1669775c74 100644 --- a/meta/recipes-devtools/m4/m4-1.4.16.inc +++ b/meta/recipes-devtools/m4/m4-1.4.16.inc @@ -5,7 +5,7 @@ LICENSE = "GPLv3" LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504\ file://examples/COPYING;md5=fbc986d45b3dae6725c29870dd6b669d" -PR = "r2" +PR = "r3" SRC_URI += "file://ac_config_links.patch" SRC_URI[md5sum] = "a5dfb4f2b7370e9d34293d23fd09b280" diff --git a/meta/recipes-devtools/m4/m4-1.4.9.inc b/meta/recipes-devtools/m4/m4-1.4.9.inc index a5d243c3fb..aab2c1efa2 100644 --- a/meta/recipes-devtools/m4/m4-1.4.9.inc +++ b/meta/recipes-devtools/m4/m4-1.4.9.inc @@ -5,7 +5,7 @@ LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe\ file://examples/COPYING;md5=1d49bd61dc590f014cae7173b43e3e5c" -PR = "r1" +PR = "r2" SRC_URI += "file://fix_for_circular_dependency.patch" SRC_URI[md5sum] = "1ba8e147aff5e79bd2bfb983d86b53d5" diff --git a/meta/recipes-devtools/m4/m4.inc b/meta/recipes-devtools/m4/m4.inc index a130318744..ae101c2b6d 100644 --- a/meta/recipes-devtools/m4/m4.inc +++ b/meta/recipes-devtools/m4/m4.inc @@ -6,5 +6,5 @@ GNU M4 also has built-in functions for including files, running shell commands, inherit autotools EXTRA_OEMAKE += "'infodir=${infodir}'" - +LDFLAGS_prepend_libc-uclibc = " -lrt " SRC_URI = "${GNU_MIRROR}/m4/m4-${PV}.tar.gz" -- cgit v1.2.3-54-g00ecf