Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

boost: Update from 1.65.1 to 1.67.0 #2384

Merged
merged 3 commits into from
May 14, 2018
Merged

boost: Update from 1.65.1 to 1.67.0 #2384

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4ab5361
boost: Update from 1.65.1 to 1.67.0
tomty89 Apr 29, 2018
7b5fcf2
boost: unsplit libboost-python
tomty89 Apr 30, 2018
2788cde
boost: add python2 variant of libboost_python
tomty89 May 4, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions packages/boost/bootstrap.sh.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
diff --git a/bootstrap.sh b/bootstrap.sh
index c6f3423..52c08e6 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -30,7 +30,7 @@ if test "x$ECHO" = x; then
fi

# Internal flags
-flag_no_python=
+flag_no_python=yes
flag_icu=
flag_show_libraries=

29 changes: 25 additions & 4 deletions packages/boost/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
TERMUX_PKG_HOMEPAGE=https://boost.org
TERMUX_PKG_DESCRIPTION="Free peer-reviewed portable C++ source libraries"
TERMUX_PKG_VERSION=1.65.1
TERMUX_PKG_REVISION=2
TERMUX_PKG_SHA256=9807a5d16566c57fd74fb522764e0b134a8bbe6b6e8967b83afefd30dcd3be81
TERMUX_PKG_VERSION=1.67.0
TERMUX_PKG_SHA256=2684c972994ee57fc5632e03bf044746f6eb45d4920c343937a465fd67a5adba
TERMUX_PKG_SRCURL=https://dl.bintray.com/boostorg/release/$TERMUX_PKG_VERSION/source/boost_${TERMUX_PKG_VERSION//./_}.tar.bz2
TERMUX_PKG_BUILD_IN_SRC=yes
TERMUX_PKG_DEPENDS="libbz2, liblzma"
TERMUX_PKG_BUILD_DEPENDS="python, python2"
TERMUX_PKG_BREAKS="libboost-python (<= 1.65.1-2)"
TERMUX_PKG_REPLACES="libboost-python (<= 1.65.1-2)"

termux_step_make_install() {
rm $TERMUX_PREFIX/lib/libboost* -f
Expand All @@ -15,9 +17,10 @@ termux_step_make_install() {

echo "using clang : $TERMUX_ARCH : $CXX : <linkflags>-L/data/data/com.termux/files/usr/lib ; " >> project-config.jam

echo "using python : 3.6 : $TERMUX_PREFIX/bin/python3 : $TERMUX_PREFIX/include/python3.6m : $TERMUX_PREFIX/lib ;" >> project-config.jam

./b2 target-os=android -j${TERMUX_MAKE_PROCESSES} \
include=/data/data/com.termux/files/usr/include \
include=/data/data/com.termux/files/usr/include/python3.6m \
toolset=clang-$TERMUX_ARCH \
--prefix="$TERMUX_PREFIX" \
-q \
Expand All @@ -30,4 +33,22 @@ termux_step_make_install() {
link=shared \
threading=multi \
install

./bootstrap.sh --with-libraries=python

echo "using clang : $TERMUX_ARCH : $CXX : <linkflags>-L/data/data/com.termux/files/usr/lib ; " >> project-config.jam

echo "using python : 2.7 : $TERMUX_PREFIX/bin/python2 : $TERMUX_PREFIX/include/python2.7 : $TERMUX_PREFIX/lib ;" >> project-config.jam

./b2 target-os=android -j${TERMUX_MAKE_PROCESSES} \
include=/data/data/com.termux/files/usr/include \
toolset=clang-$TERMUX_ARCH \
--stagedir="$TERMUX_PREFIX" \
-q \
-a \
--disable-icu \
cxxflags="$CXXFLAGS" \
link=shared \
threading=multi \
stage
}
3 changes: 0 additions & 3 deletions packages/boost/libboost-python.subpackage.sh
View file
Open in desktop

This file was deleted.

10 changes: 6 additions & 4 deletions packages/boost/python.jam.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
--- ../cache/boost_1_65_1/tools/build/src/tools/python.jam 2017-09-02 09:56:19.000000000 +0000
+++ ./tools/build/src/tools/python.jam 2018-01-06 01:26:09.993772847 +0000
@@ -651,7 +651,7 @@
diff --git a/tools/build/src/tools/python.jam b/tools/build/src/tools/python.jam
index 273b28a..3de7f40 100644
--- a/tools/build/src/tools/python.jam
+++ b/tools/build/src/tools/python.jam
@@ -651,7 +651,7 @@ local rule system-library-dependencies ( target-os )

case aix : return <library>pthread <library>dl ;

- case * : return <library>pthread <library>dl
+ case * : return <library>dl <linkflags>-lpython3.6m ;
+ case * : return <library>dl
<toolset>gcc:<library>util <toolset-intel:platform>linux:<library>util ;
}
}