~armaan/asd-repo

194a58c2efb40ac27f183d61d23b676bc6a58f77 — Armaan Bhojwani 9 days ago a393aae
zstd: move to junk
23 files changed, 29 insertions(+), 18 deletions(-)

M core/core-meta/depends
M core/core-meta/version
M core/libarchive/depends
M core/libarchive/version
M core/ugrep/depends
M core/ugrep/version
M extra/ccache/build
M extra/ccache/checksums
M extra/ccache/depends
M extra/ccache/post-install
M extra/ccache/sources
M extra/ccache/version
M extra/mesa/build
M extra/mesa/depends
M extra/mesa/version
M extra/rsync/build
M extra/rsync/depends
M extra/rsync/version
R core/zstd/build => junk/zstd/build
R core/zstd/checksums => junk/zstd/checksums
R core/zstd/depends => junk/zstd/depends
R core/zstd/sources => junk/zstd/sources
R core/zstd/version => junk/zstd/version
M core/core-meta/depends => core/core-meta/depends +0 -1
@@ 28,4 28,3 @@ tzdata
ugrep
xz
zlib
zstd

M core/core-meta/version => core/core-meta/version +1 -1
@@ 1,1 1,1 @@
0 2
0 3

M core/libarchive/depends => core/libarchive/depends +0 -1
@@ 2,4 2,3 @@ bzip2
expat
xz
zlib
zstd

M core/libarchive/version => core/libarchive/version +1 -1
@@ 1,1 1,1 @@
3.5.1 1
3.5.1 2

M core/ugrep/depends => core/ugrep/depends +0 -1
@@ 1,4 1,3 @@
bzip2
xz
zlib
zstd

M core/ugrep/version => core/ugrep/version +1 -1
@@ 1,2 1,2 @@
3.3.4 2
3.3.4 3


M extra/ccache/build => extra/ccache/build +17 -1
@@ 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

M extra/ccache/checksums => extra/ccache/checksums +1 -0
@@ 1,1 1,2 @@
504a0f2184465c306826f035b4bc00bae7500308d6af4abbfb50e33a694989b4
5194fbfa781fcf45b98c5e849651aa7b3b0a008c6b72d4a0db760f3002291e94

M extra/ccache/depends => extra/ccache/depends +0 -1
@@ 1,2 1,1 @@
cmake make
zstd  make

M extra/ccache/post-install => extra/ccache/post-install +1 -2
@@ 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


M extra/ccache/sources => extra/ccache/sources +1 -0
@@ 1,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

M extra/ccache/version => extra/ccache/version +1 -1
@@ 1,1 1,1 @@
4.3 1
4.3 2

M extra/mesa/build => extra/mesa/build +1 -1
@@ 41,7 41,7 @@ meson \
    --localstatedir=/var \
    --buildtype=release \
    -Dplatforms=x11 \
    -Dzstd=enabled \
    -Dzstd=disabled \
    . output

ninja -C output

M extra/mesa/depends => extra/mesa/depends +0 -1
@@ 19,4 19,3 @@ pkgconf       make
python        make
xorgproto
zlib
zstd

M extra/mesa/version => extra/mesa/version +1 -1
@@ 1,1 1,1 @@
21.1.5 1
21.1.5 2

M extra/rsync/build => extra/rsync/build +2 -2
@@ 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

M extra/rsync/depends => extra/rsync/depends +0 -1
@@ 1,2 1,1 @@
zlib make
zstd

M extra/rsync/version => extra/rsync/version +1 -1
@@ 1,1 1,1 @@
3.2.3 1
3.2.3 2

R core/zstd/build => junk/zstd/build +0 -0
R core/zstd/checksums => junk/zstd/checksums +0 -0
R core/zstd/depends => junk/zstd/depends +0 -0
R core/zstd/sources => junk/zstd/sources +0 -0
R core/zstd/version => junk/zstd/version +0 -0