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/curl/curl_7.26.0.bb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'meta/recipes-support/curl') diff --git a/meta/recipes-support/curl/curl_7.26.0.bb b/meta/recipes-support/curl/curl_7.26.0.bb index dad5572dff..9a0e7ce27e 100644 --- a/meta/recipes-support/curl/curl_7.26.0.bb +++ b/meta/recipes-support/curl/curl_7.26.0.bb @@ -6,8 +6,8 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://COPYING;beginline=7;md5=3a34942f4ae3fbf1a303160714e664ac" DEPENDS = "zlib gnutls" -DEPENDS_virtclass-native = "zlib-native openssl-native" -DEPENDS_virtclass-nativesdk = "nativesdk-zlib" +DEPENDS_class-native = "zlib-native openssl-native" +DEPENDS_class-nativesdk = "nativesdk-zlib" PR = "r1" SRC_URI = "http://curl.haxx.se/download/curl-${PV}.tar.bz2 \ @@ -29,8 +29,8 @@ EXTRA_OECONF = "--with-zlib=${STAGING_LIBDIR}/../ \ " CURLGNUTLS = " --with-gnutls=${STAGING_LIBDIR}/../ --without-ssl" -CURLGNUTLS_virtclass-native = "--without-gnutls --with-ssl" -CURLGNUTLS_virtclass-nativesdk = "--without-gnutls --without-ssl" +CURLGNUTLS_class-native = "--without-gnutls --with-ssl" +CURLGNUTLS_class-nativesdk = "--without-gnutls --without-ssl" do_configure_prepend() { sed -i s:OPT_GNUTLS/bin:OPT_GNUTLS:g configure.ac -- cgit v1.2.3-54-g00ecf