diff options
Diffstat (limited to 'meta/recipes-support/boost/boost.inc')
-rw-r--r-- | meta/recipes-support/boost/boost.inc | 47 |
1 files changed, 27 insertions, 20 deletions
diff --git a/meta/recipes-support/boost/boost.inc b/meta/recipes-support/boost/boost.inc index c9bb178541..77105aa1fa 100644 --- a/meta/recipes-support/boost/boost.inc +++ b/meta/recipes-support/boost/boost.inc | |||
@@ -1,11 +1,15 @@ | |||
1 | SUMMARY = "Free peer-reviewed portable C++ source libraries" | 1 | SUMMARY = "Free peer-reviewed portable C++ source libraries" |
2 | DESCRIPTION = "Provides free peer-reviewed portable C++ source libraries. The emphasis is on libraries which work well with the C++ \ | ||
3 | Standard Library. One goal is to establish 'existing practice' and \ | ||
4 | provide reference implementations so that the Boost libraries are suitable for eventual standardization. Some of the libraries have already been proposed for inclusion in the C++ Standards Committee's \ | ||
5 | upcoming C++ Standard Library Technical Report." | ||
2 | SECTION = "libs" | 6 | SECTION = "libs" |
3 | DEPENDS = "boost-build-native zlib bzip2" | 7 | DEPENDS = "boost-build-native zlib bzip2" |
4 | 8 | ||
5 | CVE_PRODUCT = "boost:boost" | 9 | CVE_PRODUCT = "boost:boost" |
6 | 10 | ||
7 | ARM_INSTRUCTION_SET_armv4 = "arm" | 11 | ARM_INSTRUCTION_SET:armv4 = "arm" |
8 | ARM_INSTRUCTION_SET_armv5 = "arm" | 12 | ARM_INSTRUCTION_SET:armv5 = "arm" |
9 | 13 | ||
10 | B = "${WORKDIR}/build" | 14 | B = "${WORKDIR}/build" |
11 | do_configure[cleandirs] = "${B}" | 15 | do_configure[cleandirs] = "${B}" |
@@ -24,6 +28,7 @@ BOOST_LIBS = "\ | |||
24 | graph \ | 28 | graph \ |
25 | headers \ | 29 | headers \ |
26 | iostreams \ | 30 | iostreams \ |
31 | json \ | ||
27 | log \ | 32 | log \ |
28 | math \ | 33 | math \ |
29 | program_options \ | 34 | program_options \ |
@@ -35,6 +40,7 @@ BOOST_LIBS = "\ | |||
35 | thread \ | 40 | thread \ |
36 | timer \ | 41 | timer \ |
37 | type_erasure \ | 42 | type_erasure \ |
43 | url \ | ||
38 | wave \ | 44 | wave \ |
39 | " | 45 | " |
40 | 46 | ||
@@ -67,35 +73,35 @@ python __anonymous () { | |||
67 | if "-native" in pn: | 73 | if "-native" in pn: |
68 | pkg = pkg + "-native" | 74 | pkg = pkg + "-native" |
69 | packages.append(mlprefix + pkg) | 75 | packages.append(mlprefix + pkg) |
70 | if not d.getVar("FILES_%s" % pkg): | 76 | if not d.getVar("FILES:%s" % pkg): |
71 | d.setVar("FILES_%s%s" % (mlprefix, pkg), "${libdir}/libboost_%s*.so.*" % lib) | 77 | d.setVar("FILES:%s%s" % (mlprefix, pkg), "${libdir}/libboost_%s*.so.*" % lib) |
72 | else: | 78 | else: |
73 | d.setVar("FILES_%s%s" % (mlprefix, pkg), d.getVar("FILES_%s" % pkg)) | 79 | d.setVar("FILES:%s%s" % (mlprefix, pkg), d.getVar("FILES:%s" % pkg)) |
74 | 80 | ||
75 | d.setVar("BOOST_PACKAGES", " ".join(packages)) | 81 | d.setVar("BOOST_PACKAGES", " ".join(packages)) |
76 | d.setVar("BJAM_EXTRA", " ".join(extras)) | 82 | d.setVar("BJAM_EXTRA", " ".join(extras)) |
77 | } | 83 | } |
78 | 84 | ||
79 | # Override the contents of specific packages | 85 | # Override the contents of specific packages |
80 | FILES_${PN}-graph_parallel = "${libdir}/libboost_graph_parallel.so.*" | 86 | FILES:${PN}-graph_parallel = "${libdir}/libboost_graph_parallel.so.*" |
81 | FILES_${PN}-locale = "${libdir}/libboost_locale.so.*" | 87 | FILES:${PN}-locale = "${libdir}/libboost_locale.so.*" |
82 | FILES_${PN}-mpi = "${libdir}/mpi.so ${libdir}/libboost_mpi*.so.*" | 88 | FILES:${PN}-mpi = "${libdir}/mpi.so ${libdir}/libboost_mpi*.so.*" |
83 | FILES_boost-serialization = "${libdir}/libboost_serialization*.so.* \ | 89 | FILES:boost-serialization = "${libdir}/libboost_serialization*.so.* \ |
84 | ${libdir}/libboost_wserialization*.so.*" | 90 | ${libdir}/libboost_wserialization*.so.*" |
85 | FILES_boost-test = "${libdir}/libboost_prg_exec_monitor*.so.* \ | 91 | FILES:boost-test = "${libdir}/libboost_prg_exec_monitor*.so.* \ |
86 | ${libdir}/libboost_unit_test_framework*.so.*" | 92 | ${libdir}/libboost_unit_test_framework*.so.*" |
87 | 93 | ||
88 | # -dev last to pick up the remaining stuff | 94 | # -dev last to pick up the remaining stuff |
89 | PACKAGES += "${PN}-dev ${PN}-staticdev" | 95 | PACKAGES += "${PN}-dev ${PN}-staticdev" |
90 | FILES_${PN}-dev = "${includedir} ${libdir}/libboost_*.so ${libdir}/cmake" | 96 | FILES:${PN}-dev = "${includedir} ${libdir}/libboost_*.so ${libdir}/cmake" |
91 | FILES_${PN}-staticdev = "${libdir}/libboost_*.a" | 97 | FILES:${PN}-staticdev = "${libdir}/libboost_*.a" |
92 | 98 | ||
93 | # "boost" is a metapackage which pulls in all boost librabries | 99 | # "boost" is a metapackage which pulls in all boost librabries |
94 | PACKAGES += "${PN}" | 100 | PACKAGES += "${PN}" |
95 | FILES_${PN} = "" | 101 | FILES:${PN} = "" |
96 | ALLOW_EMPTY_${PN} = "1" | 102 | ALLOW_EMPTY:${PN} = "1" |
97 | RRECOMMENDS_${PN} += "${BOOST_PACKAGES}" | 103 | RRECOMMENDS:${PN} += "${BOOST_PACKAGES}" |
98 | RRECOMMENDS_${PN}_class-native = "" | 104 | RRECOMMENDS:${PN}:class-native = "" |
99 | 105 | ||
100 | # to avoid GNU_HASH QA errors added LDFLAGS to ARCH; a little bit dirty but at least it works | 106 | # to avoid GNU_HASH QA errors added LDFLAGS to ARCH; a little bit dirty but at least it works |
101 | TARGET_CC_ARCH += "${LDFLAGS}" | 107 | TARGET_CC_ARCH += "${LDFLAGS}" |
@@ -146,19 +152,20 @@ BOOST_PARALLEL_MAKE = "${@oe.utils.parallel_make_argument(d, '-j%d')}" | |||
146 | BJAM_OPTS = '${BOOST_PARALLEL_MAKE} -d+2 -q \ | 152 | BJAM_OPTS = '${BOOST_PARALLEL_MAKE} -d+2 -q \ |
147 | ${BJAM_TOOLS} \ | 153 | ${BJAM_TOOLS} \ |
148 | -sBOOST_BUILD_USER_CONFIG=${WORKDIR}/user-config.jam \ | 154 | -sBOOST_BUILD_USER_CONFIG=${WORKDIR}/user-config.jam \ |
155 | -sICU_PATH=${STAGING_EXECPREFIXDIR} \ | ||
149 | --build-dir=${B} \ | 156 | --build-dir=${B} \ |
150 | --disable-icu \ | 157 | --disable-icu \ |
151 | ${BJAM_EXTRA}' | 158 | ${BJAM_EXTRA}' |
152 | 159 | ||
153 | # Native compilation of bzip2 isn't working | 160 | # Native compilation of bzip2 isn't working |
154 | BJAM_OPTS_append_class-native = ' -sNO_BZIP2=1' | 161 | BJAM_OPTS:append:class-native = ' -sNO_BZIP2=1' |
155 | 162 | ||
156 | # Adjust the build for x32 | 163 | # Adjust the build for x32 |
157 | BJAM_OPTS_append_x86-x32 = " abi=x32 address-model=64" | 164 | BJAM_OPTS:append:x86-x32 = " abi=x32 address-model=64" |
158 | 165 | ||
159 | # cross compiling for arm fails to detect abi, so provide some help | 166 | # cross compiling for arm fails to detect abi, so provide some help |
160 | BJAM_OPTS_append_arm = " abi=aapcs architecture=arm" | 167 | BJAM_OPTS:append:arm = " abi=aapcs architecture=arm" |
161 | BJAM_OPTS_append_aarch64 = " abi=aapcs address-model=64 architecture=arm" | 168 | BJAM_OPTS:append:aarch64 = " abi=aapcs address-model=64 architecture=arm" |
162 | 169 | ||
163 | do_configure() { | 170 | do_configure() { |
164 | cd ${S} | 171 | cd ${S} |