Ports: Update Zig to 0.15.0-dev.208+8acedfd5b

Author: linusg

Ports/AvailablePorts.md

@@ -352,7 +352,7 @@ This list is also available at [ports.serenityos.net](https://ports.serenityos.n
 | [`xorriso`](xorriso/)                         | xorriso                                                       | 1.5.6                    | https://www.gnu.org/software/xorriso                                 |
 | [`xz`](xz/)                                   | xz                                                            | 5.6.2                    | https://tukaani.org/xz/                                              |
 | [`yasm`](yasm/)                               | Yasm Modular Assembler                                        | 1.3.0                    | https://yasm.tortall.net/                                            |
-| [`zig`](zig/)                                 | Zig programming language                                      | 0.12.0-dev.141+ddf5859c2 | https://ziglang.org/                                                 |
+| [`zig`](zig/)                                 | Zig programming language                                      | 0.15.0-dev.208+8acedfd5b | https://ziglang.org/                                                 |
 | [`zlib`](zlib/)                               | zlib                                                          | 1.3.1                    | https://www.zlib.net/                                                |
 | [`zsh`](zsh/)                                 | Z Shell (Zsh)                                                 | 5.9                      | https://www.zsh.org                                                  |
 | [`zstd`](zstd/)                               | Zstandard                                                     | 1.5.6                    | https://facebook.github.io/zstd/                                     |

Ports/gcc/package.sh

@@ -1,7 +1,8 @@
 #!/usr/bin/env -S bash ../.port_include.sh
-port=gcc
-version=13.2.0
-useconfigure=true
+port='gcc'
+# Update SERENITY_GCC_VERSION in Zig's package.sh when changing this
+version='13.2.0'
+useconfigure='true'
 configopts=("--target=${SERENITY_ARCH}-pc-serenity" "--with-sysroot=/" "--with-build-sysroot=${SERENITY_INSTALL_ROOT}" "--enable-languages=c,c++" "--disable-lto" "--disable-nls" "--enable-shared" "--enable-default-pie" "--enable-host-shared" "--enable-threads=posix" "--enable-initfini-array" "--with-linker-hash-style=gnu")
 files=(
     "https://ftpmirror.gnu.org/gnu/gcc/gcc-${version}/gcc-${version}.tar.xz#e275e76442a6067341a27f04c5c6b83d8613144004c0413528863dc6b5c743da"

Ports/zig/.gitignore

@@ -1,28 +1,45 @@
 #!/usr/bin/env -S bash ../.port_include.sh
 
 port='zig'
-version='0.12.0-dev.141+ddf5859c2'
+version='0.15.0-dev.208+8acedfd5b'
 files=(
-    'https://github.com/ziglang/zig-bootstrap/archive/34644ad5032c58e39327d33d7f96d63d7c330003.tar.gz#e502ae17b01f03c627927d60b2e26b5f7f83b0e8be27b6ef55511d52e5892ccf'
-    'https://github.com/ziglang/zig/archive/ddf5859c22527c6bf5d8bb13310db996fcc58874.tar.gz#9adaf787b6233cfbe784d2d8a72398784f3742e2f5ac700cbd59ba952f9491ad'
+    'https://github.com/ziglang/zig-bootstrap/archive/03a95efaf981b9cee59af8027304c37a59d36fc0.tar.gz#6541363baacc64ede96bcfb81b562a8a825d65fb4a05ab4e321be74c656a61d1'
+    'https://github.com/ziglang/zig/archive/8acedfd5baabab705946ad097746f9183ef62420.tar.gz#062ad37a4b501340e10b121ef4f825c411ec51385d34666e5f11f18ef9d6d6d9'
 )
 
 # The actual directory to build in.
-workdir='zig-bootstrap-34644ad5032c58e39327d33d7f96d63d7c330003'
+workdir='zig-bootstrap-03a95efaf981b9cee59af8027304c37a59d36fc0'
 # The newer Zig directory we move into the workdir.
-zigdir='zig-ddf5859c22527c6bf5d8bb13310db996fcc58874'
+zigdir='zig-8acedfd5baabab705946ad097746f9183ef62420'
+
+# This is read in the build script to set gcc_dir in the custom libc definition file
+# TODO: Maybe we can just symlink the crt files to /usr/local/lib or otherwise remove the need for a hardcoded version
+export SERENITY_GCC_VERSION='13.2.0'
 
 post_fetch() {
+    # NOTE: Running this multiple times is a massive footgun as patches only get applied once, the
+    #       next time we'd end up with a clean copy of the original Zig sources.
+    if [ -f .post-fetch-executed ]; then
+        return
+    fi
+    run touch .post-fetch-executed
+
     # Move the newer version of Zig into the bootstrap
     run rm -rf zig
-    run mv "../${zigdir}" zig
+    run cp -r "../${zigdir}" zig
 
-    # Copy the scripts that the build process will use
-    run mkdir -p out
-    run cp -r "${PORT_META_DIR}/scripts" out/
+    # Copy libSystem definitions which are required on macOS, once we set $ZIG_LIBC it will no
+    # longer be found in its original place
+    run cp zig/lib/libc/darwin/libSystem.tbd "${DESTDIR}/usr/lib/"
 }
 
 build() {
+    if [ ! -f "${DESTDIR}/usr/local/lib/gcc/${SERENITY_ARCH}-pc-serenity/${SERENITY_GCC_VERSION}/crtbeginS.o" ] ||
+       [ ! -f "${DESTDIR}/usr/local/lib/gcc/${SERENITY_ARCH}-pc-serenity/${SERENITY_GCC_VERSION}/crtendS.o" ]; then
+        echo "crtbeginS.o or crtendS.o could not be found, ensure the GCC port is installed."
+        exit 1
+    fi
+
     host_env
     cd "${workdir}"
     ./build "${SERENITY_ARCH}-serenity-none" "native"