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:15:30 +0000 |
| commit | cafb550fe9034754933f1708446dde155dcc3d51 (patch) | |
| tree | d478075c915cc5ebaf01ce191f5a98acd5f87dcf /meta/recipes-support/libcap/libcap.inc | |
| parent | d37944fff256e9f52d05a56db3edb42c7a352cce (diff) | |
| download | openembedded-core-cafb550fe9034754933f1708446dde155dcc3d51.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]
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
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" DEPENDS = "attr perl-native-runtime" DEPENDS += "${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" -# attr and pam are disabled by EXTRA_OEMAKE_virtclass-native -DEPENDS_virtclass-native = "perl-native-runtime" +# attr and pam are disabled by EXTRA_OEMAKE_class-native +DEPENDS_class-native = "perl-native-runtime" SRC_URI = "${DEBIAN_MIRROR}/main/libc/libcap2/${BPN}2_${PV}.orig.tar.gz" @@ -23,15 +23,13 @@ do_configure() { sed -e 's,BUILD_CFLAGS ?=,BUILD_CFLAGS := $(BUILD_CFLAGS),' -i Make.Rules } -BUILD_LDFLAGS_virtclass_native += "-Wl,rpath=${base_libdir}" - EXTRA_OEMAKE = " \ LIBATTR=yes \ PAM_CAP=${@base_contains('DISTRO_FEATURES', 'pam', 'yes', 'no', d)} \ INDENT= SYSTEM_HEADERS=${STAGING_INCDIR} RAISE_SETFCAP=no \ lib=${@os.path.basename('${libdir}')} \ " -EXTRA_OEMAKE_virtclass-native = " \ +EXTRA_OEMAKE_class-native = " \ LIBATTR=no \ PAM_CAP=no \ INDENT= \ |