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/curl/curl_7.26.0.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/curl/curl_7.26.0.bb')
-rw-r--r-- | meta/recipes-support/curl/curl_7.26.0.bb | 8 |
1 files changed, 4 insertions, 4 deletions
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" | |||
6 | LIC_FILES_CHKSUM = "file://COPYING;beginline=7;md5=3a34942f4ae3fbf1a303160714e664ac" | 6 | LIC_FILES_CHKSUM = "file://COPYING;beginline=7;md5=3a34942f4ae3fbf1a303160714e664ac" |
7 | 7 | ||
8 | DEPENDS = "zlib gnutls" | 8 | DEPENDS = "zlib gnutls" |
9 | DEPENDS_virtclass-native = "zlib-native openssl-native" | 9 | DEPENDS_class-native = "zlib-native openssl-native" |
10 | DEPENDS_virtclass-nativesdk = "nativesdk-zlib" | 10 | DEPENDS_class-nativesdk = "nativesdk-zlib" |
11 | PR = "r1" | 11 | PR = "r1" |
12 | 12 | ||
13 | SRC_URI = "http://curl.haxx.se/download/curl-${PV}.tar.bz2 \ | 13 | SRC_URI = "http://curl.haxx.se/download/curl-${PV}.tar.bz2 \ |
@@ -29,8 +29,8 @@ EXTRA_OECONF = "--with-zlib=${STAGING_LIBDIR}/../ \ | |||
29 | " | 29 | " |
30 | 30 | ||
31 | CURLGNUTLS = " --with-gnutls=${STAGING_LIBDIR}/../ --without-ssl" | 31 | CURLGNUTLS = " --with-gnutls=${STAGING_LIBDIR}/../ --without-ssl" |
32 | CURLGNUTLS_virtclass-native = "--without-gnutls --with-ssl" | 32 | CURLGNUTLS_class-native = "--without-gnutls --with-ssl" |
33 | CURLGNUTLS_virtclass-nativesdk = "--without-gnutls --without-ssl" | 33 | CURLGNUTLS_class-nativesdk = "--without-gnutls --without-ssl" |
34 | 34 | ||
35 | do_configure_prepend() { | 35 | do_configure_prepend() { |
36 | sed -i s:OPT_GNUTLS/bin:OPT_GNUTLS:g configure.ac | 36 | sed -i s:OPT_GNUTLS/bin:OPT_GNUTLS:g configure.ac |