summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMenno E. Duursma <druiloor@zonnet.nl>2010-05-13 00:31:29 +0200
committerRobby Workman <rworkman@slackbuilds.org>2010-05-13 00:31:29 +0200
commit0ff7611498057ccf5849f2985fc0bf43cb65b984 (patch)
treea399b36e5b1befd40194bf08ae5f6659120d3544
parente31b0bbc42be2bcfc0346e53252129f6fab541fa (diff)
downloadslackbuilds-0ff7611498057ccf5849f2985fc0bf43cb65b984.tar.gz
libraries/liboop: Updated for version 1.0
-rw-r--r--libraries/liboop/liboop.SlackBuild15
-rw-r--r--libraries/liboop/liboop.info2
-rw-r--r--libraries/liboop/slack-desc2
3 files changed, 10 insertions, 9 deletions
diff --git a/libraries/liboop/liboop.SlackBuild b/libraries/liboop/liboop.SlackBuild
index ff0d604cd8..2060e8a7e7 100644
--- a/libraries/liboop/liboop.SlackBuild
+++ b/libraries/liboop/liboop.SlackBuild
@@ -21,10 +21,13 @@ OUTPUT=${OUTPUT:-/tmp}
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
SLKCFLAGS="-O2 -fPIC"
+ LIBDIRSUFFIX="64"
fi
set -e # Exit on most errors
@@ -43,6 +46,7 @@ CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
./configure \
--prefix=/usr \
+ --libdir=/usr/lib${LIBDIRSUFFIX} \
--sysconfdir=/etc \
--localstatedir=/var \
--mandir=/usr/man \
@@ -54,13 +58,8 @@ make
make install DESTDIR=$PKG
( cd $PKG || exit 1
- find . -type f \
- | xargs file \
- | grep -e "executable"
- -e "shared object" \
- | grep ELF \
- | cut -f 1 -d : \
- | xargs strip --strip-unneeded 2> /dev/null
+ find . -type f | xargs file | grep -e "executable" -e "shared object" \
+ | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
)
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
@@ -72,4 +71,4 @@ 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.tgz
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/libraries/liboop/liboop.info b/libraries/liboop/liboop.info
index 2f9acb846d..2c9b849d23 100644
--- a/libraries/liboop/liboop.info
+++ b/libraries/liboop/liboop.info
@@ -2,7 +2,9 @@ PRGNAM="liboop"
VERSION="1.0"
HOMEPAGE="http://liboop.ofb.net/"
DOWNLOAD="http://download.ofb.net/liboop/liboop-1.0.tar.gz"
+DOWNLOAD_x86_64=""
MD5SUM="36cb971047d3af02369446f5e0b315a2"
+MD5SUM_x86_64=""
MAINTAINER="Menno E. Duursma"
EMAIL="druiloor@zonnet.nl"
APPROVED="rworkman"
diff --git a/libraries/liboop/slack-desc b/libraries/liboop/slack-desc
index d189f6a096..4e63c28ce4 100644
--- a/libraries/liboop/slack-desc
+++ b/libraries/liboop/slack-desc
@@ -5,7 +5,7 @@
# make exactly 11 lines for the formatting to be correct. It's also
# customary to leave one space after the ':'.
- |-----handy-ruler-----------------------------------------------------|
+ |-----handy-ruler-----------------------------------------------------|
liboop: Liboop (event loop management)
liboop:
liboop: Liboop is a low-level event loop management library for