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/boost/boost.inc | |
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/boost/boost.inc')
-rw-r--r-- | meta/recipes-support/boost/boost.inc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/meta/recipes-support/boost/boost.inc b/meta/recipes-support/boost/boost.inc index ec602a6cf4..36a94e10ea 100644 --- a/meta/recipes-support/boost/boost.inc +++ b/meta/recipes-support/boost/boost.inc | |||
@@ -7,7 +7,7 @@ DESCRIPTION = "Free peer-reviewed portable C++ source libraries" | |||
7 | HOMEPAGE = "http://www.boost.org/" | 7 | HOMEPAGE = "http://www.boost.org/" |
8 | SECTION = "libs" | 8 | SECTION = "libs" |
9 | DEPENDS = "boost-native zlib" | 9 | DEPENDS = "boost-native zlib" |
10 | DEPENDS_virtclass-native = "" | 10 | DEPENDS_class-native = "" |
11 | LICENSE = "BSL-1.0 & MIT & Python-2.0" | 11 | LICENSE = "BSL-1.0 & MIT & Python-2.0" |
12 | 12 | ||
13 | ARM_INSTRUCTION_SET = "arm" | 13 | ARM_INSTRUCTION_SET = "arm" |
@@ -73,7 +73,7 @@ FILES_${PN}-staticdev = "${libdir}/libboost_*.a" | |||
73 | # "boost" is a metapackage which pulls in all boost librabries | 73 | # "boost" is a metapackage which pulls in all boost librabries |
74 | PACKAGES += "${PN}" | 74 | PACKAGES += "${PN}" |
75 | RRECOMMENDS_${PN} += "${BOOST_PACKAGES}" | 75 | RRECOMMENDS_${PN} += "${BOOST_PACKAGES}" |
76 | RRECOMMENDS_${PN}_virtclass-native = "" | 76 | RRECOMMENDS_${PN}_class-native = "" |
77 | ALLOW_EMPTY_${PN} = "1" | 77 | ALLOW_EMPTY_${PN} = "1" |
78 | 78 | ||
79 | # to avoid GNU_HASH QA errors added LDFLAGS to ARCH; a little bit dirty but at least it works | 79 | # to avoid GNU_HASH QA errors added LDFLAGS to ARCH; a little bit dirty but at least it works |
@@ -176,15 +176,15 @@ do_install() { | |||
176 | 176 | ||
177 | BBCLASSEXTEND = "native" | 177 | BBCLASSEXTEND = "native" |
178 | 178 | ||
179 | do_configure_virtclass-native() { | 179 | do_configure_class-native() { |
180 | : | 180 | : |
181 | } | 181 | } |
182 | 182 | ||
183 | do_boostconfig_virtclass-native() { | 183 | do_boostconfig_class-native() { |
184 | : | 184 | : |
185 | } | 185 | } |
186 | 186 | ||
187 | do_compile_virtclass-native() { | 187 | do_compile_class-native() { |
188 | set -ex | 188 | set -ex |
189 | cd ${S}/tools/build/v2/engine | 189 | cd ${S}/tools/build/v2/engine |
190 | rm -rf bin.* | 190 | rm -rf bin.* |
@@ -194,7 +194,7 @@ do_compile_virtclass-native() { | |||
194 | # This is too terrible - the build script doesn't give any good | 194 | # This is too terrible - the build script doesn't give any good |
195 | # way I can see to find out where the binaries are placed, so | 195 | # way I can see to find out where the binaries are placed, so |
196 | # rely on only one bin.foo directory being created. | 196 | # rely on only one bin.foo directory being created. |
197 | do_install_virtclass-native () { | 197 | do_install_class-native () { |
198 | set -ex | 198 | set -ex |
199 | cd ${S}/tools/build/v2/engine | 199 | cd ${S}/tools/build/v2/engine |
200 | install -d ${D}${bindir}/ | 200 | install -d ${D}${bindir}/ |