boost: patch tuple.hpp to avoid breaking libetonyek build

This commit is contained in:
John McQuah 2023-08-14 15:39:40 -04:00
parent edbc418e77
commit 5011eb29e0
2 changed files with 44 additions and 40 deletions

View File

@ -1,6 +1,6 @@
untrusted comment: verify with /etc/ports/contrib.pub
RWSagIOpLGJF374LnHsClyADCwlwhRoMCcFMsGIFjSClOXJa2g5P8w0Ey50QuE3wpqQKzV9mN6RQn2+UT6fjv3BHurIwjTNkyQU=
SHA256 (Pkgfile) = 4e62f5d488771ac1c83f4a3135807fbc29a8a2c1f6036eee88fd9b70141bdbaf
RWSagIOpLGJF30VPJIi1GQZFPbuSszC3yFPDxTs+Il0ieFEksWhhFhnFH+i7TqWJtMzkeA0nGLmSU0rew9+e2cLk4cgKUr0Fuww=
SHA256 (Pkgfile) = 13633e644636e8be8feb7d897b0ae34b6bb5785a5ba5a0f59c627557a76f33ad
SHA256 (.footprint) = 5f0cdf94bc8917d39f01ecc89d6a92dc34d35a32de651a237cda8cd8bba79d85
SHA256 (boost_1_83_0.tar.bz2) = 6478edfe2f3305127cffe8caf73ea0176c53769f4bf1585be237eb30798c3b8e
SHA256 (boost-ublas-c++20-iterator.patch) = aa38addb40d5f44b4a8472029b475e7e6aef1c460509eb7d8edf03491dc1b5ee

View File

@ -6,53 +6,57 @@
name=boost
version=1.83.0
release=1
release=2
source=(https://boostorg.jfrog.io/artifactory/main/release/$version/source/${name}_${version//./_}.tar.bz2
boost-ublas-c++20-iterator.patch)
boost-ublas-c++20-iterator.patch)
build() {
cd ${name}_${version//./_}
cd ${name}_${version//./_}
# https://github.com/boostorg/ublas/pull/97
patch -p2 -i $SRC/boost-ublas-c++20-iterator.patch
# https://github.com/boostorg/ublas/pull/97
patch -p2 -i $SRC/boost-ublas-c++20-iterator.patch
# Boost.Build does not allow for disabling of numpy
# extensions, thereby leading to automagic numpy
# https://github.com/boostorg/python/issues/111#issuecomment-280447482
prt-get isinst python3-numpy || sed \
-e 's/\[ unless \[ python\.numpy \] : <build>no \]/<build>no/g' \
-i libs/python/build/Jamfile
# https://github.com/boostorg/phoenix/issues/111
sed -e '/^\s*auto uarg/s/auto/const auto/' \
-i boost/phoenix/stl/tuple.hpp
pushd tools/build
./bootstrap.sh --cxxflags="$CXXFLAGS $LDFLAGS"
./b2 install --prefix=$PKG/usr
ln -s b2 $PKG/usr/bin/bjam
popd
# Boost.Build does not allow for disabling of numpy
# extensions, thereby leading to automagic numpy
# https://github.com/boostorg/python/issues/111#issuecomment-280447482
prt-get isinst python3-numpy || sed \
-e 's/\[ unless \[ python\.numpy \] : <build>no \]/<build>no/g' \
-i libs/python/build/Jamfile
# Boost.Build does not allow for disabling of numpy
# extensions, thereby leading to automagic numpy
pushd tools/build
./bootstrap.sh --cxxflags="$CXXFLAGS $LDFLAGS"
./b2 install --prefix=$PKG/usr
ln -s b2 $PKG/usr/bin/bjam
popd
./bootstrap.sh --with-toolset=gcc --with-python=/usr/bin/python3
# Boost.Build does not allow for disabling of numpy
# extensions, thereby leading to automagic numpy
# support for OpenMPI
prt-get isinst openmpi && echo "using mpi ;" >>project-config.jam || PKGMK_BOOST+=' --without-mpi --without-graph_parallel'
prt-get isinst icu || PKGMK_BOOST+=' --disable-icu boost.locale.icu=off'
./bootstrap.sh --with-toolset=gcc --with-python=/usr/bin/python3
./b2 install ${PKGMK_BOOST} \
--prefix=$PKG/usr \
--layout=system \
-j ${JOBS-1} \
variant=release \
debug-symbols=off \
threading=multi \
runtime-link=shared \
link=shared,static \
toolset=gcc \
python=$(/usr/bin/python3 -c 'import sys; print("%s.%s" % sys.version_info[:2])') \
cflags="$CPPFLAGS $CFLAGS -fPIC -O3 -ffat-lto-objects" \
cxxflags="$CPPFLAGS $CXXFLAGS -fPIC -O3 -ffat-lto-objects" \
linkflags="$LDFLAGS"
# support for OpenMPI
prt-get isinst openmpi && echo "using mpi ;" >>project-config.jam || PKGMK_BOOST+=' --without-mpi --without-graph_parallel'
prt-get isinst icu || PKGMK_BOOST+=' --disable-icu boost.locale.icu=off'
prt-get isinst python3-numpy || rm -r $PKG/usr/include/boost/python/numpy*
prt-get isinst openmpi || rm -r $PKG//usr/include/boost/mpi/python*
./b2 install ${PKGMK_BOOST} \
--prefix=$PKG/usr \
--layout=system \
-j ${JOBS-1} \
variant=release \
debug-symbols=off \
threading=multi \
runtime-link=shared \
link=shared,static \
toolset=gcc \
python=$(/usr/bin/python3 -c 'import sys; print("%s.%s" % sys.version_info[:2])') \
cflags="$CPPFLAGS $CFLAGS -fPIC -O3 -ffat-lto-objects" \
cxxflags="$CPPFLAGS $CXXFLAGS -fPIC -O3 -ffat-lto-objects" \
linkflags="$LDFLAGS"
prt-get isinst python3-numpy || rm -r $PKG/usr/include/boost/python/numpy*
prt-get isinst openmpi || rm -r $PKG//usr/include/boost/mpi/python*
}