From 0cae49b26f611d5ef22203945bd39be983af1ac2 Mon Sep 17 00:00:00 2001 From: Oliver Smith Date: Wed, 11 Sep 2019 19:00:28 +0200 Subject: [PATCH] cross/gcc-*: bump pkgrel Make the version match Alpine's gcc again. Fixes libstdc++ unsatisfiable constrains related error messages (because the libstdc++ generated by these cross-* packages has the same pkgver and pkgrel again as the one provided by Alpine's gcc package). [ci:skip-build]: won't finish in time The upstream compat test case will still fail after this, there are more issues that need to be resolved. I'm on it. --- cross/gcc-aarch64/APKBUILD | 2 +- cross/gcc-armhf/APKBUILD | 2 +- cross/gcc-armv7/APKBUILD | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cross/gcc-aarch64/APKBUILD b/cross/gcc-aarch64/APKBUILD index 19bd0cf7c..a1b904c34 100644 --- a/cross/gcc-aarch64/APKBUILD +++ b/cross/gcc-aarch64/APKBUILD @@ -29,7 +29,7 @@ pkgver=8.3.0 [ "$CHOST" != "$CTARGET" ] && _target="-$CTARGET_ARCH" || _target="" pkgname="gcc-aarch64" -pkgrel=0 +pkgrel=1 pkgdesc="Stage2 cross-compiler for aarch64" url="http://gcc.gnu.org" arch="x86_64" diff --git a/cross/gcc-armhf/APKBUILD b/cross/gcc-armhf/APKBUILD index e55b95ed5..d5da0acf1 100644 --- a/cross/gcc-armhf/APKBUILD +++ b/cross/gcc-armhf/APKBUILD @@ -29,7 +29,7 @@ pkgver=8.3.0 [ "$CHOST" != "$CTARGET" ] && _target="-$CTARGET_ARCH" || _target="" pkgname="gcc-armhf" -pkgrel=0 +pkgrel=1 pkgdesc="Stage2 cross-compiler for armhf" url="http://gcc.gnu.org" arch="x86_64" diff --git a/cross/gcc-armv7/APKBUILD b/cross/gcc-armv7/APKBUILD index 77676e119..82fdf684f 100644 --- a/cross/gcc-armv7/APKBUILD +++ b/cross/gcc-armv7/APKBUILD @@ -29,7 +29,7 @@ pkgver=8.3.0 [ "$CHOST" != "$CTARGET" ] && _target="-$CTARGET_ARCH" || _target="" pkgname="gcc-armv7" -pkgrel=0 +pkgrel=1 pkgdesc="Stage2 cross-compiler for armv7" url="http://gcc.gnu.org" arch="x86_64"