From 9664bee729d487bcc0a0bc35859f8e13d5421c75 Mon Sep 17 00:00:00 2001
From: Patrick J Volkerding <volkerdi@slackware.com>
Date: Wed, 26 Sep 2012 01:10:42 +0000
Subject: Slackware 14.0

Wed Sep 26 01:10:42 UTC 2012
Slackware 14.0 x86_64 stable is released!

We're perfectionists here at Slackware, so this release has been a long
time a-brewing.  But we think you'll agree that it was worth the wait.
Slackware 14.0 combines modern components, ease of use, and flexible
configuration... our "KISS" philosophy demands it.

The ISOs are off to be replicated, a 6 CD-ROM 32-bit set and a
dual-sided
32-bit/64-bit x86/x86_64 DVD.  Please consider supporting the Slackware
project by picking up a copy from store.slackware.com.  We're taking
pre-orders now, and offer a discount if you sign up for a subscription.

Thanks to everyone who helped make this happen.  The Slackware team, the
upstream developers, and (of course) the awesome Slackware user
community.

Have fun!  :-)
---
 source/l/boost/boost.SlackBuild | 63 +++++++++++++++++++++++------------------
 1 file changed, 35 insertions(+), 28 deletions(-)

(limited to 'source/l/boost')

diff --git a/source/l/boost/boost.SlackBuild b/source/l/boost/boost.SlackBuild
index 3f38c985..006c1897 100755
--- a/source/l/boost/boost.SlackBuild
+++ b/source/l/boost/boost.SlackBuild
@@ -1,7 +1,7 @@
 #!/bin/sh
 
-# Copyright 2007, 2008 Eric Hameleers, Eindhoven, NL
-# Copyright 2007-2008 Heinz Wiesinger
+# 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
 # All rights reserved.
 #
@@ -24,28 +24,29 @@
 
 # bjam-build system mostly taken from SlackBuild by Eric Hameleers
 # Script modified by Robby Workman - no copyright claims or added terms
+# Modified 2012 by Eric Hameleers <alien at slackware.com> for ARM port.
+
 
 PKGNAM=boost
 VERSION=${VERSION:-$(echo $PKGNAM_*.tar.?z* | rev | cut -f 3- -d . | rev | cut -f 2- -d _)}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-3}
+
+ICU=${ICU:-no}
+PKG_VERSION=$(echo $VERSION | tr _ .)	# Leave this alone
+NUMJOBS=${NUMJOBS:-" -j7 "}
 
 # Automatically determine the architecture we're building on:
+MARCH=$( uname -m )
 if [ -z "$ARCH" ]; then
-  case "$( uname -m )" in
-    i?86) export ARCH=i486 ;;
-    arm*) export ARCH=arm ;;
+  case "$MARCH" in
+    i?86)    export ARCH=i486 ;;
+    armv7hl) export ARCH=$MARCH ;;
+    arm*)    export ARCH=arm ;;
     # Unless $ARCH is already set, use uname -m for all other archs:
-       *) export ARCH=$( uname -m ) ;;
+    *)       export ARCH=$MARCH ;;
   esac
 fi
 
-CWD=$(pwd)
-TMP=${TMP:-/tmp}
-PKG=$TMP/package-boost
-
-ICU=${ICU:-no}
-PKG_VERSION=$(echo $VERSION | tr _ .)	# Leave this alone
-
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
   LIBDIRSUFFIX=""
@@ -55,11 +56,18 @@ elif [ "$ARCH" = "s390" ]; then
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
   LIBDIRSUFFIX="64"
+elif [ "$ARCH" = "armv7hl" ]; then
+  SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16"
+  LIBDIRSUFFIX=""
 else
   SLKCFLAGS="-O2"
   LIBDIRSUFFIX=""
 fi
 
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-boost
+
 rm -rf $PKG
 mkdir -p $TMP $PKG
 cd $TMP
@@ -84,28 +92,19 @@ PYTHON_VERSION=$(python -c 'import sys; print sys.version[:3]')
 PYTHON_FLAGS="-sPYTHON_ROOT=/usr -sPYTHON_VERSION=$PYTHON_VERSION"
 
 # First build bjam, the boost build system:
-cd tools/build/v2/engine/src
+cd tools/build/v2/engine
   CFLAGS="$SLKCFLAGS -fno-strict-aliasing" CC=gcc ./build.sh cc
 cd -
 
-BJAM=$(find tools/build/v2/engine/src/ -name bjam -a -type f)
+BJAM=$(find tools/build/v2/engine/ -name bjam -a -type f)
 
 # Create build subdirectory
 mkdir obj
 
-# Change the build options from 'minimal' to what we want, since adding
-# "-sBUILD=<optimization>speed <inlining>full <threading>single/multi
-# <link>shared <runtime-link>shared" to $BJAM command no longer seems to work.
-FLAGS="<threading>multi <threading>single <optimization>speed <inlining>full"
-sed -i "s/    <threading>multi/    $FLAGS/" Jamroot
-# Disable static libraries ( the only software that *requires* the static libs,
-# is Microsoft's CW compiler (CW or Comega is an experimental language which
-# extends C# )
-sed -i "s/<link>shared <link>static/<link>shared/" Jamroot
-
 # Next, we build boost using bjam
 $BJAM \
   release \
+  $NUMJOBS \
   "-sNO_COMPRESSION=0" \
   "-sZLIB_INCLUDE=/usr/include" \
   "-sZLIB_LIBPATH=/usr/lib${LIBDIRSUFFIX}" \
@@ -113,12 +112,16 @@ $BJAM \
   "-sBZIP2_LIBPATH=/usr/lib${LIBDIRSUFFIX}" \
   "-sEXPAT_INCLUDE=/usr/include" \
   "-sEXPAT_LIBPATH=/usr/lib${LIBDIRSUFFIX}" \
-  --toolset=gcc \
   --layout=system \
   --builddir=obj \
   --prefix=/usr \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
   --build-type=minimal \
+  toolset=gcc \
+  variant=release \
+  link=shared \
+  threading=multi \
+  runtime-link=shared \
   $PYTHON_FLAGS \
   stage
 
@@ -129,12 +132,16 @@ $BJAM \
   release \
   "-sEXPAT_INCLUDE=/usr/include" \
   "-sEXPAT_LIBPATH=/usr/lib${LIBDIRSUFFIX}" \
-  --toolset=gcc \
   --layout=system \
   --builddir=obj \
   --prefix=$PKG/usr \
   --libdir=$PKG/usr/lib${LIBDIRSUFFIX} \
   --build-type=minimal \
+  toolset=gcc \
+  variant=release \
+  link=shared \
+  threading=multi \
+  runtime-link=shared \
   $PYTHON_FLAGS \
   install
 
-- 
cgit v1.2.3