diff options
Diffstat (limited to 'source/l/boost/boost.SlackBuild')
| -rwxr-xr-x | source/l/boost/boost.SlackBuild | 22 |
1 files changed, 18 insertions, 4 deletions
diff --git a/source/l/boost/boost.SlackBuild b/source/l/boost/boost.SlackBuild index 006c18971..aa859516f 100755 --- a/source/l/boost/boost.SlackBuild +++ b/source/l/boost/boost.SlackBuild @@ -1,8 +1,8 @@ #!/bin/sh # Copyright 2007, 2008, 2012 Eric Hameleers, Eindhoven, NL -# Copyright 2007-2008, 2012 Heinz Wiesinger, Amsterdam, NL -# Copyright 2008, 2009, 2010 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2007-2008, 2013 Heinz Wiesinger, Amsterdam, NL +# Copyright 2008, 2009, 2010, 2013 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -31,7 +31,6 @@ PKGNAM=boost VERSION=${VERSION:-$(echo $PKGNAM_*.tar.?z* | rev | cut -f 3- -d . | rev | cut -f 2- -d _)} BUILD=${BUILD:-3} -ICU=${ICU:-no} PKG_VERSION=$(echo $VERSION | tr _ .) # Leave this alone NUMJOBS=${NUMJOBS:-" -j7 "} @@ -75,6 +74,13 @@ rm -rf boost_$VERSION tar xvf $CWD/boost_$VERSION.tar.?z* || exit 1 cd boost_$VERSION || exit 1 +# Revert changeset 82498, which breaks OQGRAPH support in MariaDB: +zcat $CWD/changeset_82498.diff.gz | patch -R -p2 --verbose || exit 1 + +# glibc as of 2.17 no longer defines __GLIBC_HAVE_LONG_LONG (it is assumed +# to support it), so don't use that to detect long long support: +zcat $CWD/boost.glibc.long.long.diff.gz | patch -p0 --verbose || exit 1 + chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ @@ -87,6 +93,10 @@ find . \ # # (none currently for this $VERSION) +# Avoid C++11 for now as it introduces potentially different behaviour. +# Let's give applications some more time to adjust to this. +EXTRA_CXXFLAGS="-std=gnu++98" + # This is the python we build against: PYTHON_VERSION=$(python -c 'import sys; print sys.version[:3]') PYTHON_FLAGS="-sPYTHON_ROOT=/usr -sPYTHON_VERSION=$PYTHON_VERSION" @@ -96,7 +106,7 @@ cd tools/build/v2/engine CFLAGS="$SLKCFLAGS -fno-strict-aliasing" CC=gcc ./build.sh cc cd - -BJAM=$(find tools/build/v2/engine/ -name bjam -a -type f) +BJAM=$(find tools/build/v2/engine/ -name b2 -a -type f) # Create build subdirectory mkdir obj @@ -122,6 +132,8 @@ $BJAM \ link=shared \ threading=multi \ runtime-link=shared \ + cflags="$SLKCFLAGS" \ + cxxflags="$SLKCFLAGS $EXTRA_CXXFLAGS" \ $PYTHON_FLAGS \ stage @@ -142,6 +154,8 @@ $BJAM \ link=shared \ threading=multi \ runtime-link=shared \ + cflags="$SLKCFLAGS" \ + cxxflags="$SLKCFLAGS $EXTRA_CXXFLAGS" \ $PYTHON_FLAGS \ install |