summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlan Hicks <alan@lizella.net>2010-05-13 00:31:38 +0200
committerRobby Workman <rworkman@slackbuilds.org>2010-05-13 00:31:38 +0200
commit1dc4705a19920b8eceff38fb2e25cdfd667d51ee (patch)
tree993170587cea0830a5108fd166b018aeafa97129
parent13cb632d7effa7004e41bb8087267f4ff6683fe3 (diff)
downloadslackbuilds-1dc4705a19920b8eceff38fb2e25cdfd667d51ee.tar.gz
libraries/libpri: Updated for version 1.4.10.1
-rw-r--r--libraries/libpri/README2
-rw-r--r--libraries/libpri/libpri-1.4.10.1-add_extra_cflags.patch12
-rw-r--r--libraries/libpri/libpri.SlackBuild37
-rw-r--r--libraries/libpri/libpri.info8
4 files changed, 45 insertions, 14 deletions
diff --git a/libraries/libpri/README b/libraries/libpri/README
index 6e3ef1dd27..22482848fd 100644
--- a/libraries/libpri/README
+++ b/libraries/libpri/README
@@ -7,4 +7,4 @@ Lucent.
Please note that there are no man pages and precious little documentation
for this library. The build is simple and straight forward though.
-libpri is an optional requirement to Asterisk
+libpri is an optional requirement to Asterisk.
diff --git a/libraries/libpri/libpri-1.4.10.1-add_extra_cflags.patch b/libraries/libpri/libpri-1.4.10.1-add_extra_cflags.patch
new file mode 100644
index 0000000000..fc52e296bd
--- /dev/null
+++ b/libraries/libpri/libpri-1.4.10.1-add_extra_cflags.patch
@@ -0,0 +1,12 @@
+diff -Nur libpri-1.4.10.1.orig/Makefile libpri-1.4.10.1/Makefile
+--- libpri-1.4.10.1.orig/Makefile 2008-08-06 13:20:51.000000000 -0500
++++ libpri-1.4.10.1/Makefile 2009-07-05 15:11:09.417405564 -0500
+@@ -43,7 +43,7 @@
+ DYNAMIC_LIBRARY:=libpri.so.$(SONAME)
+ STATIC_OBJS=copy_string.o pri.o q921.o prisched.o q931.o pri_facility.o version.o
+ DYNAMIC_OBJS=copy_string.lo pri.lo q921.lo prisched.lo q931.lo pri_facility.lo version.lo
+-CFLAGS=-Wall -Werror -Wstrict-prototypes -Wmissing-prototypes -g -fPIC $(ALERTING) $(LIBPRI_COUNTERS)
++CFLAGS=-Wall -Werror -Wstrict-prototypes -Wmissing-prototypes -g -fPIC $(EXTRA_CFLAGS) $(ALERTING) $(LIBPRI_COUNTERS)
+ INSTALL_PREFIX=$(DESTDIR)
+ INSTALL_BASE=/usr
+ libdir?=$(INSTALL_BASE)/lib
diff --git a/libraries/libpri/libpri.SlackBuild b/libraries/libpri/libpri.SlackBuild
index 5b95c2ec74..dffcdc9fea 100644
--- a/libraries/libpri/libpri.SlackBuild
+++ b/libraries/libpri/libpri.SlackBuild
@@ -22,19 +22,31 @@
# Modified by Robby Workman <rworkman@slackbuilds.org>
# No additional license terms :)
-set -e
-
-PRGNAM="libpri"
-VERSION="1.4.3"
+PRGNAM=libpri
+VERSION=1.4.10.1
ARCH=${ARCH:-i486}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
CWD=$(pwd)
TMP=${TMP:-/tmp/SBo}
-PKG="$TMP/pkg-$PRGNAM"
+PKG=$TMP/package-$PRGNAM
OUTPUT=${OUTPUT:-/tmp}
+set -e
+
+if [ "$ARCH" = "i486" ]; then
+ SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+ LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+ SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+ LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+ # "-fPIC" is already in the Makefile
+ SLKCFLAGS="-O2"
+ LIBDIRSUFFIX="64"
+fi
+
rm -fr $PKG $TMP/$PRGNAM-$VERSION
mkdir -p $TMP $PKG $OUTPUT
cd $TMP
@@ -43,12 +55,17 @@ cd $PRGNAM-$VERSION
chmod -R a-s,u+w,go+r-w .
chown -R root:root .
-make
-make install DESTDIR=$PKG
+# Allow using our SLKCFLAGS
+patch -p1 < $CWD/libpri-1.4.10.1-add_extra_cflags.patch
+
+make libdir=/usr/lib${LIBDIRSUFFIX} EXTRA_CFLAGS="$SLKCFLAGS"
+make libdir=/usr/lib${LIBDIRSUFFIX} 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 . | 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
)
mkdir -p $PKG/install $PKG/usr/doc/$PRGNAM-$VERSION
@@ -58,4 +75,4 @@ cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
cat $CWD/slack-desc > $PKG/install/slack-desc
cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.tgz
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/libraries/libpri/libpri.info b/libraries/libpri/libpri.info
index 1e73154cec..d9ea8391ca 100644
--- a/libraries/libpri/libpri.info
+++ b/libraries/libpri/libpri.info
@@ -1,8 +1,10 @@
PRGNAM="libpri"
-VERSION="1.4.3"
+VERSION="1.4.10.1"
HOMEPAGE="http://www.digium.com"
-DOWNLOAD="http://downloads.digium.com/pub/libpri/old/libpri-1.4.3.tar.gz"
-MD5SUM="c5be91fc98f1638ba0365bf87f696cd1"
+DOWNLOAD="http://downloads.digium.com/pub/libpri/libpri-1.4.10.1.tar.gz"
+MD5SUM="55ce81cd0b2cf0c40e287fc5bd5b4883"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
MAINTAINER="Alan Hicks"
EMAIL="alan@lizella.net"
APPROVED="rworkman"