From a4733e94e115d2e3e842fe026c1495cb6c79cf72 Mon Sep 17 00:00:00 2001 From: Oliver Smith Date: Sun, 21 Apr 2019 21:49:50 +0200 Subject: [PATCH] pmbootstrap aportgen gcc{,4,6}*: fix depends (!1778) Explicitly depend on mpc1. Our generated gcc aports use the !tracedeps option, so we need to explicitly set the libraries it depends on. This has mostly not been an issue, as we are installing our gcc packages together with Alpine's gcc package, which causes the libraries to get installed anyway. Related: pmaports#236 --- pmb/aportgen/gcc.py | 2 +- test/testdata/aportgen/pmaports/cross/gcc-armhf/APKBUILD | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pmb/aportgen/gcc.py b/pmb/aportgen/gcc.py index e07e0260..ac94d383 100644 --- a/pmb/aportgen/gcc.py +++ b/pmb/aportgen/gcc.py @@ -45,7 +45,7 @@ def generate(args, pkgname): "pkgname": pkgname, "pkgdesc": "Stage2 cross-compiler for " + arch, "arch": "x86_64", - "depends": "isl binutils-" + arch, + "depends": "isl binutils-" + arch + " mpc1", "makedepends_build": "gcc g++ paxmark bison flex texinfo gawk zip gmp-dev mpfr-dev mpc1-dev zlib-dev", "makedepends_host": "linux-headers gmp-dev mpfr-dev mpc1-dev isl-dev zlib-dev musl-dev-" + arch + " binutils-" + arch, "subpackages": "g++-" + arch + ":gpp" if prefix == "gcc" else "", diff --git a/test/testdata/aportgen/pmaports/cross/gcc-armhf/APKBUILD b/test/testdata/aportgen/pmaports/cross/gcc-armhf/APKBUILD index c66e76da..f59f428c 100644 --- a/test/testdata/aportgen/pmaports/cross/gcc-armhf/APKBUILD +++ b/test/testdata/aportgen/pmaports/cross/gcc-armhf/APKBUILD @@ -35,7 +35,7 @@ url="http://gcc.gnu.org" arch="x86_64" license="GPL LGPL" _gccrel=$pkgver-r$pkgrel -depends="isl binutils-armhf" +depends="isl binutils-armhf mpc1" makedepends_build="gcc g++ paxmark bison flex texinfo gawk zip gmp-dev mpfr-dev mpc1-dev zlib-dev" makedepends_host="linux-headers gmp-dev mpfr-dev mpc1-dev isl-dev zlib-dev musl-dev-armhf binutils-armhf" subpackages="g++-armhf:gpp"