From 240d25d0fbcbedbdea82a7a103e672e2aad74ba8 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Tue, 6 May 2014 12:50:55 +0000 Subject: 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 --- meta/recipes-support/attr/attr.inc | 2 +- meta/recipes-support/attr/ea-acl.inc | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'meta/recipes-support') 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" HOMEPAGE = "http://savannah.nongnu.org/projects/attr/" SECTION = "libs" -DEPENDS = "ncurses" +DEPENDS = "ncurses virtual/libintl" LICENSE = "LGPLv2.1+ & GPLv2+" LICENSE_${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 \ BBCLASSEXTEND = "native" # Only append ldflags for target recipe and if USE_NLS is enabled -LDFLAGS_append_libc-uclibc = "${@['', ' -lintl '][(d.getVar('PN', True) == d.getVar('BPN', True)) and (d.getVar('USE_NLS', True) == 'yes')]}" -EXTRA_OECONF_append_libc-uclibc = "${@['', ' --disable-gettext '][(d.getVar('PN', True) == d.getVar('BPN', True)) and (d.getVar('USE_NLS', True) == 'no')]}" +LDFLAGS_append_libc-uclibc_class-target = "${@['', ' -lintl '][(d.getVar('USE_NLS', True) == 'yes')]}" +EXTRA_OECONF_append_libc-uclibc_class-target = "${@['', ' --disable-gettext '][(d.getVar('USE_NLS', True) == 'no')]}" fix_symlink () { if test "${libdir}" = "${base_libdir}" ; then -- cgit 1.2.3-korg