Skip to content

Commit b340e54

Browse files
committed
Use Debian's zsync patches
1 parent f79f013 commit b340e54

File tree

2 files changed

+19
-1
lines changed

2 files changed

+19
-1
lines changed

ci/build-in-docker.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ apk add bash git gcc g++ cmake make file wget \
6464
glib-static libassuan-static zlib-static libgpg-error-static \
6565
curl-dev curl-static nghttp2-static libidn2-static openssl-libs-static brotli-static c-ares-static libunistring-static \
6666
glib-static glib-dev autoconf automake meson \
67-
libpsl-dev libpsl-static
67+
libpsl-dev libpsl-static patch
6868
6969
# libcurl's pkg-config scripts are broken. everywhere, everytime.
7070
# these additional flags have been collected from all the .pc files whose libs are mentioned as -l<lib> in Libs.private

ci/install-static-zsyncmake.sh

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,24 @@ tar xf zsync_"$version"*.tar.bz2
2929

3030
cd zsync-*/
3131

32+
# use Debian's patches, too
33+
wget \
34+
https://sources.debian.org/data/main/z/zsync/0.6.2-6/debian/patches/buildsystem.diff \
35+
https://sources.debian.org/data/main/z/zsync/0.6.2-6/debian/patches/manpages.diff \
36+
https://sources.debian.org/data/main/z/zsync/0.6.2-6/debian/patches/clienthttp.diff \
37+
https://sources.debian.org/data/main/z/zsync/0.6.2-6/debian/patches/fix-build-with-gcc-14.patch
38+
sha256sum -c <<\EOF
39+
f14a7ffcb3bdadba252c9afbe5e8da358fc77f20072ae5b21475bdfc44b50975 buildsystem.diff
40+
085e9b5856bb8ac0d8567e977a9d5fafc6c19df02b7cfb8e011fedaf2862eaad clienthttp.diff
41+
f04bba2866c47b8597723d49eec3f1fd50e40a08171e261bf0fc262852ba17e5 manpages.diff
42+
35cbce69194743df1f3f4b9bc9ad36a4c440b117c6a17c268023c642c0d50650 fix-build-with-gcc-14.patch
43+
EOF
44+
45+
for i in *.diff *.patch; do
46+
echo "Applying patch $i..."
47+
patch -p1 < "$i"
48+
done
49+
3250
find . -type f -exec sed -i -e 's|off_t|size_t|g' {} \;
3351

3452
./configure CFLAGS=-no-pie LDFLAGS=-static --prefix=/usr --build=$(arch)-unknown-linux-gnu

0 commit comments

Comments
 (0)