From c6e854b186c4fd7a672293d7aae179a1f9142577 Mon Sep 17 00:00:00 2001 From: Oliver Smith Date: Fri, 26 Apr 2019 22:45:54 +0200 Subject: [PATCH] main/gcc{4,6}, cross/gcc{4,6}*: fix depends 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. Fixes #236. [ci:skip-build]: takes too long to build. --- cross/gcc4-aarch64/APKBUILD | 4 ++-- cross/gcc4-armhf/APKBUILD | 4 ++-- cross/gcc4-armv7/APKBUILD | 4 ++-- cross/gcc6-aarch64/APKBUILD | 4 ++-- cross/gcc6-armhf/APKBUILD | 4 ++-- cross/gcc6-armv7/APKBUILD | 4 ++-- main/gcc4/APKBUILD | 4 ++-- main/gcc6/APKBUILD | 4 ++-- 8 files changed, 16 insertions(+), 16 deletions(-) diff --git a/cross/gcc4-aarch64/APKBUILD b/cross/gcc4-aarch64/APKBUILD index d1bd84c69..97759ca50 100644 --- a/cross/gcc4-aarch64/APKBUILD +++ b/cross/gcc4-aarch64/APKBUILD @@ -25,13 +25,13 @@ _cross_configure="--disable-bootstrap --with-sysroot=/usr/$CTARGET" pkgname="gcc4-aarch64" pkgver=9999 _pkgver=4.9.2 -pkgrel=0 +pkgrel=1 pkgdesc="Stage2 cross-compiler for aarch64" url="http://gcc.gnu.org" arch="x86_64" license="GPL LGPL" _gccrel=$_pkgver-r$pkgrel -depends="isl binutils-aarch64" +depends="isl binutils-aarch64 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-aarch64 binutils-aarch64" subpackages="" diff --git a/cross/gcc4-armhf/APKBUILD b/cross/gcc4-armhf/APKBUILD index 7e2bc2f8d..1af139fae 100644 --- a/cross/gcc4-armhf/APKBUILD +++ b/cross/gcc4-armhf/APKBUILD @@ -25,13 +25,13 @@ _cross_configure="--disable-bootstrap --with-sysroot=/usr/$CTARGET" pkgname="gcc4-armhf" pkgver=9999 _pkgver=4.9.2 -pkgrel=0 +pkgrel=1 pkgdesc="Stage2 cross-compiler for armhf" 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="" diff --git a/cross/gcc4-armv7/APKBUILD b/cross/gcc4-armv7/APKBUILD index ca4e14024..710efc43c 100644 --- a/cross/gcc4-armv7/APKBUILD +++ b/cross/gcc4-armv7/APKBUILD @@ -25,13 +25,13 @@ _cross_configure="--disable-bootstrap --with-sysroot=/usr/$CTARGET" pkgname="gcc4-armv7" pkgver=9999 _pkgver=4.9.2 -pkgrel=0 +pkgrel=1 pkgdesc="Stage2 cross-compiler for armv7" url="http://gcc.gnu.org" arch="x86_64" license="GPL LGPL" _gccrel=$_pkgver-r$pkgrel -depends="isl binutils-armv7" +depends="isl binutils-armv7 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-armv7 binutils-armv7" subpackages="" diff --git a/cross/gcc6-aarch64/APKBUILD b/cross/gcc6-aarch64/APKBUILD index 5da5ad866..f02f52a43 100644 --- a/cross/gcc6-aarch64/APKBUILD +++ b/cross/gcc6-aarch64/APKBUILD @@ -25,13 +25,13 @@ _cross_configure="--disable-bootstrap --with-sysroot=/usr/$CTARGET" pkgname="gcc6-aarch64" pkgver=9999 _pkgver=6.4.0 -pkgrel=5 +pkgrel=6 pkgdesc="Stage2 cross-compiler for aarch64" url="http://gcc.gnu.org" arch="x86_64" license="GPL LGPL" _gccrel=$_pkgver-r$pkgrel -depends="isl binutils-aarch64" +depends="isl binutils-aarch64 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-aarch64 binutils-aarch64" subpackages="" diff --git a/cross/gcc6-armhf/APKBUILD b/cross/gcc6-armhf/APKBUILD index bc970615e..06480b684 100644 --- a/cross/gcc6-armhf/APKBUILD +++ b/cross/gcc6-armhf/APKBUILD @@ -25,13 +25,13 @@ _cross_configure="--disable-bootstrap --with-sysroot=/usr/$CTARGET" pkgname="gcc6-armhf" pkgver=9999 _pkgver=6.4.0 -pkgrel=5 +pkgrel=6 pkgdesc="Stage2 cross-compiler for armhf" 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="" diff --git a/cross/gcc6-armv7/APKBUILD b/cross/gcc6-armv7/APKBUILD index a2d2a37fa..b87ad032e 100644 --- a/cross/gcc6-armv7/APKBUILD +++ b/cross/gcc6-armv7/APKBUILD @@ -25,13 +25,13 @@ _cross_configure="--disable-bootstrap --with-sysroot=/usr/$CTARGET" pkgname="gcc6-armv7" pkgver=9999 _pkgver=6.4.0 -pkgrel=5 +pkgrel=6 pkgdesc="Stage2 cross-compiler for armv7" url="http://gcc.gnu.org" arch="x86_64" license="GPL LGPL" _gccrel=$_pkgver-r$pkgrel -depends="isl binutils-armv7" +depends="isl binutils-armv7 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-armv7 binutils-armv7" subpackages="" diff --git a/main/gcc4/APKBUILD b/main/gcc4/APKBUILD index 3bb8a9a5a..a3b756e88 100644 --- a/main/gcc4/APKBUILD +++ b/main/gcc4/APKBUILD @@ -1,13 +1,13 @@ pkgname=gcc4 pkgver=9999 _pkgver=4.9.2 -pkgrel=0 +pkgrel=1 pkgdesc="Old GCC for old vendor kernels (C compiler only)" url="http://gcc.gnu.org" arch="all" license="GPL LGPL" _gccrel=$_pkgver-r$pkgrel -depends="binutils isl" +depends="binutils isl 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" subpackages=" " diff --git a/main/gcc6/APKBUILD b/main/gcc6/APKBUILD index 0183df941..5bd630936 100644 --- a/main/gcc6/APKBUILD +++ b/main/gcc6/APKBUILD @@ -1,13 +1,13 @@ pkgname=gcc6 pkgver=9999 _pkgver=6.4.0 -pkgrel=5 +pkgrel=6 pkgdesc="Old GCC for old vendor kernels (C compiler only)" url="http://gcc.gnu.org" arch="all" license="GPL LGPL" _gccrel=$_pkgver-r$pkgrel -depends="binutils isl" +depends="binutils isl 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" subpackages=" "