summaryrefslogtreecommitdiffstats
path: root/libs
diff options
context:
space:
mode:
authorFlorian Franzmann2019-08-28 10:42:24 +0200
committerFlorian Franzmann2019-08-29 00:37:35 +0200
commit136a7764b67f338e3775be93d9fd112d5ab080c6 (patch)
tree3018e6728de3900e5a02be2bb83e97b5f1831a58 /libs
parent0374973aab6dc8a07278b2bd855771655aaa9d5b (diff)
Revert "boost: => 1_71_0"
This reverts commit 59afcc933d682eadc7bdd2dc6206492aee885820. breaks openexr build
Diffstat (limited to 'libs')
-rwxr-xr-xlibs/boost/BUILD2
-rwxr-xr-xlibs/boost/DETAILS2
-rw-r--r--libs/boost/HISTORY4
-rwxr-xr-xlibs/boost/INSTALL8
4 files changed, 6 insertions, 10 deletions
diff --git a/libs/boost/BUILD b/libs/boost/BUILD
index e08d542980..761c61d8c1 100755
--- a/libs/boost/BUILD
+++ b/libs/boost/BUILD
@@ -33,7 +33,7 @@ OPTS="$OPTS $BLIST" &&
CXXFLAGS="$CXXFLAGS" \
EXPAT_INCLUDE=$EXPAT_INCLUDE \
EXPAT_LIBPATH=$EXPAT_LIBPATH \
-./b2 -q \
+./bjam -q \
${BOOST_VARIANT} \
runtime-link=shared \
link=shared \
diff --git a/libs/boost/DETAILS b/libs/boost/DETAILS
index 7afc15cfc2..dce60bb8df 100755
--- a/libs/boost/DETAILS
+++ b/libs/boost/DETAILS
@@ -1,5 +1,5 @@
SPELL=boost
- VERSION=1_71_0
+ VERSION=1_70_0
VX=${VERSION/_/.}
VX=${VX/_/.}
SECURITY_PATCH=1
diff --git a/libs/boost/HISTORY b/libs/boost/HISTORY
index 20be5e0904..73a042256e 100644
--- a/libs/boost/HISTORY
+++ b/libs/boost/HISTORY
@@ -1,7 +1,3 @@
-2019-08-27 Treeve Jelbert <treeve@sourcemage.org>
- * DETAILS: version 1_71_0
- * BUILD INSTALL: now uses b2
-
2019-04-12 Treeve Jelbert <treeve@sourcemage.org>
* DETAILS: version 1_70_0
* DETAILS: add gpg checking
diff --git a/libs/boost/INSTALL b/libs/boost/INSTALL
index fe9b551d4d..4eb0e8c17b 100755
--- a/libs/boost/INSTALL
+++ b/libs/boost/INSTALL
@@ -1,4 +1,4 @@
-./b2 -q \
+./bjam -q \
${BOOST_VARIANT} \
runtime-link=shared \
link=shared \
@@ -8,6 +8,6 @@
--layout=system \
$OPTS \
install
-#if [[ ${INSTALL_BJAM} == y ]]; then
-# install bjam /usr/bin/bjam
-#fi
+if [[ ${INSTALL_BJAM} == y ]]; then
+ install bjam /usr/bin/bjam
+fi