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>

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("."))}"
 BOOST_MAJ = "${@"_".join(d.getVar("PV",1).split(".")[0:2])}"
 BOOST_P = "boost_${BOOST_VER}"
 
-INC_PR = "r2"
+INC_PR = "r0"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BOOST_P}.tar.bz2"
 
@@ -119,15 +119,14 @@ BJAM_TOOLS   = "-sTOOLS=gcc \
                 '-sGCC_STDLIB_DIRECTORY=${STAGING_LIBDIR}' \
                 '-sNO_BZIP2=1' \
                 '-sNO_ZLIB=1' \
-                '-sBUILD=release <optimization>space <inlining>on <debug-symbols>off' \
+                '-sBUILD=release <optimization>space <threading>multi <inlining>on <debug-symbols>off' \
                 '-sPYTHON_VERSION=${PYTHON_VERSION}' \
                 '--layout=system' \
                 "
 
 BJAM_OPTS    = '${BJAM_TOOLS} \
                 --builddir=${S}/${TARGET_SYS} \
-                --with-python-root=${PYTHON_ROOT} \
-                --without-icu \
+                --disable-icu \
                 ${BJAM_EXTRA}'
 
 
@@ -153,6 +152,15 @@ do_install() {
                 --libdir=${D}${libdir} \
                 --includedir=${D}${includedir} \
                 install
+        for lib in ${BOOST_LIBS}; do
+                if [ -e ${D}${libdir}/libboost_${lib}.a ]; then
+                        ln -s libboost_${lib}.a ${D}${libdir}/libboost_${lib}-mt.a
+                fi
+                if [ -e ${D}${libdir}/libboost_${lib}.so ]; then
+                        ln -s libboost_${lib}.so ${D}${libdir}/libboost_${lib}-mt.so
+                fi
+        done
+
 }
 
 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 @@
-include boost.inc
-
-LIC_FILES_CHKSUM = "file://LICENSE_1_0.txt;md5=e4224ccaecb14d942c71d31bef20d78c"
-
-PR = "${INC_PR}.0"
-
-SRC_URI += "file://arm-intrinsics.patch"
-
-SRC_URI[md5sum] = "a2dc343f7bc7f83f8941e47ed4a18200"
-SRC_URI[sha256sum] = "815a5d9faac4dbd523fbcf3fe1065e443c0bbf43427c44aa423422c6ec4c2e31"
-
-BJAM_OPTS    = '${BJAM_TOOLS} \
-                --builddir=${S}/${TARGET_SYS} \
-                ${BJAM_EXTRA}'
-
-# build only mt libraries and install symlinks for compatibility
-BJAM_EXTRA += "threading=multi"
-do_install_append() {
-        for lib in ${BOOST_LIBS}; do
-            if [ -e ${D}${libdir}/libboost_${lib}.a ]; then
-                ln -s libboost_${lib}.a ${D}${libdir}/libboost_${lib}-mt.a
-            fi
-            if [ -e ${D}${libdir}/libboost_${lib}.so ]; then
-                ln -s libboost_${lib}.so ${D}${libdir}/libboost_${lib}-mt.so
-            fi
-        done
-}
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 @@
+include boost.inc
+
+LIC_FILES_CHKSUM = "file://LICENSE_1_0.txt;md5=e4224ccaecb14d942c71d31bef20d78c"
+
+PR = "${INC_PR}.0"
+
+SRC_URI += "file://arm-intrinsics.patch"
+
+SRC_URI[md5sum] = "d1e9a7a7f532bb031a3c175d86688d95"
+SRC_URI[sha256sum] = "1bf254b2d69393ccd57a3cdd30a2f80318a005de8883a0792ed2f5e2598e5ada"