summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2011-07-15 18:48:18 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-07-20 15:25:00 +0100
commitf7de0a4f02cfd021176759fc4ea7ebbc88da8ff8 (patch)
tree0e8c483bea533b10ac33b47640c6d6de1dd962a7
parentab9543d48262a75f87621fc2b64dcb8ab8caf0bf (diff)
downloadopenembedded-core-f7de0a4f02cfd021176759fc4ea7ebbc88da8ff8.tar.gz
openembedded-core-f7de0a4f02cfd021176759fc4ea7ebbc88da8ff8.tar.bz2
openembedded-core-f7de0a4f02cfd021176759fc4ea7ebbc88da8ff8.zip
acl,attr: Fix build failures when NLS is disabled on uclibc
Disable gettext support when NLS is not enabled Signed-off-by: Khem Raj <raj.khem@gmail.com>
-rw-r--r--meta/recipes-support/attr/acl_2.2.51.bb2
-rw-r--r--meta/recipes-support/attr/attr.inc4
-rw-r--r--meta/recipes-support/attr/attr_2.4.46.bb2
-rw-r--r--meta/recipes-support/attr/ea-acl.inc3
4 files changed, 5 insertions, 6 deletions
diff --git a/meta/recipes-support/attr/acl_2.2.51.bb b/meta/recipes-support/attr/acl_2.2.51.bb
index 301d44ad09..18aac7c3e7 100644
--- a/meta/recipes-support/attr/acl_2.2.51.bb
+++ b/meta/recipes-support/attr/acl_2.2.51.bb
@@ -1,6 +1,6 @@
require acl.inc
-PR = "r0"
+PR = "r1"
SRC_URI[md5sum] = "3fc0ce99dc5253bdcce4c9cd437bc267"
SRC_URI[sha256sum] = "06854521cf5d396801af7e54b9636680edf8064355e51c07657ec7442a185225"
diff --git a/meta/recipes-support/attr/attr.inc b/meta/recipes-support/attr/attr.inc
index b2ed9a1b7d..c11034069c 100644
--- a/meta/recipes-support/attr/attr.inc
+++ b/meta/recipes-support/attr/attr.inc
@@ -20,7 +20,3 @@ do_install_append() {
sed -i ${D}${libdir}/libattr.la -e \
s,^libdir=\'${base_libdir}\'$,libdir=\'${libdir}\',
}
-
-# Only append ldflags for target recipe
-LDFLAGS_libc-uclibc += "${@['', '-lintl']['${PN}' == '${BPN}']}"
-
diff --git a/meta/recipes-support/attr/attr_2.4.46.bb b/meta/recipes-support/attr/attr_2.4.46.bb
index 9fef41b31c..fe8ab791f8 100644
--- a/meta/recipes-support/attr/attr_2.4.46.bb
+++ b/meta/recipes-support/attr/attr_2.4.46.bb
@@ -1,6 +1,6 @@
require attr.inc
-PR = "r0"
+PR = "r1"
SRC_URI[md5sum] = "db557c17fdfa4f785333ecda08654010"
SRC_URI[sha256sum] = "dcd69bdca7ff166bc45141eddbcf21967999a6b66b0544be12a1cc2fd6340e1f"
diff --git a/meta/recipes-support/attr/ea-acl.inc b/meta/recipes-support/attr/ea-acl.inc
index afe2f1c544..9af5960bae 100644
--- a/meta/recipes-support/attr/ea-acl.inc
+++ b/meta/recipes-support/attr/ea-acl.inc
@@ -32,3 +32,6 @@ FILES_lib${PN}-doc = "${mandir}/man2 \
${mandir}/man3"
BBCLASSEXTEND = "native"
+# Only append ldflags for target recipe and if USE_NLS is enabled
+LDFLAGS_append_libc-uclibc = "${@['', ' -lintl '][(bb.data.getVar('PN', d, True) == bb.data.getVar('BPN', d , True)) and (bb.data.getVar('USE_NLS', d, True) == 'yes')]}"
+EXTRA_OECONF_append_libc-uclibc = "${@['', ' --disable-gettext '][(bb.data.getVar('PN', d, True) == bb.data.getVar('BPN', d , True)) and (bb.data.getVar('USE_NLS', d, True) == 'no')]}"