From 97dbb45a3db07cc2c5d7a62b184541b4b9f9ec2b Mon Sep 17 00:00:00 2001 From: Robert Eckelmann Date: Sun, 11 May 2025 14:01:00 +0900 Subject: [PATCH] cross/gcc-*: fix building this reverts the change of removing !tracedeps from 42a507315bbbb175474d25cf41412389b82b7195 With that the building of these packages should work again Signed-off-by: Robert Eckelmann [ci:skip-vercheck] Signed-off-by: Robert Eckelmann Part-of: https://gitlab.postmarketos.org/postmarketOS/pmaports/-/merge_requests/6489 --- cross/gcc-aarch64/APKBUILD | 2 +- cross/gcc-armhf/APKBUILD | 2 +- cross/gcc-armv7/APKBUILD | 2 +- cross/gcc-riscv64/APKBUILD | 2 +- cross/gcc-x86/APKBUILD | 2 +- cross/gcc-x86_64/APKBUILD | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/cross/gcc-aarch64/APKBUILD b/cross/gcc-aarch64/APKBUILD index c82b99a39..a0e19d0c5 100644 --- a/cross/gcc-aarch64/APKBUILD +++ b/cross/gcc-aarch64/APKBUILD @@ -46,7 +46,7 @@ makedepends_host="linux-headers gmp-dev mpfr-dev mpc1-dev isl-dev zlib-dev musl- subpackages="g++-aarch64:gpp libstdc++-dev-aarch64:libcxx_dev" [ "$CHOST" = "$CTARGET" ] && subpackages="gcc-gdb gcc-doc" replaces="libstdc++ binutils" -options="!strip" +options="!strip !tracedeps" : "${LANG_CXX:=true}" : "${LANG_D:=true}" diff --git a/cross/gcc-armhf/APKBUILD b/cross/gcc-armhf/APKBUILD index 34d014b1c..669ad0986 100644 --- a/cross/gcc-armhf/APKBUILD +++ b/cross/gcc-armhf/APKBUILD @@ -46,7 +46,7 @@ makedepends_host="linux-headers gmp-dev mpfr-dev mpc1-dev isl-dev zlib-dev musl- subpackages="g++-armhf:gpp libstdc++-dev-armhf:libcxx_dev" [ "$CHOST" = "$CTARGET" ] && subpackages="gcc-gdb gcc-doc" replaces="libstdc++ binutils" -options="!strip" +options="!strip !tracedeps" : "${LANG_CXX:=true}" : "${LANG_D:=true}" diff --git a/cross/gcc-armv7/APKBUILD b/cross/gcc-armv7/APKBUILD index 39bbed32c..744f278a4 100644 --- a/cross/gcc-armv7/APKBUILD +++ b/cross/gcc-armv7/APKBUILD @@ -46,7 +46,7 @@ makedepends_host="linux-headers gmp-dev mpfr-dev mpc1-dev isl-dev zlib-dev musl- subpackages="g++-armv7:gpp libstdc++-dev-armv7:libcxx_dev" [ "$CHOST" = "$CTARGET" ] && subpackages="gcc-gdb gcc-doc" replaces="libstdc++ binutils" -options="!strip" +options="!strip !tracedeps" : "${LANG_CXX:=true}" : "${LANG_D:=true}" diff --git a/cross/gcc-riscv64/APKBUILD b/cross/gcc-riscv64/APKBUILD index 7914a183c..44d9d5f6c 100644 --- a/cross/gcc-riscv64/APKBUILD +++ b/cross/gcc-riscv64/APKBUILD @@ -46,7 +46,7 @@ makedepends_host="linux-headers gmp-dev mpfr-dev mpc1-dev isl-dev zlib-dev musl- subpackages="g++-riscv64:gpp libstdc++-dev-riscv64:libcxx_dev" [ "$CHOST" = "$CTARGET" ] && subpackages="gcc-gdb gcc-doc" replaces="libstdc++ binutils" -options="!strip" +options="!strip !tracedeps" : "${LANG_CXX:=true}" : "${LANG_D:=true}" diff --git a/cross/gcc-x86/APKBUILD b/cross/gcc-x86/APKBUILD index d0858a9bf..69aeeeaf0 100644 --- a/cross/gcc-x86/APKBUILD +++ b/cross/gcc-x86/APKBUILD @@ -46,7 +46,7 @@ makedepends_host="linux-headers gmp-dev mpfr-dev mpc1-dev isl-dev zlib-dev musl- subpackages="g++-x86:gpp libstdc++-dev-x86:libcxx_dev" [ "$CHOST" = "$CTARGET" ] && subpackages="gcc-gdb gcc-doc" replaces="libstdc++ binutils" -options="!strip" +options="!strip !tracedeps" : "${LANG_CXX:=true}" : "${LANG_D:=true}" diff --git a/cross/gcc-x86_64/APKBUILD b/cross/gcc-x86_64/APKBUILD index 4da8b71a5..c0a7d9061 100644 --- a/cross/gcc-x86_64/APKBUILD +++ b/cross/gcc-x86_64/APKBUILD @@ -46,7 +46,7 @@ makedepends_host="linux-headers gmp-dev mpfr-dev mpc1-dev isl-dev zlib-dev musl- subpackages="g++-x86_64:gpp libstdc++-dev-x86_64:libcxx_dev" [ "$CHOST" = "$CTARGET" ] && subpackages="gcc-gdb gcc-doc" replaces="libstdc++ binutils" -options="!strip" +options="!strip !tracedeps" : "${LANG_CXX:=true}" : "${LANG_D:=true}"