Update CMake and Autotools toolchains

Author: Kartatz

.github/workflows/build.yml

@@ -104,12 +104,6 @@ jobs:
           'x86_64-unknown-netbsd',
           'aarch64-unknown-netbsd',
 
-          # OpenBSD
-          'x86_64-unknown-openbsd',
-          'i386-unknown-openbsd',
-          'aarch64-unknown-openbsd',
-          'arm-unknown-openbsd',
-          
           # DragonFly BSD
           'x86_64-unknown-dragonfly',
 
@@ -200,18 +194,6 @@ jobs:
             export PATH="${DAKINI_HOME}/bin:${PATH}"
             
             source "${DAKINI_HOME}/usr/local/share/dakini/autotools/${{ matrix.target }}.sh"
-        elif [[ '${{ matrix.target }}' == *'-openbsd'* ]]; then
-            declare -r ATAR_TAG="$(jq --raw-output '.tag_name' <<< "$(curl --connect-timeout '10' --retry '15' --retry-all-errors --fail --silent --url 'https://api.github.com/repos/AmanoTeam/Atar/releases/latest')")"
-            declare -r ATAR_TARBALL='/tmp/toolchain.tar.xz'
-            declare -r ATAR_URL="https://github.com/AmanoTeam/Atar/releases/download/${ATAR_TAG}/x86_64-unknown-linux-gnu.tar.xz"
-            
-            curl --connect-timeout '10' --retry '15' --retry-all-errors --fail --silent --location --url "${ATAR_URL}" --output "${ATAR_TARBALL}"
-            tar --directory="$(dirname "${ATAR_TARBALL}")" --extract --file="${ATAR_TARBALL}"
-            
-            export ATAR_HOME='/tmp/atar'
-            export PATH="${ATAR_HOME}/bin:${PATH}"
-            
-            source "${ATAR_HOME}/usr/local/share/atar/autotools/${{ matrix.target }}.sh"
         elif [[ '${{ matrix.target }}' == *'-dragonfly' ]]; then
             # declare -r VENTI_TAG="$(jq --raw-output '.tag_name' <<< "$(curl --connect-timeout '10' --retry '15' --retry-all-errors --fail --silent --url 'https://api.github.com/repos/AmanoTeam/Venti/releases/latest')")"
             # declare -r VENTI_TARBALL='/tmp/toolchain.tar.xz'

build.sh

@@ -275,8 +275,6 @@ if ! [ -f "${gcc_tarball}" ]; then
 	patch --directory="${gcc_directory}" --strip='1' --input="${workdir}/submodules/obggcc/patches/0005-Turn-Wint-conversion-back-into-an-warning.patch"
 	patch --directory="${gcc_directory}" --strip='1' --input="${workdir}/submodules/obggcc/patches/gcc-15/0006-Turn-Wincompatible-pointer-types-back-into-an-warning.patch"
 	patch --directory="${gcc_directory}" --strip='1' --input="${workdir}/submodules/obggcc/patches/0007-Add-relative-RPATHs-to-GCC-host-tools.patch"
-	patch --directory="${gcc_directory}" --strip='1' --input="${workdir}/submodules/obggcc/patches/0008-Add-ARM-and-ARM64-drivers-to-OpenBSD-host-tools.patch"
-	patch --directory="${gcc_directory}" --strip='1' --input="${workdir}/submodules/obggcc/patches/0009-Fix-missing-stdint.h-include-when-compiling-host-tools-on-OpenBSD.patch"
 fi
 
 # Follow Debian's approach to remove hardcoded RPATHs from binaries
@@ -300,15 +298,6 @@ sed \
 	"${mpfr_directory}/configure" \
 	"${gmp_directory}/configure"
 
-# Fix Autotools mistakenly detecting shared libraries as not supported on OpenBSD
-while read file; do
-	sed \
-		--in-place \
-		--regexp-extended \
-		's|test -f /usr/libexec/ld.so|true|g' \
-		"${file}"
-done <<< "$(find '/tmp' -type 'f' -name 'configure')"
-
 # Force GCC and binutils to prefix host tools with the target triplet even in native builds
 sed \
 	--in-place \

submodules/obggcc

@@ -0,0 +1,21 @@
+#/bin/bash
+
+unset \
+	CROSS_COMPILE_TRIPLET \
+	CROSS_COMPILE_SYSTEM \
+	CROSS_COMPILE_ARCHITECTURE \
+	CROSS_COMPILE_SYSROOT \
+	CMAKE_TOOLCHAIN_FILE \
+	CC \
+	CXX \
+	AR \
+	AS \
+	LD \
+	NM \
+	RANLIB \
+	STRIP \
+	OBJCOPY \
+	OBJDUMP \
+	READELF \
+	PKG_CONFIG \
+	YASM

tools/dev/autotools/deactivate.sh

@@ -1,9 +1,12 @@
 #/bin/bash
 
+kopt="${-}"
+
+set +u
 set -e
 
 if [ -z "${VENTI_HOME}" ]; then
-	VENTI_HOME="$(realpath "$(dirname "${0}")")/../../../../.."
+	VENTI_HOME="$(realpath "$(( [ -n "${BASH_SOURCE}" ] && dirname "$(realpath "${BASH_SOURCE[0]}")" ) || dirname "$(realpath "${0}")")""/../../../../..")"
 fi
 
 set -u
@@ -13,6 +16,8 @@ CROSS_COMPILE_ARCHITECTURE='x86_64'
 CROSS_COMPILE_TRIPLET="${CROSS_COMPILE_ARCHITECTURE}-unknown-${CROSS_COMPILE_SYSTEM}"
 CROSS_COMPILE_SYSROOT="${VENTI_HOME}/${CROSS_COMPILE_TRIPLET}"
 
+CMAKE_TOOLCHAIN_FILE="${VENTI_HOME}/build/cmake/${CROSS_COMPILE_TRIPLET}.cmake"
+
 CC="${VENTI_HOME}/bin/${CROSS_COMPILE_TRIPLET}-gcc"
 CXX="${VENTI_HOME}/bin/${CROSS_COMPILE_TRIPLET}-g++"
 AR="${VENTI_HOME}/bin/${CROSS_COMPILE_TRIPLET}-ar"
@@ -22,13 +27,15 @@ NM="${VENTI_HOME}/bin/${CROSS_COMPILE_TRIPLET}-nm"
 RANLIB="${VENTI_HOME}/bin/${CROSS_COMPILE_TRIPLET}-ranlib"
 STRIP="${VENTI_HOME}/bin/${CROSS_COMPILE_TRIPLET}-strip"
 OBJCOPY="${VENTI_HOME}/bin/${CROSS_COMPILE_TRIPLET}-objcopy"
+OBJDUMP="${VENTI_HOME}/bin/${CROSS_COMPILE_TRIPLET}-objdump"
 READELF="${VENTI_HOME}/bin/${CROSS_COMPILE_TRIPLET}-readelf"
 
 export \
 	CROSS_COMPILE_TRIPLET \
 	CROSS_COMPILE_SYSTEM \
 	CROSS_COMPILE_ARCHITECTURE \
 	CROSS_COMPILE_SYSROOT \
+	CMAKE_TOOLCHAIN_FILE \
 	CC \
 	CXX \
 	AR \
@@ -38,6 +45,8 @@ export \
 	RANLIB \
 	STRIP \
 	OBJCOPY \
+	OBJDUMP \
 	READELF
 
-set +eu
+[[ "${kopt}" = *e*  ]] || set +e
+[[ "${kopt}" = *u*  ]] || set +u

tools/dev/autotools/x86_64-unknown-dragonfly.sh

@@ -16,6 +16,7 @@ set(CMAKE_AR "${TOOLCHAIN_PATH}/bin/${TOOLCHAIN_PREFIX}-ar" CACHE FILEPATH "ar")
 set(CMAKE_RANLIB "${TOOLCHAIN_PATH}/bin/${TOOLCHAIN_PREFIX}-ranlib" CACHE FILEPATH "ranlib")
 set(CMAKE_STRIP "${TOOLCHAIN_PATH}/bin/${TOOLCHAIN_PREFIX}-strip" CACHE FILEPATH "strip")
 set(CMAKE_OBJCOPY "${TOOLCHAIN_PATH}/bin/${TOOLCHAIN_PREFIX}-objcopy" CACHE FILEPATH "objcopy")
+set(CMAKE_OBJDUMP "${TOOLCHAIN_PATH}/bin/${TOOLCHAIN_PREFIX}-objdump" CACHE FILEPATH "objdump")
 set(CMAKE_NM "${TOOLCHAIN_PATH}/bin/${TOOLCHAIN_PREFIX}-nm" CACHE FILEPATH "nm")
 
 set(PKG_CONFIG_EXECUTABLE "" CACHE FILEPATH "pkg-config")