diff options
author | Robert Yang <liezhi.yang@windriver.com> | 2012-10-27 16:48:17 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-11-02 16:18:28 +0000 |
commit | 5ddf8570a113035f40fa8f203c3ac33582e2c745 (patch) | |
tree | d12af46a0471f85b017597aee644a8308d6645fb /meta/recipes-support/libcap/libcap.inc | |
parent | 60c3bd43949e9aa23af6f74656eb9a64b891bda6 (diff) | |
download | poky-5ddf8570a113035f40fa8f203c3ac33582e2c745.tar.gz |
recipes-support: replace virtclass-native(sdk) with class-native(sdk)
The overrides virtclass-native and virtclass-nativesdk are deprecated,
which should be replaced by class-native and class-nativesdk.
NOTE:
There were 2 errors in libcap.inc, the BUILD_LDFLAGS_virtclass_native
should be BUILD_LDFLAGS_virtclass-native (the "_" should be "-"),
otherwise it doesn't work, and the value was: "-Wl,rpath=...", this is
incorrect, it shoudl be: "-Wl,-rpath=..." (lacked a - ), but we don't
need this line, since it is already in the default BUILD_LDFLAGS. Remove
it and we don't need to bump the PR since we just removed a unused line.
[YOCTO #3297]
(From OE-Core rev: cafb550fe9034754933f1708446dde155dcc3d51)
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support/libcap/libcap.inc')
-rw-r--r-- | meta/recipes-support/libcap/libcap.inc | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/meta/recipes-support/libcap/libcap.inc b/meta/recipes-support/libcap/libcap.inc index 27552ad49b..7f16a569c8 100644 --- a/meta/recipes-support/libcap/libcap.inc +++ b/meta/recipes-support/libcap/libcap.inc | |||
@@ -7,8 +7,8 @@ LIC_FILES_CHKSUM = "file://License;md5=3f84fd6f29d453a56514cb7e4ead25f1" | |||
7 | 7 | ||
8 | DEPENDS = "attr perl-native-runtime" | 8 | DEPENDS = "attr perl-native-runtime" |
9 | DEPENDS += "${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" | 9 | DEPENDS += "${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" |
10 | # attr and pam are disabled by EXTRA_OEMAKE_virtclass-native | 10 | # attr and pam are disabled by EXTRA_OEMAKE_class-native |
11 | DEPENDS_virtclass-native = "perl-native-runtime" | 11 | DEPENDS_class-native = "perl-native-runtime" |
12 | 12 | ||
13 | SRC_URI = "${DEBIAN_MIRROR}/main/libc/libcap2/${BPN}2_${PV}.orig.tar.gz" | 13 | SRC_URI = "${DEBIAN_MIRROR}/main/libc/libcap2/${BPN}2_${PV}.orig.tar.gz" |
14 | 14 | ||
@@ -23,15 +23,13 @@ do_configure() { | |||
23 | sed -e 's,BUILD_CFLAGS ?=,BUILD_CFLAGS := $(BUILD_CFLAGS),' -i Make.Rules | 23 | sed -e 's,BUILD_CFLAGS ?=,BUILD_CFLAGS := $(BUILD_CFLAGS),' -i Make.Rules |
24 | } | 24 | } |
25 | 25 | ||
26 | BUILD_LDFLAGS_virtclass_native += "-Wl,rpath=${base_libdir}" | ||
27 | |||
28 | EXTRA_OEMAKE = " \ | 26 | EXTRA_OEMAKE = " \ |
29 | LIBATTR=yes \ | 27 | LIBATTR=yes \ |
30 | PAM_CAP=${@base_contains('DISTRO_FEATURES', 'pam', 'yes', 'no', d)} \ | 28 | PAM_CAP=${@base_contains('DISTRO_FEATURES', 'pam', 'yes', 'no', d)} \ |
31 | INDENT= SYSTEM_HEADERS=${STAGING_INCDIR} RAISE_SETFCAP=no \ | 29 | INDENT= SYSTEM_HEADERS=${STAGING_INCDIR} RAISE_SETFCAP=no \ |
32 | lib=${@os.path.basename('${libdir}')} \ | 30 | lib=${@os.path.basename('${libdir}')} \ |
33 | " | 31 | " |
34 | EXTRA_OEMAKE_virtclass-native = " \ | 32 | EXTRA_OEMAKE_class-native = " \ |
35 | LIBATTR=no \ | 33 | LIBATTR=no \ |
36 | PAM_CAP=no \ | 34 | PAM_CAP=no \ |
37 | INDENT= \ | 35 | INDENT= \ |