wallenstein/void-packages
1
0
Fork 0
mirror of https://github.com/void-linux/void-packages.git synced 2025-07-28 16:32:57 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

boost: fix PIE, cross-build boost-jam.

Browse source
This commit is contained in:
Christian Neukirchen 2016-05-27 14:42:47 +02:00
parent fb13b69cbc
commit cd78b8e9b1
1 changed files with 19 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
srcpkgs/boost/template
View file

@ -1,7 +1,7 @@
# Template file for 'boost' # Template file for 'boost'
pkgname=boost pkgname=boost
version=1.58.0 version=1.58.0
revision=8 revision=9
wrksrc="${pkgname}_${version//\./_}" wrksrc="${pkgname}_${version//\./_}"
hostmakedepends="bzip2-devel" hostmakedepends="bzip2-devel"
makedepends="zlib-devel bzip2-devel icu-devel" makedepends="zlib-devel bzip2-devel icu-devel"
@ -12,13 +12,12 @@ license="Boost Software License 1.0"
distfiles="${SOURCEFORGE_SITE}/$pkgname/${pkgname}_${version//\./_}.tar.bz2" distfiles="${SOURCEFORGE_SITE}/$pkgname/${pkgname}_${version//\./_}.tar.bz2"
checksum=fdfc204fc33ec79c99b9a74944c3e54bd78be4f7f15e260c0e2700a36dc7d3e5 checksum=fdfc204fc33ec79c99b9a74944c3e54bd78be4f7f15e260c0e2700a36dc7d3e5
nopie=yes subpackages="boost-build boost-devel boost-jam"
subpackages="boost-build boost-devel"
if [ -z "$CROSS_BUILD" ]; then if [ -z "$CROSS_BUILD" ]; then
# XXX boost-jam and boost-python subpkgs. # XXX boost-python subpkg.
makedepends+=" python-devel" makedepends+=" python-devel"
subpackages+=" boost-jam boost-python" subpackages+=" boost-python"
fi fi
case "$XBPS_TARGET_MACHINE" in case "$XBPS_TARGET_MACHINE" in
@ -30,26 +29,27 @@ case "$XBPS_TARGET_MACHINE" in
esac esac
do_build() { do_build() {
if [ "$CROSS_BUILD" ]; then echo "using gcc : ${_toolset#gcc-} : ${CXX} ${CXXFLAGS} ;" >user-config.jam
echo "using gcc : ${_toolset#gcc-} : ${XBPS_CROSS_TRIPLET}-g++ ${CXXFLAGS} ;" \ ./bootstrap.sh --prefix=${DESTDIR}/usr
> user-config.jam (
else # Rebuild bjam for target
echo "using gcc : ${_toolset#gcc-} : g++ ${CXXFLAGS} ;" \ cd tools/build/src/engine
> user-config.jam LIBS="$LDFLAGS" ${wrksrc}/bjam -f build.jam --toolset=cc --toolset-root= -d+2 clean
fi LIBS="$LDFLAGS" ${wrksrc}/bjam -f build.jam --toolset=cc --toolset-root= -d+2
./bootstrap.sh -prefix=${DESTDIR}/usr )
./bjam --toolset=${_toolset} ${makejobs} abi=$_abi architecture=$_arch \ ./bjam ${makejobs} \
--toolset=${_toolset} abi=${_abi} architecture=${_arch} \
--user-config=${wrksrc}/user-config.jam --debug-building --user-config=${wrksrc}/user-config.jam --debug-building
} }
do_install() { do_install() {
# Install bjam # Install bjam
if [ -z "$CROSS_BUILD" ]; then for _b in tools/build/src/engine/bin.*/*; do
vbin bjam vbin ${_b}
fi done
# Install headers/libs # Install headers/libs
./bjam --prefix=${DESTDIR}/usr abi=$_abi architecture=$_arch \ ./bjam --prefix=${DESTDIR}/usr abi=${_abi} architecture=${_arch} \
--user-config=${wrksrc}/user-config.jam install --user-config=${wrksrc}/user-config.jam install
# Install Boost.Build stuff. # Install Boost.Build stuff.
@ -72,6 +72,7 @@ boost-jam_package() {
depends="boost-build-${version}_${revision}" depends="boost-build-${version}_${revision}"
pkg_install() { pkg_install() {
vmove usr/bin/bjam vmove usr/bin/bjam
vmove usr/bin/b2
} }
} }
boost-python_package() { boost-python_package() {