diff options
Diffstat (limited to 'source/l')
-rwxr-xr-x | source/l/imagemagick/imagemagick.SlackBuild | 2 | ||||
-rwxr-xr-x | source/l/libarchive/libarchive.SlackBuild | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/source/l/imagemagick/imagemagick.SlackBuild b/source/l/imagemagick/imagemagick.SlackBuild index 21e77f538..254d9c7ea 100755 --- a/source/l/imagemagick/imagemagick.SlackBuild +++ b/source/l/imagemagick/imagemagick.SlackBuild @@ -23,7 +23,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=imagemagick -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} # NOTE: This is to cope with ImageMagick version numbers such as 5.4.7-4, # which occur fairly often (but not always). If these numbers are all the same, diff --git a/source/l/libarchive/libarchive.SlackBuild b/source/l/libarchive/libarchive.SlackBuild index 3e11fa64a..0d264d407 100755 --- a/source/l/libarchive/libarchive.SlackBuild +++ b/source/l/libarchive/libarchive.SlackBuild @@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=libarchive 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 @@ -96,6 +96,9 @@ make install DESTDIR=$PKG || exit 1 # Don't ship .la files: rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la +# Don't list iconv in libarchive.pc: +sed -i "s/iconv //" $PKG/usr/lib${LIBDIRSUFFIX}/pkgconfig/libarchive.pc + # Strip binaries: find $PKG | xargs file | grep -e "executable" -e "shared object" \ | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null |