diff options
| author |   Eric Hameleers <alien@slackware.com> | 2008-03-11 22:55:24 +0000 |
|---|---|---|
| committer | Eric Hameleers <alien@slackware.com> | 2008-03-11 22:55:24 +0000 |
| commit | 5e98f5e957533978a91c78b58789daf7fe5fa713 (patch) | |
| tree | 41a4c50d0f23b3a1733f733423cfb37dcc423c4f /boost | |
| parent | 115cfbc335fd0805459d326b45147944d4b5f1c7 (diff) | |
| download | asb-5e98f5e957533978a91c78b58789daf7fe5fa713.tar.gz asb-5e98f5e957533978a91c78b58789daf7fe5fa713.tar.xz | |
Update which makes it build on Slackware 12.1
Diffstat (limited to 'boost')
| -rwxr-xr-x | boost/build/boost.SlackBuild | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/boost/build/boost.SlackBuild b/boost/build/boost.SlackBuild index cabdd036..d8b91fdd 100755 --- a/boost/build/boost.SlackBuild +++ b/boost/build/boost.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh # $Id$ -# Copyright (c) 2007 Eric Hameleers <alien@slackware.com> +# Copyright (c) 2007-2008 Eric Hameleers <alien@slackware.com> # All rights reserved. # # Permission to use, copy, modify, and distribute this software for @@ -36,6 +36,9 @@ # * Update, Slackware 12.0 package. # 1.34.1-2: 21/dec/2007 by Eric Hameleers <alien@slackware.com> # * Apply a security fix. +# 1.34.1-3: 11/mar/2008 by Eric Hameleers <alien@slackware.com> +# * Make it build on Slackware 12.1. Thanks to Heinz Wiesinger. +# No longer add the bjam binary to the package. # # Run 'sh boost.SlackBuild --cleanup' to build a Slackware package. # The package (.tgz) plus descriptive .txt file are created in /tmp . @@ -49,7 +52,7 @@ PRGNAM=boost VERSION=${VERSION:-1.34.1} SRCVER=$(echo ${VERSION} | tr '.' '_') ARCH=${ARCH:-i486} -BUILD=${BUILD:-2} +BUILD=${BUILD:-3} # This is the python we build against: PYTHON_VERSION=$(python -c 'import sys; print sys.version[:3]') @@ -169,7 +172,9 @@ export CXXFLAGS="$SLKCFLAGS" # First build bjam, the boost build system: ( cd tools/jam/src - CFLAGS="$SLKCFLAGS -fno-strict-aliasing" CC=gcc ./build.sh gcc \ + # Was different prior to Slackware 12.1: + #gcc ./build.sh gcc \ + CFLAGS="$SLKCFLAGS -fno-strict-aliasing" CC=gcc ./build.sh cc \ 2>&1 | tee $OUTPUT/make-${PRGNAM}.log ) || exit $? BJAM=$(find tools/jam/src/ -name bjam -a -type f) @@ -191,7 +196,7 @@ $BJAM \ 2>&1 | tee -a $OUTPUT/make-${PRGNAM}.log # And then install boost.. -mkdir -p $PKG/usr/{bin,lib,include} $PKG/usr/share/boost-build +mkdir -p $PKG/usr/{lib,include} echo "Installing boost now..." $BJAM \ @@ -202,12 +207,9 @@ $BJAM \ install \ 2>&1 | tee $OUTPUT/install-${PRGNAM}.log -# 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 +# Install the bjam binary (we no longer do that, +# as it may clobber another boost.bjam or boost.build package): +#cp -a $BJAM $PKG/usr/bin ## Move incorrectly installed include files if [ -d $PKG/usr/include/${PRGNAM}_${SRCVER} ]; then |