summaryrefslogtreecommitdiffstats
path: root/boost
diff options
context:
space:
mode:
author Eric Hameleers <alien@slackware.com>2008-03-07 19:05:21 +0000
committer Eric Hameleers <alien@slackware.com>2008-03-07 19:05:21 +0000
commitbfafe4d36461bc5a55ade09cb89fbd853d2fae62 (patch)
tree4428437c863f760d1e7aacd9f6d3c106d39b06e4 /boost
parente97149d6d0e19a6235da90083a3aef894c704c33 (diff)
downloadasb-bfafe4d36461bc5a55ade09cb89fbd853d2fae62.tar.gz
asb-bfafe4d36461bc5a55ade09cb89fbd853d2fae62.tar.xz
Changes suggested by Heinz Wiesinger and Michael Gehring
Diffstat (limited to 'boost')
-rwxr-xr-xboost/build/boost.SlackBuild9
1 files changed, 7 insertions, 2 deletions
diff --git a/boost/build/boost.SlackBuild b/boost/build/boost.SlackBuild
index a5b0fd44..cabdd036 100755
--- a/boost/build/boost.SlackBuild
+++ b/boost/build/boost.SlackBuild
@@ -169,7 +169,8 @@ export CXXFLAGS="$SLKCFLAGS"
# First build bjam, the boost build system:
( cd tools/jam/src
- ./build.sh gcc 2>&1 | tee $OUTPUT/make-${PRGNAM}.log
+ CFLAGS="$SLKCFLAGS -fno-strict-aliasing" CC=gcc ./build.sh gcc \
+ 2>&1 | tee $OUTPUT/make-${PRGNAM}.log
) || exit $?
BJAM=$(find tools/jam/src/ -name bjam -a -type f)
@@ -190,7 +191,7 @@ $BJAM \
2>&1 | tee -a $OUTPUT/make-${PRGNAM}.log
# And then install boost..
-mkdir -p $PKG/usr/{bin,lib,include}
+mkdir -p $PKG/usr/{bin,lib,include} $PKG/usr/share/boost-build
echo "Installing boost now..."
$BJAM \
@@ -203,6 +204,10 @@ $BJAM \
# Install the bjam binary:
cp -a $BJAM $PKG/usr/bin
+# Install boost-build
+cp -a -r tools/build/v2/* $PKG/usr/share/boost-build/
+# Set boost-build default toolkit
+echo "using gcc ;" >> $PKG/usr/share/boost-build/site-config.jam
## Move incorrectly installed include files
if [ -d $PKG/usr/include/${PRGNAM}_${SRCVER} ]; then