Ports: Don't use the fully qualified target triple

`configure` is smart enough to find the correct compiler from a vendor-less target triple. This will ease a future target-triple change.
2026-04-25 17:15:42 +02:00 · 2026-02-27 10:33:01 +01:00
parent e16793201f
commit b0e7120061
19 changed files with 20 additions and 20 deletions
--- a/Ports/.port_include.sh
+++ b/Ports/.port_include.sh
@@ -474,9 +474,9 @@ func_defined pre_configure || pre_configure() {
 func_defined configure || configure() {
    chmod +x "${workdir}"/"$configscript"
    if [[ -n "${SERENITY_SOURCE_DIR:-}" ]]; then
-        run ./"$configscript" --host="${SERENITY_ARCH}-pc-serenity" "${configopts[@]}"
+        run ./"$configscript" --host="${SERENITY_ARCH}-serenity" "${configopts[@]}"
    else
-        run ./"$configscript" --build="${SERENITY_ARCH}-pc-serenity" "${configopts[@]}"
+        run ./"$configscript" --build="${SERENITY_ARCH}-serenity" "${configopts[@]}"
    fi
 }
 func_defined post_configure || post_configure() {
--- a/Ports/OpenJDK/package.sh
+++ b/Ports/OpenJDK/package.sh
@@ -36,7 +36,7 @@ configure() {
        BUILD_AR=${HOST_AR} \
        BUILD_OBJCOPY=${HOST_OBJCOPY} \
        BUILD_STRIP=${HOST_STRIP} \
-        --openjdk-target=${SERENITY_ARCH}-pc-serenity \
+        --openjdk-target=${SERENITY_ARCH}-serenity \
        --with-sysroot=${SERENITY_INSTALL_ROOT} \
        --with-jvm-variants=zero \
        --enable-headless-only \
--- a/Ports/README.md
+++ b/Ports/README.md
@@ -154,7 +154,7 @@ The following variables have special functionality:
 Options passed to the port's [`configscript`](#configscript) in the default
 `configure` function.

-`--host=x86_64-pc-serenity` is always passed, override the `configure` function
+`--host=x86_64-serenity` is always passed, override the `configure` function
 if that's undesirable.

 #### `use_fresh_config_sub`
--- a/Ports/SDL2_image/package.sh
+++ b/Ports/SDL2_image/package.sh
@@ -13,7 +13,7 @@ files=(
 )
 configure() {
    run ./configure \
-        --host="${SERENITY_ARCH}-pc-serenity" \
+        --host="${SERENITY_ARCH}-serenity" \
        --with-sdl-prefix="${SERENITY_INSTALL_ROOT}/usr/local" \
        --enable-webp='false' \
        --enable-webp-shared='false' \
--- a/Ports/SDL2_mixer/package.sh
+++ b/Ports/SDL2_mixer/package.sh
@@ -16,7 +16,7 @@ depends=(
 configure() {
    export LIBS="-L${SERENITY_INSTALL_ROOT}/usr/local/lib"
    run ./configure \
-        --host="${SERENITY_ARCH}-pc-serenity" \
+        --host="${SERENITY_ARCH}-serenity" \
        --with-sdl-prefix="${SERENITY_INSTALL_ROOT}/usr/local" \
        --enable-music-opus='false' \
        --enable-music-opus-shared='false' \
--- a/Ports/SDL2_ttf/package.sh
+++ b/Ports/SDL2_ttf/package.sh
@@ -12,7 +12,7 @@ depends=(

 configure() {
    run ./configure \
-        --host="${SERENITY_ARCH}-pc-serenity" \
+        --host="${SERENITY_ARCH}-serenity" \
        --with-sdl-prefix="${SERENITY_INSTALL_ROOT}/usr/local" \
        --with-x='no' \
        --disable-static \
--- a/Ports/alpine/package.sh
+++ b/Ports/alpine/package.sh
@@ -25,7 +25,7 @@ icon_file='web/cgi/favicon.ico'
 configure() {
    run ./"$configscript" \
        "${configopts[@]}" \
-        --host="${SERENITY_ARCH}-pc-serenity" \
+        --host="${SERENITY_ARCH}-serenity" \
        --build="$($workdir/config.guess)" \
        --with-ssl-lib-dir="${SERENITY_INSTALL_ROOT}/usr/local/lib" \
        --with-include-path="${SERENITY_INSTALL_ROOT}/usr/local/include:${SERENITY_INSTALL_ROOT}/usr/local/include/openssl" \
--- a/Ports/dash/package.sh
+++ b/Ports/dash/package.sh
@@ -16,7 +16,7 @@ configure() {
    run sh -c "cd host-build && ../configure ${configopts[@]} CFLAGS=-I."
    target_env
    run mkdir -p target-build
-    run sh -c "cd target-build && ../configure --host="${SERENITY_ARCH}-pc-serenity" --disable-helpers ${configopts[@]} CFLAGS=-I."
+    run sh -c "cd target-build && ../configure --host="${SERENITY_ARCH}-serenity" --disable-helpers ${configopts[@]} CFLAGS=-I."
 }

 build() {
--- a/Ports/gnupg/package.sh
+++ b/Ports/gnupg/package.sh
@@ -27,7 +27,7 @@ pre_configure() {

 configure() {
    run ./configure \
-        --host="${SERENITY_ARCH}-pc-serenity" \
+        --host="${SERENITY_ARCH}-serenity" \
        --build="$("${workdir}/build-aux/config.guess")" \
        --with-libgpg-error-prefix="${SERENITY_INSTALL_ROOT}/usr/local" \
        --with-libgcrypt-prefix="${SERENITY_INSTALL_ROOT}/usr/local" \
--- a/Ports/libassuan/package.sh
+++ b/Ports/libassuan/package.sh
@@ -19,7 +19,7 @@ pre_configure() {

 configure() {
    run ./configure \
-        --host="${SERENITY_ARCH}-pc-serenity" \
+        --host="${SERENITY_ARCH}-serenity" \
        --build="$("${workdir}/build-aux/config.guess")" \
        --disable-static \
        --enable-shared \
--- a/Ports/libgcrypt/package.sh
+++ b/Ports/libgcrypt/package.sh
@@ -19,7 +19,7 @@ pre_configure() {

 configure() {
    run ./configure \
-        --host="${SERENITY_ARCH}-pc-serenity" \
+        --host="${SERENITY_ARCH}-serenity" \
        --build="$("${workdir}/build-aux/config.guess")" \
        --with-libgpg-error-prefix="${SERENITY_INSTALL_ROOT}/usr/local" \
        --with-sysroot="${SERENITY_INSTALL_ROOT}"
--- a/Ports/libgpg-error/package.sh
+++ b/Ports/libgpg-error/package.sh
@@ -15,7 +15,7 @@ depends=(

 configure() {
    run ./configure \
-        --host="${SERENITY_ARCH}-pc-serenity" \
+        --host="${SERENITY_ARCH}-serenity" \
        --build="$("${workdir}/build-aux/config.guess")" \
        --with-sysroot="${SERENITY_INSTALL_ROOT}" \
        --disable-tests \
--- a/Ports/libicu/package.sh
+++ b/Ports/libicu/package.sh
@@ -14,7 +14,7 @@ configure() {
    run sh -c "cd ../host-build && ../source/configure && make ${makeopts[*]}"
    target_env
    run ./configure \
-        --host="${SERENITY_ARCH}-pc-serenity" \
+        --host="${SERENITY_ARCH}-serenity" \
        --with-cross-build="$(pwd)/${workdir}/../host-build"
 }

--- a/Ports/libksba/package.sh
+++ b/Ports/libksba/package.sh
@@ -19,7 +19,7 @@ pre_configure() {

 configure() {
    run ./configure \
-        --host="${SERENITY_ARCH}-pc-serenity" \
+        --host="${SERENITY_ARCH}-serenity" \
        --build="$("${workdir}/build-aux/config.guess")" \
        --with-libgpg-error-prefix="${SERENITY_INSTALL_ROOT}/usr/local" \
        --with-sysroot="${SERENITY_INSTALL_ROOT}"
--- a/Ports/lxt/package.sh
+++ b/Ports/lxt/package.sh
@@ -14,5 +14,5 @@ configure() {
    export ac_cv_func_fnmatch_works=yes
    export ac_cv_func_malloc_0_nonnull=yes
    export ac_cv_func_realloc_0_nonnull=yes
-    run ./configure --host=x86_64-pc-serenity
+    run ./configure --host=x86_64-serenity
 }
--- a/Ports/npth/package.sh
+++ b/Ports/npth/package.sh
@@ -9,5 +9,5 @@ files=(
 )

 configure() {
-    run ./configure --host="${SERENITY_ARCH}-pc-serenity" --build="$($workdir/build-aux/config.guess)" "${configopts[@]}"
+    run ./configure --host="${SERENITY_ARCH}-serenity" --build="$($workdir/build-aux/config.guess)" "${configopts[@]}"
 }
--- a/Ports/ntbtls/package.sh
+++ b/Ports/ntbtls/package.sh
@@ -22,7 +22,7 @@ pre_configure() {

 configure() {
    run ./configure \
-        --host="${SERENITY_ARCH}-pc-serenity" \
+        --host="${SERENITY_ARCH}-serenity" \
        --build="$("${workdir}/build-aux/config.guess")" \
        --with-libgcrypt-prefix="${SERENITY_INSTALL_ROOT}/usr/local" \
        --with-libgpg-error-prefix="${SERENITY_INSTALL_ROOT}/usr/local" \
--- a/Ports/perl5/package.sh
+++ b/Ports/perl5/package.sh
@@ -9,7 +9,7 @@ files=(
 )
 configopts=(
    '-Dosname=serenity'
-    "--target=${SERENITY_ARCH}-pc-serenity"
+    "--target=${SERENITY_ARCH}-serenity"
    "--targetarch=${SERENITY_ARCH}"
    "--build=$(cc -dumpmachine)"
    "--buildarch=$(uname -m)"
--- a/Ports/python3/package.sh
+++ b/Ports/python3/package.sh
@@ -41,7 +41,7 @@ configopts=(
 export BLDSHARED="${CC} -shared"

 configure() {
-    run ./configure --host="${SERENITY_ARCH}-pc-serenity" "--with-build-python=${PYTHON_BIN}" --build="$($workdir/config.guess)" "${configopts[@]}"
+    run ./configure --host="${SERENITY_ARCH}-serenity" "--with-build-python=${PYTHON_BIN}" --build="$($workdir/config.guess)" "${configopts[@]}"
 }

 # Note: The showproperty command is used when linting ports, we don't actually need python at this time.