Skip to content

Commit

Permalink
Stop rolling my own wrap patching mechanism
Browse files Browse the repository at this point in the history
  • Loading branch information
jcaesar committed Sep 25, 2021
1 parent 957364d commit 8ae9589
Show file tree
Hide file tree
Showing 15 changed files with 7 additions and 24 deletions.
18 changes: 0 additions & 18 deletions do.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,24 +9,6 @@ mkdir -p src
tar --strip-components=1 -xvf src-$ver.tgz -C src
cp -r --reflink=auto -t src meson*

mkdir -p src/meson/packagecache/
mkdir -p wrappatch/tmp
for p in wrappatch/*; do
if test "$p" == wrappatch/tmp; then
continue
fi
w="src/meson/$(basename "$p").wrap"
test -f "$w" || (echo no $w && exit -1)
d="$(sed -rn 's/^directory *= *//p' "$w")"
s="wrappatch/tmp/$d"
rm -rf "$s"
cp -r "$p" "$s"
f=src/meson/packagecache/$(sed -rn 's/^patch_filename *= *//p' "$w")
echo "Generating $f"
(cd wrappatch/tmp; zip -r "../../$f" "$d")
sed -ri 's/^(patch_hash *=).*$/\1 '$(sha256sum $f | cut -d\ -f1)/ "$w"
done

export CC=${CC-musl-gcc}
meson build src \
--wrap-mode forcefallback \
Expand Down
6 changes: 3 additions & 3 deletions meson/lz4.wrap
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ directory = lz4-1.9.3
source_url = https://github.com/lz4/lz4/archive/v1.9.3.tar.gz
source_filename = lz4-1.9.3.tgz
source_hash = 030644df4611007ff7dc962d981f390361e6c97a34e5cbc393ddfbe019ffe2c1
patch_directory = lz4

patch_url = https://wrapdb.mesonbuild.com/v1/projects/lz4/1.9.3/1/get_zip
patch_filename = lz4-1.9.3-1-wrap.zip
patch_hash = xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
[provide]
liblz4 = liblz4_dep
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
7 changes: 4 additions & 3 deletions meson/rdkafka.wrap
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@ directory = librdkafka-1.7.0
source_url = https://github.com/edenhill/librdkafka/archive/v1.7.0.tar.gz
source_filename = rdkafka-1.7.0.tgz
source_hash = c71b8c5ff419da80c31bb8d3036a408c87ad523e0c7588e7660ee5f3c8973057
patch_directory = rdkafka

patch_url = https://wrapdb.mesonbuild.com/v1/projects/rdkafka/1.7.0/1/get_zip
patch_filename = rdkafka-1.7.0-1-wrap.zip
patch_hash = xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
[provide]
rdkafka = rdkafka_dep
rdkafka++ = rdkafkapp_dep

0 comments on commit 8ae9589

Please sign in to comment.