pmb.aportgen.gcc: set libgcc=false (MR 2203)

Do not build the foreign arch libgcc. We are using the one provided by
Alpine's binary repository instead, and when building it here and trying
to use it, we actually run into a conflict.

I tried setting BOOTSTRAP="nolibc" first since there is already logic to
then disable libgcc in the APKBUILD. But that also disables g++ which we
do want to build, so we can't use this.

Fixes: issue 2168
This commit is contained in:
Oliver Smith 2022-09-11 17:29:53 +02:00 committed by Clayton Craft
parent 4c7d2459f5
commit 22e0f64095
No known key found for this signature in database
GPG Key ID: 4A4CED6D7EDF950A
2 changed files with 4 additions and 1 deletions

View File

@ -78,6 +78,9 @@ def generate(args, pkgname):
# use CBUILDROOT as sysroot. In the original APKBUILD this is a local
# variable, but we make it a global one.
'*_cross_configure=*': None,
# Do not build foreign arch libgcc, we use the one from Alpine (#2168)
'_libgcc=true*': '_libgcc=false',
}
pmb.aportgen.core.rewrite(args, pkgname, based_on, fields,

View File

@ -53,7 +53,7 @@ replaces="libstdc++ binutils"
: "${LANG_JIT:=true}"
_libgomp=true
_libgcc=true
_libgcc=false
_libatomic=true
_libitm=true