diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-07-28 23:28:15 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-08-02 15:44:10 +0100 |
commit | bb6ddc3691ab04162ec5fd69a2d5e7876713fd15 (patch) | |
tree | 76e376b01253c3aace1a98a5021bcaad3c92e861 /meta/recipes-support/boost | |
parent | fcc456ee4b8f619134abb4649db53c638074082c (diff) | |
download | poky-bb6ddc3691ab04162ec5fd69a2d5e7876713fd15.tar.gz |
Convert to new override syntax
This is the result of automated script conversion:
scripts/contrib/convert-overrides.py <oe-core directory>
converting the metadata to use ":" as the override character instead of "_".
(From OE-Core rev: 42344347be29f0997cc2f7636d9603b1fe1875ae)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support/boost')
-rw-r--r-- | meta/recipes-support/boost/boost-build-native_4.4.1.bb | 2 | ||||
-rw-r--r-- | meta/recipes-support/boost/boost.inc | 40 |
2 files changed, 21 insertions, 21 deletions
diff --git a/meta/recipes-support/boost/boost-build-native_4.4.1.bb b/meta/recipes-support/boost/boost-build-native_4.4.1.bb index d4df5b5cf1..2de05369a8 100644 --- a/meta/recipes-support/boost/boost-build-native_4.4.1.bb +++ b/meta/recipes-support/boost/boost-build-native_4.4.1.bb | |||
@@ -24,4 +24,4 @@ do_install() { | |||
24 | } | 24 | } |
25 | 25 | ||
26 | # The build is either release mode (pre-stripped) or debug (-O0). | 26 | # The build is either release mode (pre-stripped) or debug (-O0). |
27 | INSANE_SKIP_${PN} = "already-stripped" | 27 | INSANE_SKIP:${PN} = "already-stripped" |
diff --git a/meta/recipes-support/boost/boost.inc b/meta/recipes-support/boost/boost.inc index 291a052ec6..fa49ed3f8a 100644 --- a/meta/recipes-support/boost/boost.inc +++ b/meta/recipes-support/boost/boost.inc | |||
@@ -8,8 +8,8 @@ DEPENDS = "boost-build-native zlib bzip2" | |||
8 | 8 | ||
9 | CVE_PRODUCT = "boost:boost" | 9 | CVE_PRODUCT = "boost:boost" |
10 | 10 | ||
11 | ARM_INSTRUCTION_SET_armv4 = "arm" | 11 | ARM_INSTRUCTION_SET:armv4 = "arm" |
12 | ARM_INSTRUCTION_SET_armv5 = "arm" | 12 | ARM_INSTRUCTION_SET:armv5 = "arm" |
13 | 13 | ||
14 | B = "${WORKDIR}/build" | 14 | B = "${WORKDIR}/build" |
15 | do_configure[cleandirs] = "${B}" | 15 | do_configure[cleandirs] = "${B}" |
@@ -71,35 +71,35 @@ python __anonymous () { | |||
71 | if "-native" in pn: | 71 | if "-native" in pn: |
72 | pkg = pkg + "-native" | 72 | pkg = pkg + "-native" |
73 | packages.append(mlprefix + pkg) | 73 | packages.append(mlprefix + pkg) |
74 | if not d.getVar("FILES_%s" % pkg): | 74 | if not d.getVar("FILES:%s" % pkg): |
75 | d.setVar("FILES_%s%s" % (mlprefix, pkg), "${libdir}/libboost_%s*.so.*" % lib) | 75 | d.setVar("FILES:%s%s" % (mlprefix, pkg), "${libdir}/libboost_%s*.so.*" % lib) |
76 | else: | 76 | else: |
77 | d.setVar("FILES_%s%s" % (mlprefix, pkg), d.getVar("FILES_%s" % pkg)) | 77 | d.setVar("FILES:%s%s" % (mlprefix, pkg), d.getVar("FILES:%s" % pkg)) |
78 | 78 | ||
79 | d.setVar("BOOST_PACKAGES", " ".join(packages)) | 79 | d.setVar("BOOST_PACKAGES", " ".join(packages)) |
80 | d.setVar("BJAM_EXTRA", " ".join(extras)) | 80 | d.setVar("BJAM_EXTRA", " ".join(extras)) |
81 | } | 81 | } |
82 | 82 | ||
83 | # Override the contents of specific packages | 83 | # Override the contents of specific packages |
84 | FILES_${PN}-graph_parallel = "${libdir}/libboost_graph_parallel.so.*" | 84 | FILES:${PN}-graph_parallel = "${libdir}/libboost_graph_parallel.so.*" |
85 | FILES_${PN}-locale = "${libdir}/libboost_locale.so.*" | 85 | FILES:${PN}-locale = "${libdir}/libboost_locale.so.*" |
86 | FILES_${PN}-mpi = "${libdir}/mpi.so ${libdir}/libboost_mpi*.so.*" | 86 | FILES:${PN}-mpi = "${libdir}/mpi.so ${libdir}/libboost_mpi*.so.*" |
87 | FILES_boost-serialization = "${libdir}/libboost_serialization*.so.* \ | 87 | FILES:boost-serialization = "${libdir}/libboost_serialization*.so.* \ |
88 | ${libdir}/libboost_wserialization*.so.*" | 88 | ${libdir}/libboost_wserialization*.so.*" |
89 | FILES_boost-test = "${libdir}/libboost_prg_exec_monitor*.so.* \ | 89 | FILES:boost-test = "${libdir}/libboost_prg_exec_monitor*.so.* \ |
90 | ${libdir}/libboost_unit_test_framework*.so.*" | 90 | ${libdir}/libboost_unit_test_framework*.so.*" |
91 | 91 | ||
92 | # -dev last to pick up the remaining stuff | 92 | # -dev last to pick up the remaining stuff |
93 | PACKAGES += "${PN}-dev ${PN}-staticdev" | 93 | PACKAGES += "${PN}-dev ${PN}-staticdev" |
94 | FILES_${PN}-dev = "${includedir} ${libdir}/libboost_*.so ${libdir}/cmake" | 94 | FILES:${PN}-dev = "${includedir} ${libdir}/libboost_*.so ${libdir}/cmake" |
95 | FILES_${PN}-staticdev = "${libdir}/libboost_*.a" | 95 | FILES:${PN}-staticdev = "${libdir}/libboost_*.a" |
96 | 96 | ||
97 | # "boost" is a metapackage which pulls in all boost librabries | 97 | # "boost" is a metapackage which pulls in all boost librabries |
98 | PACKAGES += "${PN}" | 98 | PACKAGES += "${PN}" |
99 | FILES_${PN} = "" | 99 | FILES:${PN} = "" |
100 | ALLOW_EMPTY_${PN} = "1" | 100 | ALLOW_EMPTY:${PN} = "1" |
101 | RRECOMMENDS_${PN} += "${BOOST_PACKAGES}" | 101 | RRECOMMENDS:${PN} += "${BOOST_PACKAGES}" |
102 | RRECOMMENDS_${PN}_class-native = "" | 102 | RRECOMMENDS:${PN}:class-native = "" |
103 | 103 | ||
104 | # to avoid GNU_HASH QA errors added LDFLAGS to ARCH; a little bit dirty but at least it works | 104 | # to avoid GNU_HASH QA errors added LDFLAGS to ARCH; a little bit dirty but at least it works |
105 | TARGET_CC_ARCH += "${LDFLAGS}" | 105 | TARGET_CC_ARCH += "${LDFLAGS}" |
@@ -155,14 +155,14 @@ BJAM_OPTS = '${BOOST_PARALLEL_MAKE} -d+2 -q \ | |||
155 | ${BJAM_EXTRA}' | 155 | ${BJAM_EXTRA}' |
156 | 156 | ||
157 | # Native compilation of bzip2 isn't working | 157 | # Native compilation of bzip2 isn't working |
158 | BJAM_OPTS_append_class-native = ' -sNO_BZIP2=1' | 158 | BJAM_OPTS:append:class-native = ' -sNO_BZIP2=1' |
159 | 159 | ||
160 | # Adjust the build for x32 | 160 | # Adjust the build for x32 |
161 | BJAM_OPTS_append_x86-x32 = " abi=x32 address-model=64" | 161 | BJAM_OPTS:append:x86-x32 = " abi=x32 address-model=64" |
162 | 162 | ||
163 | # cross compiling for arm fails to detect abi, so provide some help | 163 | # cross compiling for arm fails to detect abi, so provide some help |
164 | BJAM_OPTS_append_arm = " abi=aapcs architecture=arm" | 164 | BJAM_OPTS:append:arm = " abi=aapcs architecture=arm" |
165 | BJAM_OPTS_append_aarch64 = " abi=aapcs address-model=64 architecture=arm" | 165 | BJAM_OPTS:append:aarch64 = " abi=aapcs address-model=64 architecture=arm" |
166 | 166 | ||
167 | do_configure() { | 167 | do_configure() { |
168 | cd ${S} | 168 | cd ${S} |