summaryrefslogtreecommitdiffstats
path: root/patches
diff options
context:
space:
mode:
Diffstat (limited to 'patches')
-rw-r--r--patches/packages/libarchive-3.6.2-x86_64-2_slack15.0.txt (renamed from patches/packages/libarchive-3.6.2-x86_64-1_slack15.0.txt)0
-rwxr-xr-xpatches/source/libarchive/libarchive.SlackBuild5
2 files changed, 4 insertions, 1 deletions
diff --git a/patches/packages/libarchive-3.6.2-x86_64-1_slack15.0.txt b/patches/packages/libarchive-3.6.2-x86_64-2_slack15.0.txt
index 64742121f..64742121f 100644
--- a/patches/packages/libarchive-3.6.2-x86_64-1_slack15.0.txt
+++ b/patches/packages/libarchive-3.6.2-x86_64-2_slack15.0.txt
diff --git a/patches/source/libarchive/libarchive.SlackBuild b/patches/source/libarchive/libarchive.SlackBuild
index 4cf5c2947..a72564117 100755
--- a/patches/source/libarchive/libarchive.SlackBuild
+++ b/patches/source/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_slack15.0}
+BUILD=${BUILD:-2_slack15.0}
# 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