diff options
author | Patrick J Volkerding <volkerdi@slackware.com> | 2024-03-22 20:16:55 +0000 |
---|---|---|
committer | Eric Hameleers <alien@slackware.com> | 2024-03-22 21:30:31 +0100 |
commit | e55090794aee9c31d337a44fc4df7df7cd5e344f (patch) | |
tree | d2d3c8e7171bd1d8312e1a52410bfa7585cd9663 /source/l/boost/boost.SlackBuild | |
parent | ce7f2d7967aa2aeed236fffa905c01a2f898d0d3 (diff) | |
download | current-e55090794aee9c31d337a44fc4df7df7cd5e344f.tar.gz current-e55090794aee9c31d337a44fc4df7df7cd5e344f.tar.xz |
Fri Mar 22 20:16:55 UTC 202420240322201655
a/volume_key-0.3.12-x86_64-7.txz: Rebuilt.
Build python3 bindings.
l/atkmm2-2.36.3-x86_64-1.txz: Added.
l/boost-1.84.0-x86_64-2.txz: Rebuilt.
Drop python2 support.
l/glibmm-2.66.7-x86_64-1.txz: Upgraded.
l/gst-plugins-bad-free-1.24.1-x86_64-1.txz: Upgraded.
l/gst-plugins-base-1.24.1-x86_64-1.txz: Upgraded.
l/gst-plugins-good-1.24.1-x86_64-1.txz: Upgraded.
l/gst-plugins-libav-1.24.1-x86_64-1.txz: Upgraded.
l/gstreamer-1.24.1-x86_64-1.txz: Upgraded.
l/gtkmm4-4.14.0-x86_64-1.txz: Upgraded.
l/unicode-ucd-15.1.0-noarch-1.txz: Added.
153MB installed... oh well. Needed by gucharmap.
xap/gucharmap-15.1.3-x86_64-1.txz: Upgraded.
xap/x3270-4.3ga7-x86_64-1.txz: Upgraded.
Diffstat (limited to 'source/l/boost/boost.SlackBuild')
-rwxr-xr-x | source/l/boost/boost.SlackBuild | 65 |
1 files changed, 10 insertions, 55 deletions
diff --git a/source/l/boost/boost.SlackBuild b/source/l/boost/boost.SlackBuild index c1a79671e..66604a9e4 100755 --- a/source/l/boost/boost.SlackBuild +++ b/source/l/boost/boost.SlackBuild @@ -2,7 +2,7 @@ # Copyright 2007, 2008, 2012 Eric Hameleers, Eindhoven, NL # Copyright 2007-2008, 2013, 2014, 2017 Heinz Wiesinger, Amsterdam, NL -# Copyright 2008, 2009, 2010, 2013, 2014, 2015, 2017, 2018, 2020, 2021, 2022 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2008, 2009, 2010, 2013, 2014, 2015, 2017, 2018, 2020, 2021, 2022, 2024 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -30,7 +30,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=boost VERSION=${VERSION:-$(echo $PKGNAM_*.tar.?z | rev | cut -f 3- -d . | rev | cut -f 2- -d _)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} PKG_VERSION=$(echo $VERSION | tr _ .) # Leave this alone NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} @@ -72,7 +72,6 @@ else LIBDIRSUFFIX="" fi -PYTHON_VERSION=$(python2 -c 'import sys; print("{}.{}".format(sys.version_info.major, sys.version_info.minor))') PYTHON3_VERSION=$(python3 -c 'import sys; print("{}.{}".format(sys.version_info.major, sys.version_info.minor))') TMP=${TMP:-/tmp} @@ -93,64 +92,19 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \+ -# First build bjam, the boost build system: -./bootstrap.sh \ - --with-toolset=gcc \ - --with-icu \ - --with-python=/usr/bin/python2 || exit 1 - -# # Next, we build boost using bjam -./b2 \ - $NUMJOBS \ - --layout=system \ - --build-dir=build-python2 \ - --prefix=/usr \ - --libdir=/usr/lib$LIBDIRSUFFIX \ - --build-type=minimal \ - toolset=gcc \ - variant=release \ - debug-symbols=off \ - link=shared \ - threading=multi \ - runtime-link=shared \ - python=$PYTHON_VERSION \ - cflags="$SLKCFLAGS" \ - cxxflags="$SLKCFLAGS $EXTRA_CXXFLAGS" \ - stage || exit 1 - -# # And then install boost.. -./b2 \ - $NUMJOBS \ - --layout=system \ - --build-dir=build-python2 \ - --prefix=$PKG/usr \ - --libdir=$PKG/usr/lib$LIBDIRSUFFIX \ - --build-type=minimal \ - toolset=gcc \ - variant=release \ - debug-symbols=off \ - link=shared \ - threading=multi \ - runtime-link=shared \ - python=$PYTHON_VERSION \ - cflags="$SLKCFLAGS" \ - cxxflags="$SLKCFLAGS $EXTRA_CXXFLAGS" \ - install || exit 1 - -# one more run to build libboost_python3.. -sed -e '/using python/ s@;@: /usr/include/python${PYTHON_VERSION/3*/${PYTHON_VERSION}} ;@' \ - -i bootstrap.sh +# Fix hardcorded python: +zcat $CWD/boost.bootstrap.python3.diff.gz | patch -p1 --verbose || exit 1 +# First build bjam, the boost build system: ./bootstrap.sh \ --with-toolset=gcc \ - --with-icu \ - --with-python=/usr/bin/python3 \ - --with-libraries=python || exit 1 + --with-python=/usr/bin/python3 || exit 1 +# Next, we build boost using bjam: ./b2 \ $NUMJOBS \ --layout=system \ - --build-dir=build-python3 \ + --build-dir=tmp-build-directory \ --prefix=/usr \ --libdir=/usr/lib$LIBDIRSUFFIX \ --build-type=minimal \ @@ -165,10 +119,11 @@ sed -e '/using python/ s@;@: /usr/include/python${PYTHON_VERSION/3*/${PYTHON_VER cxxflags="$SLKCFLAGS $EXTRA_CXXFLAGS" \ stage || exit 1 +# And then install boost: ./b2 \ $NUMJOBS \ --layout=system \ - --build-dir=build-python3 \ + --build-dir=tmp-build-directory \ --prefix=$PKG/usr \ --libdir=$PKG/usr/lib$LIBDIRSUFFIX \ --build-type=minimal \ |