summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2014-05-06 12:50:55 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-05-08 13:11:51 +0100
commit3189e74559b7e5c304d7b5f73192b0fa722d8d01 (patch)
treed7f5d142596a26a47ab0d721ff80efbb3bfa4f33
parent4666045677c9f338e2e936f67fb7db2e04a58d4f (diff)
downloadpoky-3189e74559b7e5c304d7b5f73192b0fa722d8d01.tar.gz
attr: Fix uclibc builds
attr needs libintl headers and libs. Add in the missing dependency and ensure the linker flag gets passed in multilib builds by replacing the PN == BPN check with a class-target override instead. (From OE-Core rev: c19fb913006eb53025e5db1574d973c8d7ceec76) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-support/attr/attr.inc2
-rw-r--r--meta/recipes-support/attr/ea-acl.inc4
2 files changed, 3 insertions, 3 deletions
diff --git a/meta/recipes-support/attr/attr.inc b/meta/recipes-support/attr/attr.inc
index 873c1fffd9..01ad59cb96 100644
--- a/meta/recipes-support/attr/attr.inc
+++ b/meta/recipes-support/attr/attr.inc
@@ -2,7 +2,7 @@ SUMMARY = "Utilities for manipulating filesystem extended attributes"
2HOMEPAGE = "http://savannah.nongnu.org/projects/attr/" 2HOMEPAGE = "http://savannah.nongnu.org/projects/attr/"
3SECTION = "libs" 3SECTION = "libs"
4 4
5DEPENDS = "ncurses" 5DEPENDS = "ncurses virtual/libintl"
6 6
7LICENSE = "LGPLv2.1+ & GPLv2+" 7LICENSE = "LGPLv2.1+ & GPLv2+"
8LICENSE_${PN} = "GPLv2+" 8LICENSE_${PN} = "GPLv2+"
diff --git a/meta/recipes-support/attr/ea-acl.inc b/meta/recipes-support/attr/ea-acl.inc
index 785ce0cf50..72f623e593 100644
--- a/meta/recipes-support/attr/ea-acl.inc
+++ b/meta/recipes-support/attr/ea-acl.inc
@@ -34,8 +34,8 @@ FILES_lib${BPN}-doc = "${mandir}/man2 \
34 34
35BBCLASSEXTEND = "native" 35BBCLASSEXTEND = "native"
36# Only append ldflags for target recipe and if USE_NLS is enabled 36# Only append ldflags for target recipe and if USE_NLS is enabled
37LDFLAGS_append_libc-uclibc = "${@['', ' -lintl '][(d.getVar('PN', True) == d.getVar('BPN', True)) and (d.getVar('USE_NLS', True) == 'yes')]}" 37LDFLAGS_append_libc-uclibc_class-target = "${@['', ' -lintl '][(d.getVar('USE_NLS', True) == 'yes')]}"
38EXTRA_OECONF_append_libc-uclibc = "${@['', ' --disable-gettext '][(d.getVar('PN', True) == d.getVar('BPN', True)) and (d.getVar('USE_NLS', True) == 'no')]}" 38EXTRA_OECONF_append_libc-uclibc_class-target = "${@['', ' --disable-gettext '][(d.getVar('USE_NLS', True) == 'no')]}"
39 39
40fix_symlink () { 40fix_symlink () {
41 if test "${libdir}" = "${base_libdir}" ; then 41 if test "${libdir}" = "${base_libdir}" ; then