From 9532849d4ca98e9228a5af70c7b68f141a732dd4 Mon Sep 17 00:00:00 2001
From: Olivier Esser <olive001@tele2allin.be>
Date: Tue, 11 May 2010 22:24:13 +0200
Subject: libraries/opal: Updated for version 2.2.11

---
 libraries/opal/opal.SlackBuild | 26 +++++++++++++++-----------
 1 file changed, 15 insertions(+), 11 deletions(-)

(limited to 'libraries/opal/opal.SlackBuild')

diff --git a/libraries/opal/opal.SlackBuild b/libraries/opal/opal.SlackBuild
index deffee8ef6..fcdb771183 100644
--- a/libraries/opal/opal.SlackBuild
+++ b/libraries/opal/opal.SlackBuild
@@ -5,25 +5,28 @@
 # Written by Olivier Esser (olive001@tele2allin.be), based on
 # the template available at slackbuilds.org (public domain)
 
-# Exit on most errors
-set -e
-
 PRGNAM=opal
 VERSION=2.2.11
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
+# Upstream uses -Os, so we won't define -O2 here
 if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  SLKCFLAGS="-march=i486 -mtune=i686"
 elif [ "$ARCH" = "i686" ]; then
-  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  SLKCFLAGS="-march=i686 -mtune=i686"
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-fPIC"
 fi
 
+set -e
+
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
@@ -38,15 +41,16 @@ CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
   --sysconfdir=/etc \
-  --localstatedir=/var
+  --localstatedir=/var \
+  --mandir=/usr/man \
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --build=$ARCH-slackware-linux
 
-CFLAGS="$SLKCFLAGS" CXXFLAGS="$SLKCFLAGS" make
+make CFLAGS="$SLKCFLAGS" CXXFLAGS="$SLKCFLAGS"
 make install DESTDIR=$PKG
 
-( cd $PKG
-  find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
-  find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
-)
+find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a mpl-1.0.htm $PKG/usr/doc/$PRGNAM-$VERSION
-- 
cgit v1.2.3