Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Florian Franzmann (136a7764b67f338e3775be93d9fd112d5ab080c6)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Florian Franzmann <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Florian Franzmann (136a7764b67f338e3775be93d9fd112d5ab080c6)
  • Date: Wed, 28 Aug 2019 22:55:40 +0000

GIT changes to master grimoire by Florian Franzmann
<siflfran AT hawo.stw.uni-erlangen.de>:

libs/boost/BUILD | 2 +-
libs/boost/DETAILS | 2 +-
libs/boost/HISTORY | 4 ----
libs/boost/INSTALL | 8 ++++----
4 files changed, 6 insertions(+), 10 deletions(-)

New commits:
commit 136a7764b67f338e3775be93d9fd112d5ab080c6
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

Revert "boost: => 1_71_0"

This reverts commit 59afcc933d682eadc7bdd2dc6206492aee885820.

breaks openexr build

diff --git a/libs/boost/BUILD b/libs/boost/BUILD
index e08d542..761c61d 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 7afc15c..dce60bb 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 20be5e0..73a0422 100644
--- a/libs/boost/HISTORY
+++ b/libs/boost/HISTORY
@@ -1,7 +1,3 @@
-2019-08-27 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 1_71_0
- * BUILD INSTALL: now uses b2
-
2019-04-12 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1_70_0
* DETAILS: add gpg checking
diff --git a/libs/boost/INSTALL b/libs/boost/INSTALL
index fe9b551..4eb0e8c 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



  • [SM-Commit] GIT changes to master grimoire by Florian Franzmann (136a7764b67f338e3775be93d9fd112d5ab080c6), Florian Franzmann, 08/28/2019

Archive powered by MHonArc 2.6.24.

Top of Page