1 files changed, 22 insertions, 12 deletions
diff --git a/libraries/php-oci8/php-oci8.SlackBuild b/libraries/php-oci8/php-oci8.SlackBuild
index 9c2550bf1b..976db654f3 100644
--- a/libraries/php-oci8/php-oci8.SlackBuild
+++ b/libraries/php-oci8/php-oci8.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for php-oci8
 
@@ -22,11 +22,14 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-PKGNAM=oci8
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=php-oci8
-VERSION=${VERSION:-2.0.8}
+SRCNAM=oci8
+VERSION=${VERSION:-2.2.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -36,7 +39,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
+# the name of the created package would be, and then exit. This information
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -57,14 +67,12 @@ fi
 
 set -e
 
-# TODO: test oracle-instantclient or exit
-
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PKGNAM-$VERSION package.xml
-tar xvf $CWD/$PKGNAM-$VERSION.tgz
-cd $PKGNAM-$VERSION
+rm -rf $SRCNAM-$VERSION package.xml
+tar xvf $CWD/$SRCNAM-$VERSION.tgz
+cd $SRCNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -88,7 +96,7 @@ CXXFLAGS="$SLKCFLAGS" \
   --sysconfdir=/etc \
   --localstatedir=/var \
   --mandir=/usr/man \
-  --with-oci8=instantclient,${ORACLE_CLIENT_HOME}/lib \
+  --with-oci8=shared,instantclient,${ORACLE_CLIENT_HOME}/lib \
   --docdir=/usr/doc/$PRGNAM-$VERSION \
   --build=$ARCH-slackware-linux
 
@@ -104,7 +112,7 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr
 
 # slackware 14.1 current use /etc/php.d
 mkdir -p $PKG/etc/php.d
-cat << EOF > $PKG/etc/php.d/${PKGNAM}.ini
+cat << EOF > $PKG/etc/php.d/${SRCNAM}.ini
 ; Enable oci8 extension module
 ; extension=oci8.so
 EOF
@@ -113,8 +121,10 @@ mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a CREDITS LICENSE README $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
+rm -f $PKG/usr/lib*/*.la
+
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE