zstd: move to junk

diff --git a/core/core-meta/depends b/core/core-meta/depends
index 069bdf119e13b481ef0dd2ab13d7bdac98a6944a..614494b6b8361c37947737f7bbb51c8601666b74 100644 (file)
--- a/core/core-meta/depends
+++ b/core/core-meta/depends
@@ -28,4 +28,3 @@ tzdata
 ugrep
 xz
 zlib
-zstd

diff --git a/core/core-meta/version b/core/core-meta/version
index 65cd68b0dd8e84dec5d3cd53fda7e48b685be1b5..65c9b94edf74d6d9deb325c42d8a874189c9f202 100644 (file)
--- a/core/core-meta/version
+++ b/core/core-meta/version
@@ -1 +1 @@
-0 2
+0 3

diff --git a/core/libarchive/depends b/core/libarchive/depends
index 68dc5ac845bce9531d10f66b134e4081bc8548fe..92903b31b0846fb7349a21bcb8e057b63a782476 100644 (file)
--- a/core/libarchive/depends
+++ b/core/libarchive/depends
@@ -2,4 +2,3 @@ bzip2
 expat
 xz
 zlib
-zstd

diff --git a/core/libarchive/version b/core/libarchive/version
index 591d5e431d25d4cde9aa65f1f1a0a2a24ce6a147..0272b57676b46f2b6fabcd750e0f01f58bd9202f 100644 (file)
--- a/core/libarchive/version
+++ b/core/libarchive/version
@@ -1 +1 @@
-3.5.1 1
+3.5.1 2

diff --git a/core/ugrep/depends b/core/ugrep/depends
index ffc13a885c1788ad49de14c7155e696d085df084..e57c894504cc8bbfdbe515b743f940e136db1c6f 100644 (file)
--- a/core/ugrep/depends
+++ b/core/ugrep/depends
@@ -1,4 +1,3 @@
 bzip2
 xz
 zlib
-zstd

diff --git a/core/ugrep/version b/core/ugrep/version
index f2fe531b52c1d7e8f0a37f77bb388d6fb6687033..0137b782d03bdc966bc880104c3ad24b7d81e69e 100644 (file)
--- a/core/ugrep/version
+++ b/core/ugrep/version
@@ -1,2 +1,2 @@
-3.3.4 2
+3.3.4 3
 

diff --git a/core/zstd/build b/core/zstd/build
deleted file mode 100755 (executable)
index 62bbe5d..0000000
--- a/core/zstd/build
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh -e
-
-gmake
-gmake DESTDIR="$1" PREFIX=/usr install

diff --git a/core/zstd/checksums b/core/zstd/checksums
deleted file mode 100644 (file)
index 343920f..0000000
--- a/core/zstd/checksums
+++ /dev/null
@@ -1 +0,0 @@
-5194fbfa781fcf45b98c5e849651aa7b3b0a008c6b72d4a0db760f3002291e94

diff --git a/core/zstd/depends b/core/zstd/depends
deleted file mode 100644 (file)
index f03cbae..0000000
--- a/core/zstd/depends
+++ /dev/null
@@ -1 +0,0 @@
-gmake make

diff --git a/core/zstd/sources b/core/zstd/sources
deleted file mode 100644 (file)
index b06e693..0000000
--- a/core/zstd/sources
+++ /dev/null
@@ -1 +0,0 @@
-https://github.com/facebook/zstd/releases/download/v1.5.0/zstd-1.5.0.tar.gz

diff --git a/core/zstd/version b/core/zstd/version
deleted file mode 100644 (file)
index 104216d..0000000
--- a/core/zstd/version
+++ /dev/null
@@ -1 +0,0 @@
-1.5.0 1

diff --git a/extra/ccache/build b/extra/ccache/build
index 638ebef026c0e17e6e6e699eddb0cd5c6e1ec489..9718a4b42cc7ddcaecf11549e4c528182f6a3455 100755 (executable)
--- a/extra/ccache/build
+++ b/extra/ccache/build
@@ -1,5 +1,20 @@
 #!/bin/sh -e
 
+(
+    cd zstd
+    sed -i 's/^FLAGS.*=/FLAGS = -static /' programs/Makefile
+    
+    gmake \
+        HAVE_LZMA=0 \
+        HAVE_ZLIB=0 \
+        HAVE_LZ4=0
+    
+    gmake \
+        DESTDIR="$PWD/out" \
+        PREFIX=/usr \
+        install
+)
+
 export DESTDIR="$1"
 export CFLAGS="$CFLAGS -static"
 export CXXFLAGS="$CXXFLAGS -static"
@@ -9,7 +24,8 @@ cmake -B build \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DCMAKE_BUILD_TYPE=Release \
     -DENABLE_TESTING=OFF \
-    -DZSTD_LIBRARY=/usr/lib/libzstd.a
+    -DZSTD_INCLUDE_DIR="$PWD/zstd/out/usr/include/" \
+    -DZSTD_LIBRARY="$PWD/zstd/out/usr/lib/libzstd.a"
 
 cmake --build   build
 cmake --install build

diff --git a/extra/ccache/checksums b/extra/ccache/checksums
index f41bbc4d20d0ef8ee33ffbf194801cc59279a5c5..d27b3752da94ae017806e0b40ac18754051a5fd6 100644 (file)
--- a/extra/ccache/checksums
+++ b/extra/ccache/checksums
@@ -1 +1,2 @@
 504a0f2184465c306826f035b4bc00bae7500308d6af4abbfb50e33a694989b4
+5194fbfa781fcf45b98c5e849651aa7b3b0a008c6b72d4a0db760f3002291e94

diff --git a/extra/ccache/depends b/extra/ccache/depends
index e52bd7d66003c4fc3defba337d4b1515114814f9..7d91ec226efaa48117e39574f4b277e8b58500ff 100644 (file)
--- a/extra/ccache/depends
+++ b/extra/ccache/depends
@@ -1,2 +1 @@
 cmake make
-zstd  make

diff --git a/extra/ccache/post-install b/extra/ccache/post-install
index aa7a58eefe90efe28070ef1678ab77389008a73f..8cec884c159cd4dffdf6f493e977acf0fd7a0227 100755 (executable)
--- a/extra/ccache/post-install
+++ b/extra/ccache/post-install
@@ -2,8 +2,7 @@
 
 cat <<EOF
 
-NOTE: To enable 'ccache' add this to your
-      '.shellrc' or '.profile'.
+NOTE: To enable 'ccache' add this to your shell's rc file
 
 -> export PATH=/usr/lib/ccache/bin:\$PATH
 

diff --git a/extra/ccache/sources b/extra/ccache/sources
index 016b70da43443b6ec6f35a341307eb89334d6c7a..a657a33c7d0c0de6f3fbe2a8dc16909038fa0662 100644 (file)
--- a/extra/ccache/sources
+++ b/extra/ccache/sources
@@ -1 +1,2 @@
 https://github.com/ccache/ccache/releases/download/v4.3/ccache-4.3.tar.xz
+https://github.com/facebook/zstd/releases/download/v1.5.0/zstd-1.5.0.tar.gz zstd

diff --git a/extra/ccache/version b/extra/ccache/version
index aead5414d52678b39da0f9daee25295f3e211c74..e47357bf8771c24387b18ac91b260f4dc6eecf89 100644 (file)
--- a/extra/ccache/version
+++ b/extra/ccache/version
@@ -1 +1 @@
-4.3 1
+4.3 2

diff --git a/extra/mesa/build b/extra/mesa/build
index 216a067df6a5519112ff496f1374db8b93ff774f..b75f6f788d4a9cb15a13c0354f3a616f7eb512c7 100755 (executable)
--- a/extra/mesa/build
+++ b/extra/mesa/build
@@ -41,7 +41,7 @@ meson \
     --localstatedir=/var \
     --buildtype=release \
     -Dplatforms=x11 \
-    -Dzstd=enabled \
+    -Dzstd=disabled \
     . output
 
 ninja -C output

diff --git a/extra/mesa/depends b/extra/mesa/depends
index d4eaa2848de5e8ab468b9231936acda437026f9f..582743f53a4aa23e17679c395b1cb444ec5167c6 100644 (file)
--- a/extra/mesa/depends
+++ b/extra/mesa/depends
@@ -19,4 +19,3 @@ pkgconf       make
 python        make
 xorgproto
 zlib
-zstd

diff --git a/extra/mesa/version b/extra/mesa/version
index e432ce078e0002bc667772cc967dfd514e29d83c..1fd8dd460f20b7597836c2480244f945a458e6b0 100644 (file)
--- a/extra/mesa/version
+++ b/extra/mesa/version
@@ -1 +1 @@
-21.1.5 1
+21.1.5 2

diff --git a/extra/rsync/build b/extra/rsync/build
index 84610187ae9ee7b584807e1a69e92cb45d4ea8b3..f09cb0cc3e6698ee3573e6a5edaf08fb1e258323 100755 (executable)
--- a/extra/rsync/build
+++ b/extra/rsync/build
@@ -11,8 +11,8 @@ export CFLAGS="-static $CFLAGS"
     --with-included-popt \
     --disable-xxhash \
     --disable-lz4 \
-    --enable-zstd \
-    --without-included-zlib
+    --without-included-zlib \
+    --disable-zstd
 
 make
 make DESTDIR="$1" install

diff --git a/extra/rsync/depends b/extra/rsync/depends
index b120313a70e76f6216b5bd77dd88fd77666b60e0..17a6d43d68cd58dfd3b4403a5486202b8e48229f 100644 (file)
--- a/extra/rsync/depends
+++ b/extra/rsync/depends
@@ -1,2 +1 @@
 zlib make
-zstd

diff --git a/extra/rsync/version b/extra/rsync/version
index 088245e7f2b1c27dd9cb28e98d08c110bd257a77..33d007eb2e3ee2ae1a5fb9753da5807cd6fcca51 100644 (file)
--- a/extra/rsync/version
+++ b/extra/rsync/version
@@ -1 +1 @@
-3.2.3 1
+3.2.3 2

diff --git a/junk/zstd/build b/junk/zstd/build
new file mode 100755 (executable)
index 0000000..62bbe5d
--- /dev/null
+++ b/junk/zstd/build
@@ -0,0 +1,4 @@
+#!/bin/sh -e
+
+gmake
+gmake DESTDIR="$1" PREFIX=/usr install

diff --git a/junk/zstd/checksums b/junk/zstd/checksums
new file mode 100644 (file)
index 0000000..343920f
--- /dev/null
+++ b/junk/zstd/checksums
@@ -0,0 +1 @@
+5194fbfa781fcf45b98c5e849651aa7b3b0a008c6b72d4a0db760f3002291e94

diff --git a/junk/zstd/depends b/junk/zstd/depends
new file mode 100644 (file)
index 0000000..f03cbae
--- /dev/null
+++ b/junk/zstd/depends
@@ -0,0 +1 @@
+gmake make

diff --git a/junk/zstd/sources b/junk/zstd/sources
new file mode 100644 (file)
index 0000000..b06e693
--- /dev/null
+++ b/junk/zstd/sources
@@ -0,0 +1 @@
+https://github.com/facebook/zstd/releases/download/v1.5.0/zstd-1.5.0.tar.gz

diff --git a/junk/zstd/version b/junk/zstd/version
new file mode 100644 (file)
index 0000000..104216d
--- /dev/null
+++ b/junk/zstd/version
@@ -0,0 +1 @@
+1.5.0 1