diff --git a/packages/boost/bootstrap.sh.patch b/packages/boost/bootstrap.sh.patch new file mode 100644 index 00000000000000..4e6762a90c9972 --- /dev/null +++ b/packages/boost/bootstrap.sh.patch @@ -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= + diff --git a/packages/boost/build.sh b/packages/boost/build.sh index 8d5121d66e656e..5243259f87e280 100644 --- a/packages/boost/build.sh +++ b/packages/boost/build.sh @@ -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 @@ -15,9 +17,10 @@ termux_step_make_install() { echo "using clang : $TERMUX_ARCH : $CXX : -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 \ @@ -30,4 +33,22 @@ termux_step_make_install() { link=shared \ threading=multi \ install + + ./bootstrap.sh --with-libraries=python + + echo "using clang : $TERMUX_ARCH : $CXX : -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 } diff --git a/packages/boost/libboost-python.subpackage.sh b/packages/boost/libboost-python.subpackage.sh deleted file mode 100644 index 4d806dd297227b..00000000000000 --- a/packages/boost/libboost-python.subpackage.sh +++ /dev/null @@ -1,3 +0,0 @@ -TERMUX_SUBPKG_INCLUDE="lib/libboost_python*" -TERMUX_SUBPKG_DESCRIPTION="Boost.Python Library" -TERMUX_SUBPKG_DEPENDS="python, boost" diff --git a/packages/boost/python.jam.patch b/packages/boost/python.jam.patch index c7a80260fd2234..2c8d73f1ad076d 100644 --- a/packages/boost/python.jam.patch +++ b/packages/boost/python.jam.patch @@ -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 pthread dl ; - case * : return pthread dl -+ case * : return dl -lpython3.6m ; ++ case * : return dl gcc:util linux:util ; } }