Update all recipes to use modern Jinx usage

vlang · Dec 25, 2023 · 25d4ce9 · 25d4ce9
1 parent f018d82
commit 25d4ce9
Show file tree

Hide file tree

Showing 198 changed files with 747 additions and 1,032 deletions.
diff --git a/host-recipes/autoconf b/host-recipes/autoconf
@@ -1,6 +1,8 @@
 name=autoconf
-from_source=autoconf
+version=2.69
 revision=1
+tarball_url="https://ftp.gnu.org/gnu/autoconf/autoconf-2.69.tar.gz"
+tarball_blake2b="7e8a513bbfcabadad1577919c048cc05ca0a084788850b42570f88afc2fa9c25fb32277412f135b81ba1c0d8079465a6b581d2d78662c991d2183b739fac407c"
 
 build() {
     "${source_dir}"/configure --prefix="${prefix}"

diff --git a/host-recipes/autoconf-archive b/host-recipes/autoconf-archive
@@ -1,12 +1,8 @@
 name=autoconf-archive
-from_source=autoconf-archive
+version=2023.02.20
 revision=1
-
-build() {
-    true
-
-    true
-}
+tarball_url="https://ftp.gnu.org/gnu/autoconf-archive/autoconf-archive-2023.02.20.tar.xz"
+tarball_blake2b="a72469e61a6ef702cbf4e30712c7dbe36369da7dad6e2312eb7026af41a989a47ded0a27975349486b69155f9e8199f89720dc57f98440b2766294a0f8755ee6"
 
 package() {
     mkdir -p "${dest_dir}${prefix}"/share/aclocal

diff --git a/host-recipes/automake b/host-recipes/automake
@@ -1,6 +1,8 @@
 name=automake
-from_source=automake
+version=1.16.5
 revision=1
+tarball_url="https://ftp.gnu.org/gnu/automake/automake-1.16.5.tar.gz"
+tarball_blake2b="5ccdcbe2d3deb2b0baed4a8590b07714cd7098fbda251afebe83232ed03f4db84abbe023cf0544622dbc5137254347273247428eb5420564a167b86de95d113e"
 imagedeps="gcc"
 hostrundeps="autoconf"
 

diff --git a/host-recipes/binutils b/host-recipes/binutils
@@ -1,9 +1,16 @@
 name=binutils
-from_source=binutils
+version=2.41
 revision=1
+tarball_url="https://ftp.gnu.org/gnu/binutils/binutils-2.41.tar.xz"
+tarball_blake2b="3bccec2b52f7e82a727121bf2a2e51a6249ba63dcd74c665fd834e858645c912ffd8245d848435288b938852830b482905606f55c40df4061215fd75c52ffc75"
+source_hostdeps="autoconf automake libtool pkg-config"
 imagedeps="gcc"
 hostdeps="autoconf automake libtool pkg-config"
 
+regenerate() {
+    autotools_recursive_regen -I"$(realpath ./config)"
+}
+
 build() {
     "${source_dir}"/configure \
         --prefix="${prefix}" \

diff --git a/host-recipes/cmake b/host-recipes/cmake
@@ -1,6 +1,8 @@
 name=cmake
-from_source=cmake
+version=3.27.7
 revision=1
+tarball_url="https://github.com/Kitware/CMake/releases/download/v3.27.7/cmake-3.27.7.tar.gz"
+tarball_blake2b="a20fac503ba54b4b7e85896056a614b67aa346ad2636e7ab1bf09a2660b92a52754485527f36101e59d47713e7445d27797577c1fa6a8ebe59acb4675227c6da"
 imagedeps="gcc"
 
 build() {

diff --git a/host-recipes/gnulib b/host-recipes/gnulib
@@ -1,13 +1,5 @@
 name=gnulib
-from_source=gnulib
+version=131fd99e619b41c007521c97b6566cb833d58fb5
 revision=1
-
-build() {
-    true
-
-    true
-}
-
-package() {
-    true
-}
+tarball_url="https://git.savannah.gnu.org/cgit/gnulib.git/snapshot/gnulib-131fd99e619b41c007521c97b6566cb833d58fb5.tar.gz"
+tarball_blake2b="bc0a756cc602e4d46a85494cceffff510a4f080e9b8d96f38550121a061b48562009b1a2c38e6c0404ff8805c0c1743d25f98fea4906653ec9607a932dfa8ffd"
diff --git a/host-recipes/libgcc-binaries b/host-recipes/libgcc-binaries
@@ -1,12 +1,8 @@
 name=libgcc-binaries
-from_source=libgcc-binaries
+version=1e4b24ef15a7d9a2db7570d1c9283fc474dcbd73
 revision=1
-
-build() {
-    true
-
-    true
-}
+tarball_url="https://github.com/mintsuki/libgcc-binaries/archive/1e4b24ef15a7d9a2db7570d1c9283fc474dcbd73.tar.gz"
+tarball_blake2b="77b8af0466577ca5af9b16d968865d24d42fb422566de2f03dd5b2d984f70015da6b1bd28878855889ee665f0ace4419cee3c40d20ac1176b0c500a1e50302bd"
 
 package() {
     mkdir -p ${dest_dir}${prefix}/libgcc-binaries

diff --git a/host-recipes/libtool b/host-recipes/libtool
@@ -1,8 +1,17 @@
 name=libtool
-from_source=libtool
+version=2.4.7
 revision=1
-hostdeps="autoconf automake"
+tarball_url="https://ftp.gnu.org/gnu/libtool/libtool-2.4.7.tar.gz"
+tarball_blake2b="3b7c66050237931443008d6be9c0c30f4938402bf68576cdf02f2248b216bb68c6b797bbfdb8a92caa5e12cb10208cd19771cdcb6b0d83572ad60bfc03e67e98"
+source_imagedeps="help2man"
+source_hostdeps="autoconf automake gnulib"
 imagedeps="help2man gcc"
+hostdeps="autoconf automake"
+
+regenerate() {
+    cp -r ${base_dir}/sources/gnulib ./
+    ./bootstrap --force --skip-git --skip-po --gnulib-srcdir=`pwd`/gnulib
+}
 
 build() {
     cp -rp "${source_dir}"/. ./

diff --git a/host-recipes/limine b/host-recipes/limine
@@ -1,8 +1,15 @@
 name=limine
-from_source=limine
+version=6.20231216.0
 revision=1
-hostdeps="gcc autoconf automake libtool pkg-config"
+tarball_url="https://github.com/limine-bootloader/limine/releases/download/v6.20231216.0/limine-6.20231216.0.tar.xz"
+tarball_blake2b="d30364ccbe666b1aa25a54578ff7d27addc9b08908b7569c813df87ccb7018fd71381fc823c4f5c3ed13bf1de204781d3907696c791e418bafddd4e00dec9a95"
+source_hostdeps="autoconf automake libtool pkg-config"
 imagedeps="nasm gcc mtools"
+hostdeps="gcc autoconf automake libtool pkg-config"
+
+regenerate() {
+    libtoolize -cfvi && autoreconf -fvi
+}
 
 build() {
     "${source_dir}"/configure \

diff --git a/host-recipes/pkg-config b/host-recipes/pkg-config
@@ -1,9 +1,16 @@
 name=pkg-config
-from_source=pkg-config
+version=2.0.3
 revision=1
+tarball_url="https://github.com/pkgconf/pkgconf/archive/refs/tags/pkgconf-2.0.3.tar.gz"
+tarball_blake2b="2f305e102913dbd6e45acb4e008afea879f95aab010f1ebc7a83c218d27f2079eb6fac51be811dad9a62057928ce270fe4e8cb6db24070d8f900956af5a67249"
+source_hostdeps="autoconf automake libtool"
 imagedeps="gcc"
 hostdeps="automake autoconf libtool"
 
+regenerate() {
+    libtoolize -cfvi && autoreconf -fvi
+}
+
 build() {
     "${source_dir}"/configure \
         --prefix="${prefix}"

diff --git a/host-recipes/v b/host-recipes/v
@@ -1,8 +1,16 @@
 name=v
-from_source=v
+version=93756d2027cad6c3f7295cbf6db99bc78d83ec6a
 revision=1
+tarball_url="https://github.com/vlang/v/archive/93756d2027cad6c3f7295cbf6db99bc78d83ec6a.tar.gz"
+tarball_blake2b="d094d11bd095255ae59f7f7627bdbe5d8f2091593e5f0fa4f12e8b0639de9199a9efbde35dad97832e79595849841882ac1094816b29854be0398ed25c30815d"
+source_imagedeps="curl"
+source_allow_network="yes"
 imagedeps="gcc"
 
+regenerate() {
+    curl -o v.c https://raw.githubusercontent.com/vlang/vc/f1f618e8f4bd92957a7bccdb13df0c3c9b621a65/v.c
+}
+
 build() {
     cp -r ${source_dir}/. ./
     cc -O2 -pipe -w -std=gnu99 -fno-strict-aliasing v.c -o v -lm -lpthread

diff --git a/host-recipes/xorg-font-util b/host-recipes/xorg-font-util
@@ -1,8 +1,15 @@
 name=xorg-font-util
-from_source=xorg-font-util
+version=1.4.1
 revision=1
+tarball_url="https://www.x.org/archive/individual/font/font-util-1.4.1.tar.xz"
+tarball_blake2b="5a7cee52aa58cecc85f5168963038b65d921bc33615e86a833cba5aec007d61bb05fa3b200ed9b192d9ab9291d53065443711f8eac976242b2013cd7b9fc494a"
+source_hostdeps="automake autoconf libtool pkg-config xorg-macros"
 imagedeps="gcc"
 
+regenerate() {
+    libtoolize -cfvi && autoreconf -fvi
+}
+
 build() {
     "${source_dir}"/configure --prefix="${prefix}"
 

diff --git a/recipes/base-files b/recipes/base-files
@@ -2,10 +2,6 @@ name=base-files
 from_source=base-files
 revision=1
 
-build() {
-    true
-}
-
 package() {
     cp -rpv ${source_dir}/. "${dest_dir}"/
     ln -s usr/bin "${dest_dir}"/bin

diff --git a/recipes/bash b/recipes/bash
@@ -1,10 +1,17 @@
 name=bash
-from_source=bash
+version=5.2.21
 revision=1
+tarball_url="https://ftp.gnu.org/gnu/bash/bash-5.2.21.tar.gz"
+tarball_blake2b="6789c9a0d9eb1ad167d4199bf1438d77934a7bbeae9f9fdd7167cae006b17b3894852440248db1bb6e9cf6d930e8a18b6448a3bb4db8831b2e6d1445b56a2065"
+source_hostdeps="autoconf automake libtool pkg-config"
 imagedeps="gcc"
 hostdeps="gcc autoconf automake libtool pkg-config"
 deps="core-libs ncurses readline"
 
+regenerate() {
+    libtoolize -cfvi && AUTOHEADER=true autoreconf -fvi
+}
+
 build() {
     ${source_dir}/configure \
         --host=${OS_TRIPLET} \

diff --git a/recipes/binutils b/recipes/binutils
@@ -1,9 +1,16 @@
 name=binutils
-from_source=binutils
+version=2.41
 revision=1
+tarball_url="https://ftp.gnu.org/gnu/binutils/binutils-2.41.tar.xz"
+tarball_blake2b="3bccec2b52f7e82a727121bf2a2e51a6249ba63dcd74c665fd834e858645c912ffd8245d848435288b938852830b482905606f55c40df4061215fd75c52ffc75"
+source_hostdeps="autoconf automake libtool pkg-config"
+imagedeps="gcc"
 hostdeps="gcc autoconf automake libtool pkg-config"
 deps="core-libs zlib gmp"
-imagedeps="gcc"
+
+regenerate() {
+    autotools_recursive_regen -I"$(realpath ./config)"
+}
 
 build() {
     ${source_dir}/configure           \

diff --git a/recipes/bzip2 b/recipes/bzip2
@@ -1,6 +1,8 @@
 name=bzip2
-from_source=bzip2
+version=1.0.8
 revision=1
+tarball_url="https://sourceware.org/ftp/bzip2/bzip2-1.0.8.tar.gz"
+tarball_blake2b="22ab3acd84f4db8c3d6f59340c252faedfd4447cea00dafbd652e65b6cf8a20adf6835c22e58563004cfafdb15348c924996230b4b23cae42da5e25eeac4bdad"
 hostdeps="gcc pkg-config"
 deps="core-libs"
 

diff --git a/recipes/core-libs b/recipes/core-libs
@@ -2,11 +2,3 @@ name=core-libs
 from_source=mlibc
 revision=1
 deps="mlibc libgcc libstdc++ libintl libiconv libxcrypt"
-
-build() {
-    true
-}
-
-package() {
-    true
-}
diff --git a/recipes/coreutils b/recipes/coreutils
@@ -1,9 +1,29 @@
 name=coreutils
-from_source=coreutils
+version=9.4
 revision=1
+tarball_url="https://ftp.gnu.org/gnu/coreutils/coreutils-9.4.tar.xz"
+tarball_blake2b="83d41c48804c1d470c0e5eed38e692bb6875436dda3f6e2c29784ad6ef563d86e8e066a050e222621b400f78ea4630b1e127d20fc9b76f12096528c42677e35d"
+source_imagedeps="gcc gperf"
+source_hostdeps="automake autoconf libtool pkg-config"
+imagedeps="gcc gperf"
 hostdeps="gcc automake autoconf libtool pkg-config"
 deps="core-libs tzdata"
-imagedeps="gcc gperf"
+
+regenerate() {
+    libtoolize -cfvi && autoreconf -fvi
+
+    # Huge hack: coreutils does not compile the build-machine binary make-prime-list
+    # using the build-machine compiler. Hence, build and invoke the binary manually here.
+    mkdir tmp_build_dir
+    cd tmp_build_dir
+
+    ../configure
+    make src/make-prime-list
+    ./src/make-prime-list 5000 > ../src/primes.h
+
+    cd ..
+    rm -rf tmp_build_dir
+}
 
 build() {
     cp -rp "${source_dir}"/. ./

diff --git a/recipes/cxxshim b/recipes/cxxshim
@@ -1,6 +1,8 @@
 name=cxxshim
-from_source=cxxshim
+version=6f146a41dda736572879fc524cf729eb193dc0a6
 revision=1
+tarball_url="https://github.com/managarm/cxxshim/archive/6f146a41dda736572879fc524cf729eb193dc0a6.tar.gz"
+tarball_blake2b="05d8cbad3d46b4272c7e31b1c8041cc5e640cc66853dddf58af953aeba6697dcbc05decb01dc6d4669fec52acd18b3265706dbf710d11dd98e7c1771ac598a49"
 imagedeps="meson ninja git base-devel"
 
 build() {

diff --git a/recipes/dejavu b/recipes/dejavu
@@ -1,12 +1,12 @@
 name=dejavu
-from_source=dejavu
+version=2.37
 revision=1
+tarball_url="https://sourceforge.net/projects/dejavu/files/dejavu/2.37/dejavu-fonts-ttf-2.37.tar.bz2"
+tarball_blake2b="d8614907887f20967fc7c75cb33b636a0eb5c682a076ccc7aef09f4ac243507afc005ef90d0b2aeee6a4a6a1ff3d5ce4fac0d1722a382525b3883ef53cdec26a"
 deps="core-libs freetype fontconfig"
 
 build() {
     cp -r ${source_dir}/. ./
-
-    true
 }
 
 package() {

diff --git a/recipes/diffutils b/recipes/diffutils
@@ -1,9 +1,16 @@
 name=diffutils
-from_source=diffutils
+version=3.10
 revision=1
+tarball_url="https://ftp.gnu.org/gnu/diffutils/diffutils-3.10.tar.xz"
+tarball_blake2b="24a90162b3d876e6378243f19a85a1f1bb4cdfe98d130dee684740a902f2987509d5830dd32df4e26678b468b96960f6f9785ffb922e828cb8b4acce0d8587f6"
+source_hostdeps="automake autoconf libtool pkg-config"
 hostdeps="gcc autoconf automake libtool pkg-config"
 deps="core-libs"
 
+regenerate() {
+    libtoolize -cfvi && autoreconf -fvi
+}
+
 build() {
     cp -rp "${source_dir}"/. ./
 

diff --git a/recipes/findutils b/recipes/findutils
@@ -1,9 +1,16 @@
 name=findutils
-from_source=findutils
+version=4.9.0
 revision=1
+tarball_url="https://ftp.gnu.org/gnu/findutils/findutils-4.9.0.tar.xz"
+tarball_blake2b="3ada8903fc552ad2e580a7b631a4b9d941935b3f4231029564c6f2b7b10ba6f2244e2de57f6d79268c5e0481a193f64edbbae637e7a51ae6f495e3eefabf52c9"
+source_hostdeps="automake autoconf libtool pkg-config"
+imagedeps="python"
 hostdeps="gcc autoconf automake libtool pkg-config"
 deps="core-libs"
-imagedeps="python"
+
+regenerate() {
+    libtoolize -cfvi && autoreconf -fvi
+}
 
 build() {
     cp -rp "${source_dir}"/. ./

diff --git a/recipes/fontconfig b/recipes/fontconfig
@@ -1,9 +1,18 @@
 name=fontconfig
-from_source=fontconfig
+version=2.14.2
 revision=1
+tarball_url="https://www.freedesktop.org/software/fontconfig/release/fontconfig-2.14.2.tar.xz"
+tarball_blake2b="4efeeb7f9a6705d493128d00b60e681a20a47556f4c0d7787a5c7a6d2cbbc22f150cad7988a9836a9e72aeb61e2b6a196c00a071c7042c62283c7720cdbb743d"
+source_hostdeps="automake autoconf libtool pkg-config"
+imagedeps="python gperf"
 hostdeps="gcc autoconf automake libtool pkg-config"
 deps="core-libs freetype libexpat libxml"
-imagedeps="python gperf"
+
+regenerate() {
+    libtoolize -cfvi && autoreconf -fvi
+    # Make sure we regenerate this file
+    rm -f src/fcobjshash.h
+}
 
 build() {
     ${source_dir}/configure \

diff --git a/recipes/freetype b/recipes/freetype
@@ -1,9 +1,17 @@
 name=freetype
-from_source=freetype
+version=2.13.2
 revision=1
+tarball_url="https://download.savannah.gnu.org/releases/freetype/freetype-2.13.2.tar.xz"
+tarball_blake2b="cebc82180d9afaeb112a65ba78903d7bf7a9295a803166a033585ad2325add6023f05066852240c4665e56285345ba503b01ecd461d48f0478a8f3f56136988e"
+source_hostdeps="automake autoconf libtool pkg-config"
+imagedeps="gcc"
 hostdeps="gcc autoconf automake libtool pkg-config"
 deps="core-libs bzip2 libpng zlib"
-imagedeps="gcc"
+
+regenerate() {
+    NOCONFIGURE=1 ./autogen.sh
+    cp /usr/local/share/automake-1.16/config.sub ./builds/unix/
+}
 
 build() {
     ${source_dir}/configure \