From 5ddf8570a113035f40fa8f203c3ac33582e2c745 Mon Sep 17 00:00:00 2001 From: Robert Yang Date: Sat, 27 Oct 2012 16:48:17 +0800 Subject: 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 Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- meta/recipes-support/apr/apr-util_1.4.1.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'meta/recipes-support/apr') 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() { cp ${STAGING_DATADIR}/apr/apr_rules.mk ${S}/build/rules.mk fi } -do_configure_prepend_virtclass-native() { +do_configure_prepend_class-native() { cp ${STAGING_DATADIR_NATIVE}/apr/apr_rules.mk ${S}/build/rules.mk } -do_configure_append_virtclass-native() { +do_configure_append_class-native() { sed -i "s#LIBTOOL=\$(SHELL) \$(apr_builddir)#LIBTOOL=\$(SHELL) ${STAGING_BINDIR_NATIVE}#" ${S}/build/rules.mk # sometimes there isn't SHELL sed -i "s#LIBTOOL=\$(apr_builddir)#LIBTOOL=${STAGING_BINDIR_NATIVE}#" ${S}/build/rules.mk -- cgit v1.2.3-54-g00ecf