*: make -> gmake

split from patch provided by emma
make: replace with pdpmake, at 1.4.1
2024-01-02 17:45:37 +00:00 · 2024-01-02 17:45:31 +00:00 · 2024-01-02 17:43:36 +00:00
75 changed files with 92 additions and 106 deletions
--- a/core/bison/build
+++ b/core/bison/build
@ -1,13 +1,13 @@
 #!/bin/sh -e

-./configure \
+MAKE=gmake ./configure \
    --prefix=/usr \
    --disable-nls \
    --without-libtextstyle-prefix

-make
+gmake

-make DESTDIR="$1" \
+gmake DESTDIR="$1" \
    install-libLIBRARIES \
    install-binPROGRAMS \
    install-nodist_binSCRIPTS \
--- a/core/bonsai-coreutils/build
+++ b/core/bonsai-coreutils/build
@ -1,6 +0,0 @@
-#!/bin/sh -e
-
-./configure
-
-make
-make PREFIX="$1/usr" install # DESTDIR not supported
--- a/core/bonsai-coreutils/depends
+++ b/core/bonsai-coreutils/depends
@ -1,2 +0,0 @@
-bindgen make
-rust make
--- a/core/bonsai-coreutils/sources
+++ b/core/bonsai-coreutils/sources
@ -1 +0,0 @@
-git+https://git.tebibyte.media/bonsai/coreutils
--- a/core/bonsai-coreutils/version
+++ b/core/bonsai-coreutils/version
@ -1 +0,0 @@
-git 1
--- a/core/dash/build
+++ b/core/dash/build
@ -1,10 +0,0 @@
-#!/bin/sh -e
-
-export CFLAGS="$CFLAGS -static"
-
-./configure \
-    --prefix=/usr
-
-make DESTDIR="$1" install
-
-ln -s /usr/bin/dash "$1/usr/bin/sh"
--- a/core/dash/checksums
+++ b/core/dash/checksums
@ -1 +0,0 @@
-0abee44e167867603004bbdaf9f465baf21f43758d631caa28c02ca9500149d746
--- a/core/dash/sources
+++ b/core/dash/sources
@ -1 +0,0 @@
-http://gondor.apana.org.au/~herbert/dash/files/dash-0.5.12.tar.gz
--- a/core/dash/version
+++ b/core/dash/version
@ -1 +0,0 @@
-0.5.12 1
--- a/core/git/build
+++ b/core/git/build
@ -23,7 +23,7 @@ EOF
    ac_cv_snprintf_returns_bogus=no \
    ac_cv_fread_reads_directories=yes

-make LIBS="$(curl-config --static-libs) libgit.a reftable/libreftable.a xdiff/lib.a -lz"
-make DESTDIR="$1" install
+gmake LIBS="$(curl-config --static-libs) libgit.a reftable/libreftable.a xdiff/lib.a -lz"
+gmake DESTDIR="$1" install

 cp -Rf man "$1/usr/share/man"
--- a/core/make/build
+++ b/core/make/build
@ -1,10 +1,12 @@
 #!/bin/sh -e

-export LDFLAGS="$LDFLAGS -static"
+export DESTDIR="$1"
+export PREFIX=/usr

-./configure \
-    --prefix=/usr \
-    --disable-nls
+cc -o make *.c
+./make
+./make test

-make
-make DESTDIR="$1" install
+mkdir -p "$1/usr/bin"
+cp -f make "$1/usr/bin/pdpmake"
+ln -s pdpmake "$1/usr/bin/make"
--- a/core/make/checksums
+++ b/core/make/checksums
@ -1 +1 @@
-a7d8aee97b7e9a525ef561afa84eea0d929f246e3aafa420231c0602151cf9eb03
+27c9b61b5086e806fc33484a40a2fa2c4eeb21d0cc1eee10318d8d187daa9d6032
--- a/core/make/sources
+++ b/core/make/sources
@ -1 +1 @@
-https://ftp.gnu.org/gnu/make/make-4.4.1.tar.gz
+https://frippery.org/make/pdpmake-1.4.1.tgz
--- a/core/make/version
+++ b/core/make/version
@ -1 +1 @@
-4.4.1 1
+1.4.1 1
--- a/extra/bindgen/build
+++ b/extra/bindgen/build
@ -1,5 +0,0 @@
-#!/bin/sh -e
-
-cargo build --release
-
-install -Dm755 target/release/bindgen "$1/usr/bin/bindgen"
--- a/extra/bindgen/checksums
+++ b/extra/bindgen/checksums
@ -1 +0,0 @@
-d5250eb76eb6b8578b434239c7eb882de6eaa8a7b9719ba4d1591e346dc32306f4
--- a/extra/bindgen/depends
+++ b/extra/bindgen/depends
@ -1,2 +0,0 @@
-rust make
-clang
--- a/extra/bindgen/sources
+++ b/extra/bindgen/sources
@ -1 +0,0 @@
-https://github.com/rust-lang/rust-bindgen/archive/v0.69.2.tar.gz
--- a/extra/bindgen/version
+++ b/extra/bindgen/version
@ -1 +0,0 @@
-0.69.2 1
--- a/extra/ccache/checksums
+++ b/extra/ccache/checksums
@ -1 +1 @@
-65a0abe8a5522c1044b24f8af7df206282455a8feb3ab2341ed2ad1111aebd80fe
+1778762804752bf2949271b21bc79fd267ab1d57ebf518e7aca57baee7c8b6a8fd
--- a/extra/ccache/sources
+++ b/extra/ccache/sources
@ -1 +1 @@
-https://github.com/ccache/ccache/releases/download/v4.9/ccache-4.9.tar.xz
+https://github.com/ccache/ccache/releases/download/v4.8.3/ccache-4.8.3.tar.xz
--- a/extra/ccache/version
+++ b/extra/ccache/version
@ -1 +1 @@
-4.9 1
+4.8.3 1
--- a/extra/ffmpeg/checksums
+++ b/extra/ffmpeg/checksums
@ -1,2 +1,2 @@
-7d93a0ed1716fa513119affb102e4902fd25b66c14075b6e12615da17230ff6e4b
+2c1b5b0c183ae971e7cd0c0aaefa1e7ba85f3cf28ca92ef897ce67fe23e31f7d58
 4f16712641b400498753572c0f2d1e30f28fa0df0ea8d0bd2da9d2d74f6613b3ee
--- a/extra/ffmpeg/sources
+++ b/extra/ffmpeg/sources
@ -1,2 +1,2 @@
-https://ffmpeg.org/releases/ffmpeg-6.1.1.tar.xz
+https://ffmpeg.org/releases/ffmpeg-6.1.tar.xz
 patches/add-av_stream_get_first_dts-for-chromium.patch
--- a/extra/ffmpeg/version
+++ b/extra/ffmpeg/version
@ -1 +1 @@
-6.1.1 1
+6.1 1
--- a/extra/firefox/checksums
+++ b/extra/firefox/checksums
@ -1,4 +1,4 @@
-5836dc54793dcfe9c5dc534364136a8f2b46fb7fea6b084bf12e0a5a264f386e90
+1e4a42c621e4dfd0f92460bf93dcc1ca3030d722f2f213f808699fe69630bdc394
 3e4e722acd2ab2e38a16ec23b29296318d77cc54f034d4b21d91bde085e26bc0a3
 49e95cf848c09df618587bb8286bed3ed9531e24554b9ef275f070201078dba7f5
 ee279241e461011e2265086328d9d0a913ab938bb81aa97fa22b8b9b7edf5e33bc
--- a/extra/firefox/sources
+++ b/extra/firefox/sources
@ -1,4 +1,4 @@
-https://ftp.mozilla.org/pub/firefox/releases/121.0.1/source/firefox-121.0.1.source.tar.xz
+https://ftp.mozilla.org/pub/firefox/releases/121.0/source/firefox-121.0.source.tar.xz
 patches/fix-target-detection.patch
 patches/fix-vaapi.patch
 patches/musl-sandbox.patch
--- a/extra/firefox/version
+++ b/extra/firefox/version
@ -1 +1 @@
-121.0.1 1
+121.0 1
--- a/extra/gmake/README
+++ b/extra/gmake/README
--- a/extra/gmake/build
+++ b/extra/gmake/build
@ -0,0 +1,13 @@
+#!/bin/sh -e
+
+export LDFLAGS="$LDFLAGS -static"
+
+./configure \
+    --prefix=/usr \
+    --disable-nls
+
+make
+make DESTDIR="$1" install
+mv "$1/usr/bin/make" "$1/usr/bin/gmake"
+mv "$1/usr/share/man/man1/make.1" "$1/usr/share/man/man1/gmake.1"
+ln -s gmake "$1/usr/bin/make"
--- a/extra/gmake/checksums
+++ b/extra/gmake/checksums
@ -0,0 +1 @@
+a7d8aee97b7e9a525ef561afa84eea0d929f246e3aafa420231c0602151cf9eb03
--- a/extra/gmake/sources
+++ b/extra/gmake/sources
@ -0,0 +1 @@
+https://ftp.gnu.org/gnu/make/make-4.4.1.tar.gz
--- a/extra/gmake/version
+++ b/extra/gmake/version
@ -0,0 +1 @@
+4.4.1 1
--- a/extra/gtk+3/checksums
+++ b/extra/gtk+3/checksums
@ -1,4 +1,4 @@
-8211c4ef7d654e7c2f576a86544ce5db14427376caf86358bd9a5f5bfaac22a92b
+8fd7891482d65689b6b94fe3c4032679e90b5cdcde15600ce271ec296901666aa5
 8b8bf563e74f720990030791f8e408db6099813a6290c38ab812231dbd10eb0cb8
 763400831b2abe5eff95609826dc6769ab2a742d68d4ffd0b4a7209a7f1be2cdaa
 09d6f9e59422724a1fead2bd2103ab0569f823da04e1411a338ae9892bedb2652e
--- a/extra/gtk+3/sources
+++ b/extra/gtk+3/sources
@ -1,4 +1,4 @@
-https://download.gnome.org/sources/gtk+/3.24/gtk+-3.24.40.tar.xz
+https://download.gnome.org/sources/gtk+/3.24/gtk+-3.24.39.tar.xz
 patches/01-no-fribidi.patch
 patches/02-fix-firefox.patch
 patches/03-no-accessibility.patch
--- a/extra/gtk+3/version
+++ b/extra/gtk+3/version
@ -1 +1 @@
-3.24.40 1
+3.24.39 1
--- a/extra/hwdata/checksums
+++ b/extra/hwdata/checksums
@ -1 +1 @@
-a70b204b15850333693a1ded05146ea1937e4dc8da2fb044f4cadf153cb63c7513
+49cf850501196159e3900cef1a4109bc634e05c3a27ca9db0c6d13f8090a7e0d20
--- a/extra/hwdata/sources
+++ b/extra/hwdata/sources
@ -1 +1 @@
-https://github.com/vcrhonek/hwdata/archive/refs/tags/v0.378.tar.gz
+https://github.com/vcrhonek/hwdata/archive/refs/tags/v0.377-2.tar.gz
--- a/extra/hwdata/version
+++ b/extra/hwdata/version
@ -1 +1 @@
-0.378 1
+0.377-2 1
--- a/extra/mesa/checksums
+++ b/extra/mesa/checksums
@ -1 +1 @@
-bd565321569613c0b001084a1aecd7964ab84ffddb8e398b2a91497920bc2abe56
+a9857cb92ca9e5be4ed50aeda297cab4ca7f1301f11a8eef3a7fa1d9886c3c9112
--- a/extra/mesa/sources
+++ b/extra/mesa/sources
@ -1 +1 @@
-https://archive.mesa3d.org/mesa-23.3.3.tar.xz
+https://archive.mesa3d.org/mesa-23.3.2.tar.xz
--- a/extra/mesa/version
+++ b/extra/mesa/version
@ -1 +1 @@
-23.3.3 1
+23.3.2 1
--- a/extra/nodejs/checksums
+++ b/extra/nodejs/checksums
@ -1 +1 @@
-8f59f3ef2ce6da33dd565db099e7cb64bc8474edeac3d175f7560263085333f510
+f79f8383dae53260913f8984a9e4c3276cbbb62a6aa2eceb7f13112d0d11cce21b
--- a/extra/nodejs/sources
+++ b/extra/nodejs/sources
@ -1 +1 @@
-https://nodejs.org/download/release/v21.6.0/node-v21.6.0.tar.xz
+https://nodejs.org/download/release/v21.5.0/node-v21.5.0.tar.xz
--- a/extra/nodejs/version
+++ b/extra/nodejs/version
@ -1 +1 @@
-21.6.0 1
+21.5.0 1
--- a/extra/python-jinja2/checksums
+++ b/extra/python-jinja2/checksums
@ -1 +1 @@
-5a7957ee697f8cf558253b40260e4f6cf274244e9bf2211c4cf394ba73d4178bda
+f1bf5d842b489baaad60a26734cb14af566e477a1fca3d69adb3cde1ec07054156
--- a/extra/python-jinja2/sources
+++ b/extra/python-jinja2/sources
@ -1 +1 @@
-https://files.pythonhosted.org/packages/source/J/Jinja2/Jinja2-3.1.3.tar.gz
+https://files.pythonhosted.org/packages/source/J/Jinja2/Jinja2-3.1.2.tar.gz
--- a/extra/python-jinja2/version
+++ b/extra/python-jinja2/version
@ -1 +1 @@
-3.1.3 1
+3.1.2 1
--- a/extra/python-markupsafe/checksums
+++ b/extra/python-markupsafe/checksums
@ -1 +1 @@
-c4b6e97e55546979ed227fa921a06dcaf39b40f1cb8710462aa6f7e30b91eab910
+e22d66f9169281e7e7ad3f4909319e674552acb6173bb65489457d19d9a3c9015d
--- a/extra/python-markupsafe/sources
+++ b/extra/python-markupsafe/sources
@ -1 +1 @@
-https://github.com/pallets/markupsafe/archive/refs/tags/2.1.4.tar.gz
+https://github.com/pallets/markupsafe/archive/refs/tags/2.1.3.tar.gz
--- a/extra/python-markupsafe/version
+++ b/extra/python-markupsafe/version
@ -1 +1 @@
-2.1.4 1
+2.1.3 1
--- a/extra/python/build
+++ b/extra/python/build
@ -22,8 +22,8 @@ done
    --with-system-ffi \
    --with-ensurepip=yes

-make EXTRA_CFLAGS="$CFLAGS -DTHREAD_STACK_SIZE=0x100000"
-make DESTDIR="$1" install
+gmake EXTRA_CFLAGS="$CFLAGS -DTHREAD_STACK_SIZE=0x100000"
+gmake DESTDIR="$1" install

 ln -s python3 "$1/usr/bin/python"
 ln -s pip3    "$1/usr/bin/pip"
--- a/extra/python/depends
+++ b/extra/python/depends
@ -1,5 +1,6 @@
 bzip2
 expat
+gmake
 libffi
 openssl
 sqlite
--- a/extra/rust/build
+++ b/extra/rust/build
@ -10,8 +10,8 @@ export RUSTFLAGS="$RUSTFLAGS --remap-path-prefix=$PWD=."

 # Set shared linking as the default.
 sed 's/\(crt_static_default = \)true/\1false/' \
-    compiler/rustc_target/src/spec/base/linux_musl.rs > _
-mv -f _ compiler/rustc_target/src/spec/base/linux_musl.rs
+    compiler/rustc_target/src/spec/linux_musl_base.rs > _
+mv -f _ compiler/rustc_target/src/spec/linux_musl_base.rs

 sed 's/\("files":{\)[^}]*/\1/' vendor/curl-sys/.cargo-checksum.json > _
 mv -f _ vendor/curl-sys/.cargo-checksum.json
@ -63,7 +63,7 @@ EOF
        # This mimics the download process of rust's 'x.py'
        # bootstrap library to allow for the removal of the internet
        # connection requirement per build.
-        mkdir -p "${cache_dir:=build/cache/2023-11-16}"
+        mkdir -p "${cache_dir:=build/cache/2023-10-05}"

        for tarball in *.tar.xz\?no-extract; do
            mv -f "$tarball" "$cache_dir/${tarball%%\?no-extract}"
--- a/extra/rust/checksums
+++ b/extra/rust/checksums
@ -1,5 +1,5 @@
-a255d13a3a1b6d9cef1b6aa707fee1ebf3df46ae656a8888eedfa612d348391818
-05a173b5965fb254452edd3cfe4fca918e0537eafc0817c2f085b012762967415f
-eb6d1ee69a98db18df3e0f873ccc137a580cef36a8a85c5c9bd3aebc88c1e5e1e4
-b5942cea1dcb22a4c4af41ecb6cd05082da0a7fb16cf894b67a80298dd020d9e9d
+59f4bcad87f02afe7f85cea4384eec76d7cf7c38d47a0fdf484f99453598f14258
+a5bb47c283db9525dc1683955c9cd1004fed7d40bd827eebebdeba5b2e74e84080
+7993177eda9da337ff2b64c23b99de2a84dacc6d98a6c55312ddbdded393e1cc02
+9f61428707cb1e5dadbe9294658f0dd5dbc1371f3d6f1ffe71e626b61210236e83
 97086f892efe0679b6429e507aa65138ff21d1c776f583e593f5c1911e83bf1e7a
--- a/extra/rust/sources
+++ b/extra/rust/sources
@ -1,5 +1,5 @@
-https://static.rust-lang.org/dist/rustc-1.75.0-src.tar.xz
-https://static.rust-lang.org/dist/2023-11-16/rust-std-1.74.0-x86_64-unknown-linux-musl.tar.xz?no-extract
-https://static.rust-lang.org/dist/2023-11-16/rustc-1.74.0-x86_64-unknown-linux-musl.tar.xz?no-extract
-https://static.rust-lang.org/dist/2023-11-16/cargo-1.74.0-x86_64-unknown-linux-musl.tar.xz?no-extract
+https://static.rust-lang.org/dist/rustc-1.74.1-src.tar.xz
+https://static.rust-lang.org/dist/2023-10-05/rust-std-1.73.0-x86_64-unknown-linux-musl.tar.xz?no-extract
+https://static.rust-lang.org/dist/2023-10-05/rustc-1.73.0-x86_64-unknown-linux-musl.tar.xz?no-extract
+https://static.rust-lang.org/dist/2023-10-05/cargo-1.73.0-x86_64-unknown-linux-musl.tar.xz?no-extract
 patches/fix-curl.patch
--- a/extra/rust/version
+++ b/extra/rust/version
@ -1 +1 @@
-1.75.0 1
+1.74.1 1
--- a/extra/sqlite/checksums
+++ b/extra/sqlite/checksums
@ -1 +1 @@
-b46d80b54f4df35d18c5aaad8c18c50b0f6109119b862a1f038e0551bb1c303bc1
+f30d304d0752b3b791462525bdee571087cbf3fee163e8cc5f0959712b8697f23c
--- a/extra/sqlite/sources
+++ b/extra/sqlite/sources
@ -1 +1 @@
-https://sqlite.org/2024/sqlite-autoconf-3450000.tar.gz
+https://sqlite.org/2023/sqlite-autoconf-3440200.tar.gz
--- a/extra/sqlite/version
+++ b/extra/sqlite/version
@ -1 +1 @@
-3.45.0 1
+3.44.2 1
--- a/extra/vulkan-headers/checksums
+++ b/extra/vulkan-headers/checksums
@ -1 +1 @@
-32ee6722bd9c9cc113d182a12a04ad4384bbf910e7826f80fddf66f635624e54f0
+d5c4403e5ab95ab699bf974be4473958ef70446a34bb6a209b95b70698c4bdf4ad
--- a/extra/vulkan-headers/sources
+++ b/extra/vulkan-headers/sources
@ -1 +1 @@
-https://github.com/KhronosGroup/Vulkan-Headers/archive/refs/tags/v1.3.275.tar.gz
+https://github.com/KhronosGroup/Vulkan-Headers/archive/refs/tags/v1.3.274.tar.gz
--- a/extra/vulkan-headers/version
+++ b/extra/vulkan-headers/version
@ -1 +1 @@
-1.3.275 1
+1.3.274 1
--- a/wayland/libdrm/checksums
+++ b/wayland/libdrm/checksums
@ -1 +1 @@
-0b1353717e4eaa3c1e232a6f16b7f0c96329dbd52760bfb1d401ef01fbc2fee9f1
+07ed48387cb47bf867b571fad3164b41331ff96030270bd35dd530c338274ce7d5
--- a/wayland/libdrm/sources
+++ b/wayland/libdrm/sources
@ -1 +1 @@
-https://dri.freedesktop.org/libdrm/libdrm-2.4.120.tar.xz
+https://dri.freedesktop.org/libdrm/libdrm-2.4.119.tar.xz
--- a/wayland/libdrm/version
+++ b/wayland/libdrm/version
@ -1 +1 @@
-2.4.120 1
+2.4.119 1
--- a/wayland/libinput/checksums
+++ b/wayland/libinput/checksums
@ -1 +1 @@
-59ecfbdfbe3f0644cab7832d28d1db64dcd5ef11a28e74356439314695ec72db18
+376d877ed0737b4961437c0c7e95ca6eee1769d6d174d9b50f128aadfdc8ec4252
--- a/wayland/libinput/sources
+++ b/wayland/libinput/sources
@ -1 +1 @@
-https://gitlab.freedesktop.org/libinput/libinput/-/archive/1.25.0/libinput-1.25.0.tar.gz
+https://gitlab.freedesktop.org/libinput/libinput/-/archive/1.24.0/libinput-1.24.0.tar.gz
--- a/wayland/libinput/version
+++ b/wayland/libinput/version
@ -1 +1 @@
-1.25.0 1
+1.24.0 1
--- a/wayland/pixman/checksums
+++ b/wayland/pixman/checksums
@ -1 +1 @@
-95d879c36c63344e3803e580a4a087c30bb76b3cc23eff801d9e7f2f2e7793b6ec
+61a60ff8556e7ad5f4ea6dddc7659a99ce428a24fc4f65118cb043b0158b244434
--- a/wayland/pixman/sources
+++ b/wayland/pixman/sources
@ -1 +1 @@
-https://x.org/releases/individual/lib/pixman-0.43.0.tar.xz
+https://x.org/releases/individual/lib/pixman-0.42.2.tar.xz
--- a/wayland/pixman/version
+++ b/wayland/pixman/version
@ -1 +1 @@
-0.43.0 1
+0.42.2 1
--- a/wayland/wayland-protocols/checksums
+++ b/wayland/wayland-protocols/checksums
@ -1 +1 @@
-c7ed5ebc2f324e2b925af14f2072c80e2da85b282fb9374cb9b876d3ee28ed330d
+7ae608d3b04be91e89fd07b8e326fa6dcf718beda85cccc33e7cc2afe746a8ba54
--- a/wayland/wayland-protocols/sources
+++ b/wayland/wayland-protocols/sources
@ -1 +1 @@
-https://gitlab.freedesktop.org/wayland/wayland-protocols/-/releases/1.33/downloads/wayland-protocols-1.33.tar.xz
+https://gitlab.freedesktop.org/wayland/wayland-protocols/-/releases/1.32/downloads/wayland-protocols-1.32.tar.xz
--- a/wayland/wayland-protocols/version
+++ b/wayland/wayland-protocols/version
@ -1 +1 @@
-1.33 1
+1.32 1
Author	SHA1	Message	Date
nitori	e00f211f2a	*: make -> gmake split from patch provided by emma	2024-01-02 17:45:37 +00:00
nitori	0b15002ecc	make: replace with pdpmake, at 1.4.1 split from patch provided by emma	2024-01-02 17:45:31 +00:00
nitori	0d808d953c	gmake: new at 4.4.1 split from patch provided by emma	2024-01-02 17:43:36 +00:00
				`@ -1 +0,0 @@`
				`git+https://git.tebibyte.media/bonsai/coreutils`
				`@ -1 +0,0 @@`
				`0abee44e167867603004bbdaf9f465baf21f43758d631caa28c02ca9500149d746`
				`@ -1 +0,0 @@`
				`http://gondor.apana.org.au/~herbert/dash/files/dash-0.5.12.tar.gz`
 @ -1 +1 @@
 .4.1 1
 .4.1 1
				`@ -1 +0,0 @@`
				`d5250eb76eb6b8578b434239c7eb882de6eaa8a7b9719ba4d1591e346dc32306f4`
				`@ -1 +0,0 @@`
				`https://github.com/rust-lang/rust-bindgen/archive/v0.69.2.tar.gz`
 @ -1 +1 @@
 .9 1
 .8.3 1
 @ -1 +1 @@
 .1.1 1
 .1 1
 @ -1 +1 @@
 .0.1 1
 .0 1