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:
parent
82fdf63711
commit
a4733e94e1
|
@ -45,7 +45,7 @@ def generate(args, pkgname):
|
||||||
"pkgname": pkgname,
|
"pkgname": pkgname,
|
||||||
"pkgdesc": "Stage2 cross-compiler for " + arch,
|
"pkgdesc": "Stage2 cross-compiler for " + arch,
|
||||||
"arch": "x86_64",
|
"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_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,
|
"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 "",
|
"subpackages": "g++-" + arch + ":gpp" if prefix == "gcc" else "",
|
||||||
|
|
|
@ -35,7 +35,7 @@ url="http://gcc.gnu.org"
|
||||||
arch="x86_64"
|
arch="x86_64"
|
||||||
license="GPL LGPL"
|
license="GPL LGPL"
|
||||||
_gccrel=$pkgver-r$pkgrel
|
_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_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"
|
makedepends_host="linux-headers gmp-dev mpfr-dev mpc1-dev isl-dev zlib-dev musl-dev-armhf binutils-armhf"
|
||||||
subpackages="g++-armhf:gpp"
|
subpackages="g++-armhf:gpp"
|
||||||
|
|
Loading…
Reference in New Issue