diff options
Diffstat (limited to 'source/l/libzip')
-rwxr-xr-x | source/l/libzip/libzip.SlackBuild | 37 | ||||
-rw-r--r-- | source/l/libzip/slack-desc | 2 |
2 files changed, 29 insertions, 10 deletions
diff --git a/source/l/libzip/libzip.SlackBuild b/source/l/libzip/libzip.SlackBuild index a841127ee..9531854fa 100755 --- a/source/l/libzip/libzip.SlackBuild +++ b/source/l/libzip/libzip.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2007, 2013 Heinz Wiesinger, Amsterdam, The Netherlands +# Copyright 2007, 2013, 2015 Heinz Wiesinger, Amsterdam, The Netherlands # Copyright 2008, 2009, 2010 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # @@ -26,12 +26,12 @@ PKGNAM=libzip VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) export ARCH=i486 ;; + i?86) export ARCH=i586 ;; arm*) export ARCH=arm ;; # Unless $ARCH is already set, use uname -m for all other archs: *) export ARCH=$( uname -m ) ;; @@ -44,8 +44,8 @@ CWD=$(pwd) TMP=${TMP:-/tmp} PKG=$TMP/package-libzip -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" LIBDIRSUFFIX="" elif [ "$ARCH" = "s390" ]; then SLKCFLAGS="-O2" @@ -85,7 +85,6 @@ CXXFLAGS="$SLKCFLAGS" \ # Fix symbolic linking for manpages sed -i "s|\${LN}|\${LN_S}|g" man/Makefile -sed -i "s|\${LN_S} \${DESTDIR}\${man3dir}/|\${LN_S} |" man/Makefile make $NUMJOBS || make || exit 1 make install DESTDIR=$PKG || exit 1 @@ -101,9 +100,29 @@ make install DESTDIR=$PKG || exit 1 find $PKG | xargs file | grep -e "executable" -e "shared object" \ | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null -( cd $PKG/usr/man - find . -type f -exec gzip -9 {} \; - for i in $( find . -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done +# Compress and link manpages, if any: +if [ -d $PKG/usr/man ]; then + ( cd $PKG/usr/man + for manpagedir in $(find . -type d -name "man*") ; do + ( cd $manpagedir + for eachpage in $( find . -type l -maxdepth 1 | grep -v '\.gz$') ; do + ln -s $( readlink $eachpage ).gz $eachpage.gz + rm $eachpage + done + gzip -9 *.? + ) + done + ) +fi + +# Now, fix the stupid symbolic manpage links again: +( cd $PKG/usr/man/man3 + find . -type l | while read link ; do + LINKFILE=$(basename $link) + LINKTARGET=$(basename $(readlink $LINKFILE)) + rm $LINKFILE + ln -sf $LINKTARGET $LINKFILE + done ) mkdir -p $PKG/usr/doc/libzip-$VERSION diff --git a/source/l/libzip/slack-desc b/source/l/libzip/slack-desc index 16d8a0bfc..b8b4aaabb 100644 --- a/source/l/libzip/slack-desc +++ b/source/l/libzip/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------------------------------------------------------| libzip: libzip (A library to read, create, and modify Zip archives) libzip: libzip: This is libzip, a C library for reading, creating, and modifying |