Back to the custom build procedure, see if we can shrink the package size

1 files changed, 50 insertions, 26 deletions

diff --git a/boost/build/boost.SlackBuild b/boost/build/boost.SlackBuild
index 417c0716..907f018a 100755
--- a/boost/build/boost.SlackBuild
+++ b/boost/build/boost.SlackBuild
@@ -53,7 +53,7 @@ BUILD=${BUILD:-1}
 PYTHON_VERSION=$(python -c 'import sys; print sys.version[:3]')
 PYTHON_FLAGS="-sPYTHON_ROOT=/usr -sPYTHON_VERSION=$PYTHON_VERSION"
 
-DOCS="README LICENSE_1_0.txt doc/html people wiki"
+DOCS="README LICENSE_1_0.txt people wiki"
 
 # Where do we look for sources?
 CWD=$(pwd)
@@ -111,8 +111,8 @@ esac
 # Create working directories:
 mkdir -p $TMP/tmp-$PRGNAM # location to build the source
 rm -rf $TMP/tmp-$PRGNAM/* # By default we remove the remnants of previous build
-mkdir -p $PKG  # place for the package to be built
-rm -rf $PKG/*  # We always erase old package's contents:
+mkdir -p $PKG     # place for the package to be built
+rm -rf $PKG/*     # We always erase old package's contents:
 mkdir -p $OUTPUT  # place for the package to be saved
 
 # Source file availability:
@@ -161,30 +161,54 @@ echo Building ...
 export LDFLAGS="$SLKLDFLAGS"
 export CFLAGS="$SLKCFLAGS"
 export CXXFLAGS="$SLKCFLAGS"
-./configure --prefix=/usr \
-            --libdir=/usr/lib${LIBDIRSUFFIX} \
-            --with-libraries=all \
-            2>&1 | tee $OUTPUT/configure-${PRGNAM}.log
-make 2>&1 | tee $OUTPUT/make-${PRGNAM}.log
-
-# Install all the needed stuff to the package dir -
-# Use installwatch if available, to produce a logfile of the installation
-# process that is more easily readable:
-mkdir -p $PKG/usr/{bin,lib${LIBDIRSUFFIX},include}
-if $(which installwatch > /dev/null 2>&1); then
-  installwatch -o $OUTPUT/install-${PRGNAM}.log make install \
-    PREFIX=$PKG/usr EPREFIX=$PKG/usr \
-    LIBDIR=$PKG/usr/lib${LIBDIRSUFFIX} INCLUDEDIR=$PKG/usr/include
-else
-  make install \
-    PREFIX=$PKG/usr EPREFIX=$PKG/usr \
-    LIBDIR=$PKG/usr/lib${LIBDIRSUFFIX} INCLUDEDIR=$PKG/usr/include \
-    2>&1 |tee $OUTPUT/install-${PRGNAM}.log
-fi
 
-# Add the bjam binary:
-BJAM=$(find tools/jam/src/ -name bjam -type f)
-cp $BJAM $PKG/usr/bin/
+# First build bjam, the boost build system:
+( cd tools/jam/src
+  ./build.sh gcc 2>&1 | tee $OUTPUT/make-${PRGNAM}.log
+) || exit $?
+BJAM=$(find tools/jam/src/ -name bjam -a -type f)
+
+# Build bcp
+( cd tools/bcp
+  ../../$BJAM 2>&1 | tee -a $OUTPUT/make-${PRGNAM}.log
+) || exit $?
+BCP=$(find bin/boost/tools -name bcp -a -type f)
+
+# Create build subdirectory
+mkdir obj
+
+# Next, we build boost using bjam
+$BJAM \
+  $PYTHON_FLAGS \
+  "-sBUILD=release <optimization>speed <inlining>full <threading>single/multi" \
+  "-sNO_COMPRESSION=0" "-sZLIB_INCLUDE=/usr/include" "-sZLIB_LIBPATH=/usr/lib" \
+  "-sBZIP2_INCLUDE=/usr/include" "-sBZIP2_LIBPATH=/usr/lib" \
+  --toolset=gcc --layout=system --builddir=obj \
+  --prefix=/usr \
+  stage \
+  2>&1 | tee -a $OUTPUT/make-${PRGNAM}.log
+
+# And then install boost..
+mkdir -p $PKG/usr/{bin,lib,include}
+
+$BJAM \
+  $PYTHON_FLAGS \
+  "-sBUILD=release <optimization>speed <inlining>full <threading>single/multi" \
+  "-sNO_COMPRESSION=0" "-sZLIB_INCLUDE=/usr/include" "-sZLIB_LIBPATH=/usr/lib" \
+  "-sBZIP2_INCLUDE=/usr/include" "-sBZIP2_LIBPATH=/usr/lib" \
+  --toolset=gcc --layout=system --builddir=obj \
+  --prefix=$PKG/usr \
+  install \
+  2>&1 | tee $OUTPUT/install-${PRGNAM}.log
+
+# Install the bjam/bcp binaries
+cp -a $BJAM $BCP $PKG/usr/bin
+
+## Move incorrectly installed include files
+if [ -d $PKG/usr/include/${PRGNAM}_${SRCVER} ]; then
+  mv $PKG/usr/include/${PRGNAM}_${SRCVER}/boost $PKG/usr/include/
+  rmdir $PKG/usr/include/${PRGNAM}_${SRCVER}
+fi
 
 # Add documentation:
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION