diff options
author | Saul Wold <sgw@linux.intel.com> | 2011-12-27 17:03:03 -0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-01-03 12:14:31 +0000 |
commit | af162280e402b37005fb455a28183d765da01d7a (patch) | |
tree | 6a0392c4f39bcc4c5431839eaa7267f8f1a41d5b /meta/recipes-support | |
parent | ece80fe035c49a192abbca2dd00e50699e786e95 (diff) | |
download | poky-af162280e402b37005fb455a28183d765da01d7a.tar.gz |
boost: Update to 1.48 and Clean ups
There were 2 "BJAM_OPTS =" in the .bb and .inc, the .inc was being
overwritten and the ICU dependency was not removed correctly.
Do some clean-up including moving install_append into do_install
directly.
Finally the BJAM_EXTRAS += "threading=multi" was not setting set
correctly, set it on the BUILD spec line
(From OE-Core rev: c521aa1ad6aaae373ee4495e28e971a90adc5563)
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support')
-rw-r--r-- | meta/recipes-support/boost/boost.inc | 16 | ||||
-rw-r--r-- | meta/recipes-support/boost/boost_1.47.0.bb | 27 | ||||
-rw-r--r-- | meta/recipes-support/boost/boost_1.48.0.bb | 10 |
3 files changed, 22 insertions, 31 deletions
diff --git a/meta/recipes-support/boost/boost.inc b/meta/recipes-support/boost/boost.inc index aa577b3f0f..dfe00f2753 100644 --- a/meta/recipes-support/boost/boost.inc +++ b/meta/recipes-support/boost/boost.inc | |||
@@ -16,7 +16,7 @@ BOOST_VER = "${@"_".join(d.getVar("PV",1).split("."))}" | |||
16 | BOOST_MAJ = "${@"_".join(d.getVar("PV",1).split(".")[0:2])}" | 16 | BOOST_MAJ = "${@"_".join(d.getVar("PV",1).split(".")[0:2])}" |
17 | BOOST_P = "boost_${BOOST_VER}" | 17 | BOOST_P = "boost_${BOOST_VER}" |
18 | 18 | ||
19 | INC_PR = "r2" | 19 | INC_PR = "r0" |
20 | 20 | ||
21 | SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BOOST_P}.tar.bz2" | 21 | SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BOOST_P}.tar.bz2" |
22 | 22 | ||
@@ -119,15 +119,14 @@ BJAM_TOOLS = "-sTOOLS=gcc \ | |||
119 | '-sGCC_STDLIB_DIRECTORY=${STAGING_LIBDIR}' \ | 119 | '-sGCC_STDLIB_DIRECTORY=${STAGING_LIBDIR}' \ |
120 | '-sNO_BZIP2=1' \ | 120 | '-sNO_BZIP2=1' \ |
121 | '-sNO_ZLIB=1' \ | 121 | '-sNO_ZLIB=1' \ |
122 | '-sBUILD=release <optimization>space <inlining>on <debug-symbols>off' \ | 122 | '-sBUILD=release <optimization>space <threading>multi <inlining>on <debug-symbols>off' \ |
123 | '-sPYTHON_VERSION=${PYTHON_VERSION}' \ | 123 | '-sPYTHON_VERSION=${PYTHON_VERSION}' \ |
124 | '--layout=system' \ | 124 | '--layout=system' \ |
125 | " | 125 | " |
126 | 126 | ||
127 | BJAM_OPTS = '${BJAM_TOOLS} \ | 127 | BJAM_OPTS = '${BJAM_TOOLS} \ |
128 | --builddir=${S}/${TARGET_SYS} \ | 128 | --builddir=${S}/${TARGET_SYS} \ |
129 | --with-python-root=${PYTHON_ROOT} \ | 129 | --disable-icu \ |
130 | --without-icu \ | ||
131 | ${BJAM_EXTRA}' | 130 | ${BJAM_EXTRA}' |
132 | 131 | ||
133 | 132 | ||
@@ -153,6 +152,15 @@ do_install() { | |||
153 | --libdir=${D}${libdir} \ | 152 | --libdir=${D}${libdir} \ |
154 | --includedir=${D}${includedir} \ | 153 | --includedir=${D}${includedir} \ |
155 | install | 154 | install |
155 | for lib in ${BOOST_LIBS}; do | ||
156 | if [ -e ${D}${libdir}/libboost_${lib}.a ]; then | ||
157 | ln -s libboost_${lib}.a ${D}${libdir}/libboost_${lib}-mt.a | ||
158 | fi | ||
159 | if [ -e ${D}${libdir}/libboost_${lib}.so ]; then | ||
160 | ln -s libboost_${lib}.so ${D}${libdir}/libboost_${lib}-mt.so | ||
161 | fi | ||
162 | done | ||
163 | |||
156 | } | 164 | } |
157 | 165 | ||
158 | BBCLASSEXTEND = "native" | 166 | BBCLASSEXTEND = "native" |
diff --git a/meta/recipes-support/boost/boost_1.47.0.bb b/meta/recipes-support/boost/boost_1.47.0.bb deleted file mode 100644 index e1e0ca18fa..0000000000 --- a/meta/recipes-support/boost/boost_1.47.0.bb +++ /dev/null | |||
@@ -1,27 +0,0 @@ | |||
1 | include boost.inc | ||
2 | |||
3 | LIC_FILES_CHKSUM = "file://LICENSE_1_0.txt;md5=e4224ccaecb14d942c71d31bef20d78c" | ||
4 | |||
5 | PR = "${INC_PR}.0" | ||
6 | |||
7 | SRC_URI += "file://arm-intrinsics.patch" | ||
8 | |||
9 | SRC_URI[md5sum] = "a2dc343f7bc7f83f8941e47ed4a18200" | ||
10 | SRC_URI[sha256sum] = "815a5d9faac4dbd523fbcf3fe1065e443c0bbf43427c44aa423422c6ec4c2e31" | ||
11 | |||
12 | BJAM_OPTS = '${BJAM_TOOLS} \ | ||
13 | --builddir=${S}/${TARGET_SYS} \ | ||
14 | ${BJAM_EXTRA}' | ||
15 | |||
16 | # build only mt libraries and install symlinks for compatibility | ||
17 | BJAM_EXTRA += "threading=multi" | ||
18 | do_install_append() { | ||
19 | for lib in ${BOOST_LIBS}; do | ||
20 | if [ -e ${D}${libdir}/libboost_${lib}.a ]; then | ||
21 | ln -s libboost_${lib}.a ${D}${libdir}/libboost_${lib}-mt.a | ||
22 | fi | ||
23 | if [ -e ${D}${libdir}/libboost_${lib}.so ]; then | ||
24 | ln -s libboost_${lib}.so ${D}${libdir}/libboost_${lib}-mt.so | ||
25 | fi | ||
26 | done | ||
27 | } | ||
diff --git a/meta/recipes-support/boost/boost_1.48.0.bb b/meta/recipes-support/boost/boost_1.48.0.bb new file mode 100644 index 0000000000..29e2153054 --- /dev/null +++ b/meta/recipes-support/boost/boost_1.48.0.bb | |||
@@ -0,0 +1,10 @@ | |||
1 | include boost.inc | ||
2 | |||
3 | LIC_FILES_CHKSUM = "file://LICENSE_1_0.txt;md5=e4224ccaecb14d942c71d31bef20d78c" | ||
4 | |||
5 | PR = "${INC_PR}.0" | ||
6 | |||
7 | SRC_URI += "file://arm-intrinsics.patch" | ||
8 | |||
9 | SRC_URI[md5sum] = "d1e9a7a7f532bb031a3c175d86688d95" | ||
10 | SRC_URI[sha256sum] = "1bf254b2d69393ccd57a3cdd30a2f80318a005de8883a0792ed2f5e2598e5ada" | ||