recipes/libs/libsodium/recipe.toml

 [source]
 tar = "https://github.com/jedisct1/libsodium/archive/1.0.16.tar.gz"
 blake3 = "2482633f872c173f9a42e6badb44c3efb042e783e664fdf8b1046babfa2405e7"
-patches = [
-    "random.patch"
-]
 script = "./autogen.sh"
 
 [build]

recipes/libs/libssh2/recipe.toml

 [source]
 tar = "https://www.libssh2.org/download/libssh2-1.10.0.tar.gz"
 blake3 = "2447216ce82c1d22301456bb02f60dfb6688f1461417b90f900c099a87f1292f"
-patches = []
+script = """
+DYNAMIC_INIT
+autotools_recursive_regenerate
+""" 
 
 [build]
-template = "configure"
-dependencies = [
-    "openssl1"
+template = "custom"
+dependencies = ["openssl1"]
+script = """
+DYNAMIC_INIT
+cookbook_configure
+"""
+
+[package]
+shared-deps = [
+  "libgcc", 
+  "openssl1"
 ]
+

recipes/libs/mesa/recipe.toml

@@ -35,7 +35,7 @@ echo "cpu = '$(echo "${TARGET}" | cut -d - -f1)'" >> cross_file.txt
 echo "endian = 'little'" >> cross_file.txt
 
 echo "[paths]" >> cross_file.txt
-echo "prefix = '/'" >> cross_file.txt
+echo "prefix = '/usr'" >> cross_file.txt
 echo "libdir = 'lib'" >> cross_file.txt
 echo "bindir = 'bin'" >> cross_file.txt
 
@@ -59,5 +59,5 @@ DESTDIR="${COOKBOOK_STAGE}" ninja install
 
 # Hack to add LLVM libs
 #TODO: only add necessary LLVM libs, not all of them
-sed -i "s/ -lOSMesa / -lOSMesa $("${TARGET}-llvm-config" --libs) -lstdc++ /" "${COOKBOOK_STAGE}/lib/pkgconfig/osmesa.pc"
+sed -i "s/ -lOSMesa / -lOSMesa $("${TARGET}-llvm-config" --libs) -lstdc++ /" "${COOKBOOK_STAGE}/usr/lib/pkgconfig/osmesa.pc"
 """

recipes/libs/openssl1/openssl1.patch

-diff --git a/Configurations/10-main.conf b/Configurations/10-main.conf
-index 45e2fc7a..2d7f7db3 100644
---- a/Configurations/10-main.conf
-+++ b/Configurations/10-main.conf
-@@ -175,28 +175,32 @@ sub vms_info {
-     },
- 
- 
--### Redox
--    "redox-aarch64" => {
--        inherit_from     => [ "BASE_common", asm("aarch64_asm") ],
-+### Redox configurations
-+    "redox-common" => {
-+        inherit_from     => [ "BASE_common" ],
-         cc               => "gcc",
--        cflags           => "-DL_ENDIAN -DOSSL_SSIZE_MAX=LONG_MAX -DNO_SYSLOG -O3 -static -Wall",
-+        thread_scheme    => "(unknown)",
-+        dso_scheme       => "dlfcn",
-+        shared_target    => "linux-shared",
-+        shared_cflag     => "-fPIC",
-+        shared_ldflag    => sub { $disabled{pinshared} ? () : "-Wl,-znodelete" },
-+        shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+    },
-+    "redox-aarch64" => {
-+        inherit_from     => [ "redox-common", asm("aarch64_asm") ],
-+        cflags           => "-DL_ENDIAN -DOSSL_SSIZE_MAX=LONG_MAX -DNO_SYSLOG -O3 -Wall",
-         bn_ops           => "SIXTY_FOUR_BIT_LONG",
-         perlasm_scheme   => "elf",
--        thread_scheme    => "(unknown)",
-     },
-     "redox-i686" => {
--        inherit_from     => [ "BASE_unix", asm("x86_elf_asm") ],
--        cc               => "gcc",
--        cflags           => "-DL_ENDIAN -DNO_SYSLOG -O3 -static -Wall",
-+        inherit_from     => [ "redox-common", asm("x86_elf_asm") ],
-+        cflags           => "-DL_ENDIAN -DNO_SYSLOG -O3 -Wall",
-         bn_ops           => "BN_LLONG",
--        thread_scheme    => "(unknown)",
-     },
-     "redox-x86_64" => {
--        inherit_from     => [ "BASE_common", asm("x86_64_asm") ],
--        cc               => "gcc",
--        cflags           => "-DL_ENDIAN -DOSSL_SSIZE_MAX=LONG_MAX -DNO_SYSLOG -O3 -static -Wall",
-+        inherit_from     => [ "redox-common", asm("x86_64_asm") ],
-+        cflags           => "-DL_ENDIAN -DOSSL_SSIZE_MAX=LONG_MAX -DNO_SYSLOG -O3 -Wall",
-         bn_ops           => "SIXTY_FOUR_BIT_LONG",
--        thread_scheme    => "(unknown)",
-     },
- 
- #### Solaris configurations

recipes/libs/zlib/recipe.toml

 [source]
 tar = "https://www.zlib.net/fossils/zlib-1.3.tar.gz"
 blake3 = "ec1abc6f672a7a6ee6f49ba544cc9529f73121b478310473be44fee22a140ebf"
+
 [build]
 template = "custom"
 script = """
-    DYNAMIC_INIT
-    # See https://stackoverflow.com/questions/21396988/zlib-build-not-configuring-properly-with-cross-compiler-ignores-ar.
-    CHOST="${TARGET}" "${COOKBOOK_CONFIGURE}" --prefix=""
-    "${COOKBOOK_MAKE}" -j "$(nproc)"
-    "${COOKBOOK_MAKE}" install DESTDIR="${COOKBOOK_STAGE}"
+DYNAMIC_INIT
+# See https://stackoverflow.com/questions/21396988/zlib-build-not-configuring-properly-with-cross-compiler-ignores-ar.
+CHOST="${TARGET}" "${COOKBOOK_CONFIGURE}" --prefix="/usr"
+"${COOKBOOK_MAKE}" -j "$(nproc)"
+"${COOKBOOK_MAKE}" install DESTDIR="${COOKBOOK_STAGE}"
+patchelf --set-soname 'libz.so.1.3' "${COOKBOOK_STAGE}/usr/lib/libz.so.1.3"
 """
 
 [package]

recipes/net/curl/recipe.toml

@@ -40,5 +40,7 @@ cookbook_configure
 
 [package]
 dependencies = [
+    "openssl1",
+    "zlib",
     "ca-certificates"
 ]

recipes/other/terminfo/recipe.sh

-GIT=https://github.com/sajattack/terminfo
-
-function recipe_version {
-    printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
-    skip=1
-}
-
-function recipe_build {
-    echo "skipping build"
-    skip=1
-}
-
-function recipe_clean {
-    echo "skipping clean"
-    skip=1
-}
-
-function recipe_stage {
-    mkdir -p ../stage/share
-    cp -r  * ../stage/share/
-    skip=1
-}

recipes/other/terminfo/recipe.toml

+[source]
+git = "https://github.com/sajattack/terminfo"
+branch = "master"
+
+[build]
+template = "custom"
+script = """
+mkdir -p ${COOKBOOK_STAGE}/share
+cp -r ${COOKBOOK_SOURCE}/. ${COOKBOOK_STAGE}/share/
+"""
+

recipes/shells/bash/recipe.toml

@@ -17,8 +17,9 @@ COOKBOOK_CONFIGURE_FLAGS+=(
     bash_cv_func_sigsetjmp=no
     bash_cv_getenv_redef=no
     --disable-multibyte # TODO: add more multibyte functions and remove this
+    --enable-static-link # This ensures loadables are not built, which will fail
 )
 COOKBOOK_MAKE_JOBS=1 # workaround for parallel make bugs
 cookbook_configure
-ln -s "bash" "${COOKBOOK_STAGE}/bin/sh"
+ln -s "bash" "${COOKBOOK_STAGE}/usr/bin/sh"
 """

recipes/tools/bzip2/recipe.toml

@@ -5,19 +5,35 @@ blake3 = "97af3f520629c65fe41292f77e6ca798fe594d7987bfb2aebe7c6fcdc7ab5ed2"
 [build]
 template = "custom"
 script = """
+DYNAMIC_INIT
+
+# This installs the static library regardless of config options
+# The static lib is preferred according to the README because it's faster
 rsync -av --delete "${COOKBOOK_SOURCE}/" ./
 "${COOKBOOK_MAKE}" -j"${COOKBOOK_MAKE_JOBS}" \
     AR="${TARGET}-ar" \
     CC="${TARGET}-gcc" \
-    LDFLAGS="-static" \
-    PREFIX=/ \
+    PREFIX="${COOKBOOK_STAGE}" \
     RANLIB="${TARGET}-ranlib" \
-    libbz2.a \
-    bzip2
-mkdir -pv "${COOKBOOK_STAGE}/bin"
-cp -v bzip2 "${COOKBOOK_STAGE}/bin"
-mkdir -pv "${COOKBOOK_STAGE}/include"
-cp -v bzlib.h "${COOKBOOK_STAGE}/include"
-mkdir -pv "${COOKBOOK_STAGE}/lib"
-cp -v libbz2.a "${COOKBOOK_STAGE}/lib"
+    install
+
+# However, distros distribute libbz2 as well so we'll support it too
+if ! [[ -n "${COOKBOOK_PREFER_STATIC}" ]]; then
+    # Linking the lib fails if we don't rebuild the objects from earlier
+    "${COOKBOOK_MAKE}" clean
+
+    # This DOES NOT build/clobber the binaries already built above
+    "${COOKBOOK_MAKE}" -f Makefile-libbz2_so \
+        -j"${COOKBOOK_MAKE_JOBS}" \
+        AR="${TARGET}-ar" \
+        CC="${TARGET}-gcc" \
+        PREFIX="${COOKBOOK_STAGE}" \
+        RANLIB="${TARGET}-ranlib"
+
+    cp -v libbz2.so.1.0.8 "${COOKBOOK_STAGE}/lib"
+    cp -v libbz2.so.1.0 "${COOKBOOK_STAGE}/lib"
+fi
 """
+
+[package]
+shared-deps = ["libgcc"]

recipes/tools/cosmic-files/recipe.toml

@@ -9,8 +9,11 @@ dependencies = [
     "libiconv",
 ]
 script = """
+DYNAMIC_INIT
+if [[ -n "$COOKBOOK_PREFER_STATIC" ]]; then
+  export GETTEXT_STATIC=1
+fi
 export GETTEXT_DIR="${COOKBOOK_SYSROOT}"
-export GETTEXT_STATIC=1
 # Hack to link libiconv, which gettext-sys does not link
 "${COOKBOOK_CARGO}" rustc \
     --manifest-path "${COOKBOOK_SOURCE}/Cargo.toml" \
@@ -34,3 +37,11 @@ cp -v "${COOKBOOK_SOURCE}/res/${APPID}.metainfo.xml" "${COOKBOOK_STAGE}/usr/shar
 mkdir -pv "${COOKBOOK_STAGE}/usr/share/icons/"
 cp -rv "${COOKBOOK_SOURCE}/res/icons/hicolor/" "${COOKBOOK_STAGE}/usr/share/icons/"
 """
+
+[package]
+shared-deps = [
+  "libgcc",
+  "gettext",
+  "libiconv"
+]
+

recipes/tools/cosmic-store/recipe.toml

@@ -9,6 +9,7 @@ dependencies = [
     "openssl1",
 ]
 script = """
+DYNAMIC_INIT
 export GETTEXT_DIR="${COOKBOOK_SYSROOT}"
 export GETTEXT_STATIC=1
 cookbook_cargo --no-default-features --features desktop,pkgar
@@ -21,3 +22,9 @@ cp -v "${COOKBOOK_SOURCE}/res/${APPID}.metainfo.xml" "${COOKBOOK_STAGE}/usr/shar
 mkdir -pv "${COOKBOOK_STAGE}/usr/share/icons/"
 cp -rv "${COOKBOOK_SOURCE}/res/icons/hicolor/" "${COOKBOOK_STAGE}/usr/share/icons/"
 """
+
+[package]
+shared-deps = [
+    "libgcc",
+    "openssl1",
+]

recipes/tools/cosmic-term/recipe.toml

@@ -5,6 +5,7 @@ branch = "master"
 [build]
 template = "custom"
 script = """
+DYNAMIC_INIT
 cookbook_cargo --no-default-features
 mkdir -pv "${COOKBOOK_STAGE}/ui/apps"
 cp -v "${COOKBOOK_RECIPE}/manifest" "${COOKBOOK_STAGE}/ui/apps/10_cosmic-term"
@@ -17,3 +18,9 @@ cp -v "${COOKBOOK_SOURCE}/res/${APPID}.metainfo.xml" "${COOKBOOK_STAGE}/usr/shar
 mkdir -pv "${COOKBOOK_STAGE}/usr/share/icons/"
 cp -rv "${COOKBOOK_SOURCE}/res/icons/hicolor/" "${COOKBOOK_STAGE}/usr/share/icons/"
 """
+
+[package]
+shared-deps = [
+  "libgcc"
+]
+

recipes/tools/gettext/recipe.toml

+# GNU gettext utilities are a set of tools that provides a framework to help
+# other GNU packages produce multi-lingual messages.
 [source]
-tar = "https://ftp.gnu.org/pub/gnu/gettext/gettext-0.21.1.tar.gz"
-blake3 = "0d0af5a79978fbeac4641ee64480943650af99f70467353e7c3068ffd5523acd"
+tar = "https://ftp.gnu.org/pub/gnu/gettext/gettext-0.22.5.tar.gz"
+blake3 = "cb3f3a34da7ce1a92746df81f5b78c5d53841973a24eb80ab76537263d380ec0"
 patches = [
     "redox.patch"
 ]
 script = """
+DYNAMIC_INIT
 wget -O build-aux/config.sub "https://gitlab.redox-os.org/redox-os/gnu-config/-/raw/master/config.sub?inline=false"
+( cd gettext-runtime/libasprintf && autoreconf -fvi -I${COOKBOOK_HOST_SYSROOT}/share/aclocal )
+( cd gettext-runtime/intl && autoreconf -fvi -I${COOKBOOK_HOST_SYSROOT}/share/aclocal )
+( cd gettext-runtime && autoreconf -fvi -I${COOKBOOK_HOST_SYSROOT}/share/aclocal )
+( cd gettext-tools && autoreconf -fvi -I${COOKBOOK_HOST_SYSROOT}/share/aclocal )
+( cd libtextstyle && autoreconf -fvi -I${COOKBOOK_HOST_SYSROOT}/share/aclocal )
+autoreconf -fvi -I${COOKBOOK_HOST_SYSROOT}/share/aclocal
 """
 
 [build]
@@ -14,9 +23,10 @@ dependencies = [
     "libiconv"
 ]
 script = """
+DYNAMIC_INIT
 COOKBOOK_CONFIGURE_FLAGS+=(
-    --disable-shared
     --enable-static
+    --enable-shared
     ac_cv_have_decl_program_invocation_name=no
     gt_cv_locale_fr=false
     gt_cv_locale_fr_utf8=false
@@ -26,3 +36,10 @@ COOKBOOK_CONFIGURE_FLAGS+=(
 )
 cookbook_configure
 """
+
+[package]
+shared-deps = [
+  "libgcc",
+  "libiconv"
+]
+

recipes/tools/vim/recipe.sh

-VERSION=8.2
-# We use `https://ftp.nluug.nl` because `ftp.vim.org` doesn't support `https`
-# see https://www.vim.org/mirrors.php
-TAR=https://ftp.nluug.nl/pub/vim/unix/vim-$VERSION.tar.bz2
-
-BUILD_DEPENDS=(ncurses)
-DEPENDS="terminfo"
-
-function recipe_version {
-    echo "$VERSION"
-    skip=1
-}
-
-function recipe_build {
-    sysroot="$(realpath ../sysroot)"
-    export LDFLAGS="-L$sysroot/lib -static"
-    export CPPFLAGS="-I$sysroot/include"
-    export vim_cv_toupper_broken=no
-    export vim_cv_tgetent=zero
-    export vim_cv_terminfo=yes
-    export vim_cv_tty_group=world
-    export vim_cv_getcwd_broken=no
-    export vim_cv_stat_ignores_slash=yes
-    export vim_cv_memmove_handles_overlap=yes
-    ./configure --build=${BUILD} --host=${HOST} --prefix=/ --with-tlib=ncurses
-    "$REDOX_MAKE" -j"$($NPROC)"
-    skip=1
-}
-
-function recipe_clean {
-    "$REDOX_MAKE" clean
-    skip=1
-}
-
-function recipe_stage {
-    dest="$(realpath $1)"
-    "$REDOX_MAKE" DESTDIR="$dest" ${MAKEFLAGS} install
-    skip=1
-}

recipes/tools/vim/recipe.toml

+[source]
+tar = "https://github.com/vim/vim/archive/refs/tags/v8.2.5172.tar.gz"
+blake3 = "28a58578a6655e2e45078331569d6e6c96ed05189acda34c2a784581bf614cd2"
+patch = ["vim.patch"]
+
+[build]
+dependencies = ["ncurses"]
+template = "custom"
+script = """
+export vim_cv_toupper_broken=no
+export vim_cv_tgetent=zero
+export vim_cv_terminfo=yes
+export vim_cv_tty_group=world
+export vim_cv_getcwd_broken=no
+export vim_cv_stat_ignores_slash=yes
+export vim_cv_memmove_handles_overlap=yes
+export SRCDIR="${COOKBOOK_SOURCE}/src"
+
+COOKBOOK_CONFIGURE_FLAGS+=(
+    --with-tlib=ncurses
+)
+
+pushd "${SRCDIR}"
+cookbook_configure
+popd
+"""

recipes/web/netsurf/recipe.sh

-VERSION=3.10
-TAR=https://download.netsurf-browser.org/netsurf/releases/source-full/netsurf-all-$VERSION.tar.gz
-BUILD_DEPENDS=(curl expat libjpeg libpng nghttp2 openssl1 sdl1 zlib freetype2 liborbital libiconv)
-DEPENDS="ca-certificates orbital"
-
-function recipe_version {
-    echo "$VERSION"
-    skip=1
-}
-
-function recipe_build {
-    export TARGET="framebuffer"
-    export CFLAGS="-I${COOKBOOK_SYSROOT}/include -I${PWD}/inst-${TARGET}/include"
-    export LDFLAGS="-L${COOKBOOK_SYSROOT}/lib -L${PWD}/inst-${TARGET}/lib -static -Wl,--allow-multiple-definition -Wl,-Bstatic"
-    # nghttp2 is not linked for some reason
-    export LDFLAGS="${LDFLAGS} -lcurl -lnghttp2"
-    "$REDOX_MAKE" PREFIX=/usr V=1 -j"$($NPROC)"
-    skip=1
-}
-
-function recipe_clean {
-    "$REDOX_MAKE" clean
-    skip=1
-}
-
-function recipe_stage {
-    dest="$(realpath "$1")"
-    "$REDOX_MAKE" DESTDIR="$dest" PREFIX=/usr install
-    mkdir -pv "$dest/ui/apps"
-    cp -v "${COOKBOOK_RECIPE}/manifest" "$dest/ui/apps/00_netsurf"
-    skip=1
-}

recipes/web/netsurf/recipe.toml

+[source]
+tar = "https://download.netsurf-browser.org/netsurf/releases/source-full/netsurf-all-3.10.tar.gz"
+blake3 = "d0f3b4dabf536a39059b156d2ec4633c6f7b71208466e09a3c1ca2a319a44b61"
+patches = [
+    "./01_redox.patch"
+]
+
+[build]
+template = "custom"
+dependencies = [
+    "curl",
+    "expat",
+    "libjpeg",
+    "libpng",
+    "nghttp2",
+    "openssl1",
+    "sdl1",
+    "zlib",
+    "freetype2",
+    "liborbital",
+    "libiconv"
+]
+script = """
+DYNAMIC_INIT
+
+# Netsurf does not currently support out-of-tree builds :(
+rsync -av --delete "${COOKBOOK_SOURCE}/" ./
+
+export TARGET="framebuffer"
+export CFLAGS="-I${COOKBOOK_SYSROOT}/include -I${PWD}/inst-${TARGET}/include"
+export LDFLAGS="-L${COOKBOOK_SYSROOT}/lib -L${PWD}/inst-${TARGET}/lib -Wl,--allow-multiple-definition -Wl,-rpath-link,${COOKBOOK_SYSROOT}/lib"
+# nghttp2 is not linked for some reason
+export LDFLAGS="${LDFLAGS} -lcurl -lnghttp2"
+
+"$COOKBOOK_MAKE" PREFIX=/usr V=1 -j"$($NPROC)"
+"$COOKBOOK_MAKE" DESTDIR="$COOKBOOK_STAGE" PREFIX=/usr install -j"$($NPROC)"
+mkdir -pv "$COOKBOOK_STAGE/ui/apps"
+cp -v "${COOKBOOK_RECIPE}/manifest" "$COOKBOOK_STAGE/ui/apps/00_netsurf"
+"""
+
+[package]
+shared-deps = [
+    # XXX: currently only the following are dynamically linked
+    "curl",
+    "libgcc",
+    "libiconv",
+    "liborbital",
+    "libpng",
+    "nghttp2",
+    "openssl1",
+    "relibc",
+    "zlib",
+]
+dependencies = [
+    "ca-certificates",
+    "orbital",
+]

recipes/wip/data/poppler-data/recipe.toml

+#TODO missing script for gnu make
+[source]
+tar = "https://poppler.freedesktop.org/poppler-data-0.4.12.tar.gz"
+[build]
+template = "custom"

recipes/core/netstack/recipe.toml → recipes/wip/dev/cargo-tools/cargo-autodd/recipe.toml

+#TODO not compiled or tested
 [source]
-git = "https://gitlab.redox-os.org/redox-os/netstack.git"
-
+git = "https://github.com/nwiizo/cargo-autodd"
 [build]
 template = "cargo"