From: Armaan Bhojwani Date: Fri, 16 Jul 2021 19:16:13 +0000 (-0400) Subject: zstd: move to junk X-Git-Url: https://git.armaanb.net/?p=asd-repo.git;a=commitdiff_plain;h=194a58c2efb40ac27f183d61d23b676bc6a58f77 zstd: move to junk --- diff --git a/core/core-meta/depends b/core/core-meta/depends index 069bdf1..614494b 100644 --- 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 65cd68b..65c9b94 100644 --- 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 68dc5ac..92903b3 100644 --- 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 591d5e4..0272b57 100644 --- 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 ffc13a8..e57c894 100644 --- 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 f2fe531..0137b78 100644 --- 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 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 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 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 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 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 638ebef..9718a4b 100755 --- 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 f41bbc4..d27b375 100644 --- a/extra/ccache/checksums +++ b/extra/ccache/checksums @@ -1 +1,2 @@ 504a0f2184465c306826f035b4bc00bae7500308d6af4abbfb50e33a694989b4 +5194fbfa781fcf45b98c5e849651aa7b3b0a008c6b72d4a0db760f3002291e94 diff --git a/extra/ccache/depends b/extra/ccache/depends index e52bd7d..7d91ec2 100644 --- 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 aa7a58e..8cec884 100755 --- a/extra/ccache/post-install +++ b/extra/ccache/post-install @@ -2,8 +2,7 @@ cat < export PATH=/usr/lib/ccache/bin:\$PATH diff --git a/extra/ccache/sources b/extra/ccache/sources index 016b70d..a657a33 100644 --- 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 aead541..e47357b 100644 --- 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 216a067..b75f6f7 100755 --- 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 d4eaa28..582743f 100644 --- 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 e432ce0..1fd8dd4 100644 --- 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 8461018..f09cb0c 100755 --- 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 b120313..17a6d43 100644 --- 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 088245e..33d007e 100644 --- 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 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 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 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 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 index 0000000..104216d --- /dev/null +++ b/junk/zstd/version @@ -0,0 +1 @@ +1.5.0 1