Removed multithreaded build option (removed '-mt' from the library names)

1 files changed, 48 insertions, 38 deletions

diff --git a/boost/build/boost.SlackBuild b/boost/build/boost.SlackBuild
index cf4be745..49183129 100755
--- a/boost/build/boost.SlackBuild
+++ b/boost/build/boost.SlackBuild
@@ -30,7 +30,7 @@ ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 
 # This is the python we build against:
-PYTHON_VERSION=`python -V 2>&1 |sed 's,.* \([0-9]\.[0-9]\)\(\.[0-9]\)\?.*,\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"
@@ -169,35 +169,60 @@ find . -perm 666 -exec chmod 644 {} \;
 
 echo Building ...
 
+mkdir -p $PKG/usr/{bin,lib,include}
+
 # First build bjam
 ( cd tools/build/jam_src
   ./build.sh gcc 2>&1 | tee $OUTPUT/make-${PRGNAM}.log
 )
 BJAM=`find tools/build/jam_src/ -name bjam -a -type f`
 
+# Build bcp
+( cd tools/bcp
+  ../../$BJAM 2>&1 | tee -a $OUTPUT/make-${PRGNAM}.log
+)
+BCP=`find bin/boost/tools -name bcp -a -type f`
+
 # Next, we build boost using bjam
-$BJAM "-sBUILD=release <threading>multi <optimization>speed <inlining>full" "-sTOOLS=gcc" $PYTHON_FLAGS --prefix=/usr stage \
-   2>&1 | tee -a $OUTPUT/make-${PRGNAM}.log
-
-mkdir -p $PKG/usr/{lib,include}
-
-# Install the libraries
-for i in `find stage -type f -name \*.a`; do
-  NAME=`basename $i`;
-  install -m 755 $i $PKG/usr/lib/$NAME;
-done;
-for i in `find stage -type f -name \*.so.*`; do
-  NAME=`basename $i`;
-  install -m 755 $i $PKG/usr/lib/$NAME;
-done;
-
-# Install include files
-for i in `find boost -type d`; do
-  mkdir -p $PKG/usr/include/$i
-done
-for i in `find boost -type f`; do
-  install -m 644 $i $PKG/usr/include/$i
-done
+$BJAM \
+  "-sBUILD=release <optimization>speed <inlining>full" \
+  "-sTOOLS=gcc" \
+  $PYTHON_FLAGS \
+  --prefix=/usr \
+  2>&1 | tee -a $OUTPUT/make-${PRGNAM}.log
+
+# And then install boost..
+$BJAM \
+  "-sBUILD=release <optimization>speed <inlining>full" \
+  "-sTOOLS=gcc" \
+  $PYTHON_FLAGS \
+  --prefix=$PKG/usr --layout=system install \
+   2>&1 | tee $OUTPUT/install-${PRGNAM}.log
+
+# Install the bjam/bcp binaries
+cp -a $BJAM $BCP $PKG/usr/bin
+
+## Install the libraries
+#for i in `find stage -type f -name \*.a`; do
+#  NAME=`basename $i`;
+#  install -m 755 $i $PKG/usr/lib/$NAME;
+#done;
+#for i in `find stage -type f -name \*.so.*`; do
+#  NAME=`basename $i`;
+#  install -m 755 $i $PKG/usr/lib/$NAME;
+#done;
+#
+## Install include files
+#for i in `find boost -type d`; do
+#  mkdir -p $PKG/usr/include/$i
+#done
+#for i in `find boost -type f`; do
+#  install -m 644 $i $PKG/usr/include/$i
+#done
+
+## Move incorrectly installed include files
+#mv $PKG/usr/include/$PRGNAM-$VERSION/boost $PKG/usr/include/
+#rmdir $PKG/usr/include/$PRGNAM-$VERSION
 
 
 # --- DOCUMENTATION ---
@@ -206,21 +231,6 @@ mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION || true
 chmod -R a-w $PKG/usr/doc/$PRGNAM-$VERSION/*
 
-# Move incorrectly installed man pages, if any
-[ -d $PKG/usr/share/man ] && \
-  mv $PKG/usr/share/man $PKG/usr/ && rmdir $PKG/usr/share || true
-# Compress the man page(s)
-if [ -d $PKG/usr/man ] ; then
-  find $PKG/usr/man -type f -name "*.?" -exec gzip -9f {} \;
-  for i in `find $PKG/usr/man -type l -name "*.?"` ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-fi
-
-# Compress info pages and remove the package's dir file
-if [ -d $PKG/usr/info ]; then
-  gzip -9 $PKG/usr/info/*.info
-  rm -rf $PKG/usr/info/dir
-fi
-
 # Strip binaries
 ( cd $PKG
   find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null