Browse Source

boost: unsplit libboost-python

libboost_python was never supposed to be linked to libpython. Hence
the patch, and in turn the dependency to the python package, and in
turn the package split, were never necessary.
android-5
Tom Yan 7 years ago
committed by Fredrik Fornwall
parent
commit
5beffaeceb
  1. 13
      packages/boost/bootstrap.sh.patch
  2. 6
      packages/boost/build.sh
  3. 3
      packages/boost/libboost-python.subpackage.sh
  4. 10
      packages/boost/python.jam.patch

13
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=

6
packages/boost/build.sh

@ -5,6 +5,9 @@ TERMUX_PKG_SHA256=2684c972994ee57fc5632e03bf044746f6eb45d4920c343937a465fd67a5ad
TERMUX_PKG_SRCURL=https://dl.bintray.com/boostorg/release/$TERMUX_PKG_VERSION/source/boost_${TERMUX_PKG_VERSION//./_}.tar.bz2 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_BUILD_IN_SRC=yes
TERMUX_PKG_DEPENDS="libbz2, liblzma" TERMUX_PKG_DEPENDS="libbz2, liblzma"
TERMUX_PKG_BUILD_DEPENDS="python"
TERMUX_PKG_BREAKS="libboost-python (<= 1.65.1-2)"
TERMUX_PKG_REPLACES="libboost-python (<= 1.65.1-2)"
termux_step_make_install() { termux_step_make_install() {
rm $TERMUX_PREFIX/lib/libboost* -f rm $TERMUX_PREFIX/lib/libboost* -f
@ -14,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 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} \ ./b2 target-os=android -j${TERMUX_MAKE_PROCESSES} \
include=/data/data/com.termux/files/usr/include \ include=/data/data/com.termux/files/usr/include \
include=/data/data/com.termux/files/usr/include/python3.6m \
toolset=clang-$TERMUX_ARCH \ toolset=clang-$TERMUX_ARCH \
--prefix="$TERMUX_PREFIX" \ --prefix="$TERMUX_PREFIX" \
-q \ -q \

3
packages/boost/libboost-python.subpackage.sh

@ -1,3 +0,0 @@
TERMUX_SUBPKG_INCLUDE="lib/libboost_python*"
TERMUX_SUBPKG_DESCRIPTION="Boost.Python Library"
TERMUX_SUBPKG_DEPENDS="python, boost"

10
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 diff --git a/tools/build/src/tools/python.jam b/tools/build/src/tools/python.jam
+++ ./tools/build/src/tools/python.jam 2018-01-06 01:26:09.993772847 +0000 index 273b28a..3de7f40 100644
@@ -651,7 +651,7 @@ --- 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 aix : return <library>pthread <library>dl ;
- case * : 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 ; <toolset>gcc:<library>util <toolset-intel:platform>linux:<library>util ;
} }
} }

Loading…
Cancel
Save