From 550b9b3466c15c9c974150d078d14719d7246f7f Mon Sep 17 00:00:00 2001 From: Oliver Smith Date: Wed, 5 Oct 2022 19:43:10 +0200 Subject: [PATCH] pmb.aportgen.gcc: remove !tracedeps option abuild traces shared library dependencies for binaries in built packages, and adds all of them to depends. This is needed for the cross gcc builds, as otherwise it will not add the isl dependency (currently isl25). With the crossdirect compilation method we mount the cross-gcc from the native chroot in the foreign arch chroot. Due to the missing dependency, isl was not installed in the native chroot, and so when attempting to use that native cross gcc from the foreign arch chroot, it would try to load the foreign arch isl instead of the native one. Resulting in lots of the following errors (and of course not a working gcc): Error relocating /usr/lib/libisl.so.23: unsupported relocation type 1026 I had probably added '!tracedeps' because abuild complains about it otherwise... but as noted in [1] these complaints are safe to ignore. Keep !strip for now even though it's not in Alpine's APKBUILD. I've tried to build without and the build fails with: strip: Unable to recognise the format of the input file `./usr/aarch64-alpine-linux-musl/lib/libgcc_s.so.1' [1]: https://gitlab.alpinelinux.org/alpine/aports/-/commit/0415ebf6f9e5bae8338a45cc147f1b8536ef45d7 Related: pmaports issue 1732 --- pmb/aportgen/gcc.py | 4 ++-- test/testdata/aportgen/pmaports/cross/gcc-armhf/APKBUILD | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pmb/aportgen/gcc.py b/pmb/aportgen/gcc.py index 3464673c..61686260 100644 --- a/pmb/aportgen/gcc.py +++ b/pmb/aportgen/gcc.py @@ -38,7 +38,7 @@ def generate(args, pkgname): # gcc6: options is already there, so we need to replace it and not only # set it below the header like done below. - "options": "!strip !tracedeps", + "options": "!strip", "LIBGOMP": "false", "LIBGCC": "false", @@ -59,7 +59,7 @@ def generate(args, pkgname): LANG_GO=false LANG_FORTRAN=false LANG_ADA=false - options="!strip !tracedeps" + options="!strip" # abuild doesn't try to tries to install "build-base-$CTARGET_ARCH" # when this variable matches "no*" diff --git a/test/testdata/aportgen/pmaports/cross/gcc-armhf/APKBUILD b/test/testdata/aportgen/pmaports/cross/gcc-armhf/APKBUILD index 2eaf8402..8efc402e 100644 --- a/test/testdata/aportgen/pmaports/cross/gcc-armhf/APKBUILD +++ b/test/testdata/aportgen/pmaports/cross/gcc-armhf/APKBUILD @@ -10,7 +10,7 @@ LANG_JAVA=false LANG_GO=false LANG_FORTRAN=false LANG_ADA=false -options="!strip !tracedeps" +options="!strip" # abuild doesn't try to tries to install "build-base-$CTARGET_ARCH" # when this variable matches "no*"