synit
/
pmbootstrap
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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
This commit is contained in:
Oliver Smith 2019-04-21 21:49:50 +02:00
parent 82fdf63711
commit a4733e94e1
No known key found for this signature in database
GPG Key ID: 5AE7F5513E0885CB
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pmb/aportgen/gcc.py
View File

@ -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 "",

2
test/testdata/aportgen/pmaports/cross/gcc-armhf/APKBUILD vendored
View File

@ -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"