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/apr/apr-util_1.4.1.bb | |
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/apr/apr-util_1.4.1.bb')
-rw-r--r-- | meta/recipes-support/apr/apr-util_1.4.1.bb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/recipes-support/apr/apr-util_1.4.1.bb b/meta/recipes-support/apr/apr-util_1.4.1.bb index 238af97a53..7ee3de5c08 100644 --- a/meta/recipes-support/apr/apr-util_1.4.1.bb +++ b/meta/recipes-support/apr/apr-util_1.4.1.bb | |||
@@ -37,10 +37,10 @@ do_configure_append() { | |||
37 | cp ${STAGING_DATADIR}/apr/apr_rules.mk ${S}/build/rules.mk | 37 | cp ${STAGING_DATADIR}/apr/apr_rules.mk ${S}/build/rules.mk |
38 | fi | 38 | fi |
39 | } | 39 | } |
40 | do_configure_prepend_virtclass-native() { | 40 | do_configure_prepend_class-native() { |
41 | cp ${STAGING_DATADIR_NATIVE}/apr/apr_rules.mk ${S}/build/rules.mk | 41 | cp ${STAGING_DATADIR_NATIVE}/apr/apr_rules.mk ${S}/build/rules.mk |
42 | } | 42 | } |
43 | do_configure_append_virtclass-native() { | 43 | do_configure_append_class-native() { |
44 | sed -i "s#LIBTOOL=\$(SHELL) \$(apr_builddir)#LIBTOOL=\$(SHELL) ${STAGING_BINDIR_NATIVE}#" ${S}/build/rules.mk | 44 | sed -i "s#LIBTOOL=\$(SHELL) \$(apr_builddir)#LIBTOOL=\$(SHELL) ${STAGING_BINDIR_NATIVE}#" ${S}/build/rules.mk |
45 | # sometimes there isn't SHELL | 45 | # sometimes there isn't SHELL |
46 | sed -i "s#LIBTOOL=\$(apr_builddir)#LIBTOOL=${STAGING_BINDIR_NATIVE}#" ${S}/build/rules.mk | 46 | sed -i "s#LIBTOOL=\$(apr_builddir)#LIBTOOL=${STAGING_BINDIR_NATIVE}#" ${S}/build/rules.mk |