diff options
Diffstat (limited to 'source/l/zstd')
| -rwxr-xr-x | source/l/zstd/zstd.SlackBuild | 4 | ||||
| -rw-r--r-- | source/l/zstd/zstd.dont.hardcode.libdir.patch | 35 |
2 files changed, 2 insertions, 37 deletions
diff --git a/source/l/zstd/zstd.SlackBuild b/source/l/zstd/zstd.SlackBuild index 4b0f395a8..f14b05f4d 100755 --- a/source/l/zstd/zstd.SlackBuild +++ b/source/l/zstd/zstd.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=zstd VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-1} NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} @@ -86,7 +86,6 @@ tar xvf $CWD/$PKGNAM-$VERSION.tar.?z || exit 1 cd $PKGNAM-$VERSION || exit 1 zcat $CWD/zstd.dont.link.pzstd.to.static.libzstd.a.diff.gz | patch -p1 --verbose || exit 1 -zcat $CWD/zstd.dont.hardcode.libdir.patch.gz | patch -p1 --verbose || exit 1 # Make sure ownerships and permissions are sane: chown -R root:root . @@ -102,6 +101,7 @@ make $NUMJOBS CFLAGS="$SLKCFLAGS" -C contrib/pzstd || exit 1 # Install it: make \ + $NUMJOBS \ prefix=/usr \ libdir=/usr/lib${LIBDIRSUFFIX} \ mandir=/usr/man \ diff --git a/source/l/zstd/zstd.dont.hardcode.libdir.patch b/source/l/zstd/zstd.dont.hardcode.libdir.patch deleted file mode 100644 index 32362e941..000000000 --- a/source/l/zstd/zstd.dont.hardcode.libdir.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 9da6b9612ef0ed2481c762f0c78af1204e407ccc Mon Sep 17 00:00:00 2001 -From: orbea <orbea@riseup.net> -Date: Mon, 16 Dec 2019 05:17:03 -0800 -Subject: [PATCH] pkgconfig: Don't hardcode libdir. - ---- - lib/Makefile | 1 + - lib/libzstd.pc.in | 2 +- - 2 files changed, 2 insertions(+), 1 deletion(-) - -diff --git a/lib/Makefile b/lib/Makefile -index fd1710cf1..cb8351e13 100644 ---- a/lib/Makefile -+++ b/lib/Makefile -@@ -244,6 +244,7 @@ libzstd.pc: - libzstd.pc: libzstd.pc.in - @echo creating pkgconfig - @sed -e 's|@PREFIX@|$(PREFIX)|' \ -+ -e 's|@LIBDIR@|$(LIBDIR)|' \ - -e 's|@VERSION@|$(VERSION)|' \ - $< >$@ - -diff --git a/lib/libzstd.pc.in b/lib/libzstd.pc.in -index e7880be47..9309426ec 100644 ---- a/lib/libzstd.pc.in -+++ b/lib/libzstd.pc.in -@@ -5,7 +5,7 @@ - prefix=@PREFIX@ - exec_prefix=${prefix} - includedir=${prefix}/include --libdir=${exec_prefix}/lib -+libdir=@LIBDIR@ - - Name: zstd - Description: fast lossless compression algorithm library |