summaryrefslogtreecommitdiffstats
path: root/libs
diff options
context:
space:
mode:
authorIsmael Luceno2019-09-23 19:44:05 +0200
committerIsmael Luceno2019-09-23 22:35:52 +0200
commita6da1590841de31afe8801a9d9ab0b595796135e (patch)
treea127d0b875c8fb10780b9f1d491c8c85aec45096 /libs
parenta706be41273f35e05913ed01394b76de8d3daaaf (diff)
boost 1.71.0
Add ASIO to the list of libraries, and fix the version number to use periods, which is how upstream presents it, despite the file name. In this version bjam was renamed to b2.
Diffstat (limited to 'libs')
-rwxr-xr-xlibs/boost/BUILD2
-rwxr-xr-xlibs/boost/CONFIGURE1
-rwxr-xr-xlibs/boost/DETAILS10
-rw-r--r--libs/boost/HISTORY6
-rwxr-xr-xlibs/boost/INSTALL6
-rwxr-xr-xlibs/boost/PRE_SUB_DEPENDS3
-rwxr-xr-xlibs/boost/SUB_DEPENDS3
7 files changed, 20 insertions, 11 deletions
diff --git a/libs/boost/BUILD b/libs/boost/BUILD
index 761c61d8c1..e08d542980 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 \
-./bjam -q \
+./b2 -q \
${BOOST_VARIANT} \
runtime-link=shared \
link=shared \
diff --git a/libs/boost/CONFIGURE b/libs/boost/CONFIGURE
index 933f85b41a..df05a35381 100755
--- a/libs/boost/CONFIGURE
+++ b/libs/boost/CONFIGURE
@@ -5,6 +5,7 @@ if [[ "${BOOST_SELECT_LIBS}" == "y" ]]; then
config_query_multi BOOST_LIBS_AL "Which boost libraries would you like to install?" \
none \
atomic \
+ asio \
chrono \
container \
context \
diff --git a/libs/boost/DETAILS b/libs/boost/DETAILS
index dce60bb8df..e6b75c7b20 100755
--- a/libs/boost/DETAILS
+++ b/libs/boost/DETAILS
@@ -1,11 +1,9 @@
SPELL=boost
- VERSION=1_70_0
- VX=${VERSION/_/.}
- VX=${VX/_/.}
+ VERSION=1.71.0
SECURITY_PATCH=1
- SOURCE=${SPELL}_${VERSION}.tar.bz2
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/${SPELL}_${VERSION}
- SOURCE_URL[0]=https://dl.bintray.com/boostorg/release/$VX/source/$SOURCE
+ SOURCE=${SPELL}_${VERSION//./_}.tar.bz2
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/${SPELL}_${VERSION//./_}
+ SOURCE_URL[0]=https://dl.bintray.com/boostorg/release/$VERSION/source/$SOURCE
SOURCE2=$SOURCE.asc
SOURCE2_URL[0]=${SOURCE_URL[0]}.asc
SOURCE_GPG=boost.gpg:$SOURCE.asc:UPSTREAM_KEY
diff --git a/libs/boost/HISTORY b/libs/boost/HISTORY
index 73a042256e..144098157a 100644
--- a/libs/boost/HISTORY
+++ b/libs/boost/HISTORY
@@ -1,3 +1,9 @@
+2019-09-23 Ismael Luceno <ismael@sourcemage.org>
+ * CONFIGURE, PRE_SUB_DEPENDS, SUB_DEPENDS: Added ASIO library
+ * DETAILS: updated spell to 1.71.0
+ Fixed version number to use periods
+ * BUILD, INSTALL: bjam is now called 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 4eb0e8c17b..76c8882b84 100755
--- a/libs/boost/INSTALL
+++ b/libs/boost/INSTALL
@@ -1,4 +1,4 @@
-./bjam -q \
+./b2 -q \
${BOOST_VARIANT} \
runtime-link=shared \
link=shared \
@@ -9,5 +9,5 @@
$OPTS \
install
if [[ ${INSTALL_BJAM} == y ]]; then
- install bjam /usr/bin/bjam
-fi
+ install b2 /usr/bin/bjam
+fi
diff --git a/libs/boost/PRE_SUB_DEPENDS b/libs/boost/PRE_SUB_DEPENDS
index 4b3a7730b4..4db75bdf93 100755
--- a/libs/boost/PRE_SUB_DEPENDS
+++ b/libs/boost/PRE_SUB_DEPENDS
@@ -28,6 +28,8 @@ case $THIS_SUB_DEPENDS in
LOCALE) list_find "$BOOST_LIBS_AL" locale ;;
TIMER) list_find "$BOOST_LIBS_MZ" timer ;;
MATH) list_find "$BOOST_LIBS_MZ" math ;;
+# boost-1.35
+ ASIO) list_find "$BOOST_LIBS_AL" asio ;;
# boost-1.53
ATOMIC) list_find "$BOOST_LIBS_AL" atomic ;;
COROUTINE) list_find "$BOOST_LIBS_AL" coroutine ;;
@@ -42,4 +44,5 @@ case $THIS_SUB_DEPENDS in
CONTRACT) list_find "$BOOST_LIBS_AL" contract ;;
*) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL $THIS_SUB_DEPENDS${DEFAULT_COLOR}" ;
return 1;;
+
esac
diff --git a/libs/boost/SUB_DEPENDS b/libs/boost/SUB_DEPENDS
index ba86dac83f..ee8ae0a03a 100755
--- a/libs/boost/SUB_DEPENDS
+++ b/libs/boost/SUB_DEPENDS
@@ -26,6 +26,8 @@ case $THIS_SUB_DEPENDS in
LOCALE) list_add BOOST_LIBS_AL locale ;;
TIMER) list_add BOOST_LIBS_MZ timer ;;
MATH) list_add BOOST_LIBS_MZ math ;;
+# boost-1.35
+ ASIO) list_add BOOST_LIBS_AL asio ;;
# boost-1.53
ATOMIC) list_add BOOST_LIBS_AL atomic ;;
COROUTINE) list_add BOOST_LIBS_AL coroutine ;;
@@ -38,7 +40,6 @@ case $THIS_SUB_DEPENDS in
COROUTINE2) list_add BOOST_LIBS_AL coroutine2 ;;
# boost 1.67
CONTRACT) list_add BOOST_LIBS_AL contract ;;
-
*) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL $THIS_SUB_DEPENDS${DEFAULT_COLOR}" ;
return 1;;
esac