forge/pmaports
1
0
Fork 0
Code Issues 2 Pull requests Projects Releases Packages Wiki Activity Actions

cross/gcc6-{aarch64,armhf}: regenerate with pmbootstrap

Browse source 
Run 'pmbootstrap aportgen gcc6-aarch64 gcc6-armhf' again and commit
the resulting changes, as these packages are meant to be always
auto-generated and therefore in sync with main/gcc6.

This changes the pkgver to 9999, as it was required in main/gcc6 to
avoid conflicts with Alpine's gcc6 package.
This commit is contained in:
Oliver Smith 2018-12-31 08:45:39 +01:00
parent 8d4232d1fd
commit 14cf39a836
No known key found for this signature in database
GPG key ID: 5AE7F5513E0885CB
2 changed files with 18 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
cross/gcc6-aarch64/APKBUILD
View file

@ -23,13 +23,14 @@ CBUILDROOT="/"
_cross_configure="--disable-bootstrap --with-sysroot=/usr/$CTARGET" _cross_configure="--disable-bootstrap --with-sysroot=/usr/$CTARGET"
pkgname="gcc6-aarch64" pkgname="gcc6-aarch64"
pkgver=6.4.0 pkgver=9999
_pkgver=6.4.0
pkgrel=5 pkgrel=5
pkgdesc="Stage2 cross-compiler for aarch64" pkgdesc="Stage2 cross-compiler for aarch64"
url="http://gcc.gnu.org" 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-aarch64" depends="isl binutils-aarch64"
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-aarch64 binutils-aarch64" makedepends_host="linux-headers gmp-dev mpfr-dev mpc1-dev isl-dev zlib-dev musl-dev-aarch64 binutils-aarch64"
@ -160,7 +161,7 @@ if $LANG_ADA; then
fi fi
makedepends="$makedepends_build $makedepends_host" makedepends="$makedepends_build $makedepends_host"
source="http://gcc.gnu.org/pub/gcc/releases/gcc-${_pkgbase:-$pkgver}/gcc-${_pkgbase:-$pkgver}.tar.xz source="http://gcc.gnu.org/pub/gcc/releases/gcc-${_pkgbase:-$_pkgver}/gcc-${_pkgbase:-$_pkgver}.tar.xz
http://sourceware.org/pub/java/ecj-4.9.jar http://sourceware.org/pub/java/ecj-4.9.jar
001_all_default-ssp-strong.patch 001_all_default-ssp-strong.patch
@ -223,9 +224,9 @@ source="http://gcc.gnu.org/pub/gcc/releases/gcc-${_pkgbase:-$pkgver}/gcc-${_pkgb
" "
# we build out-of-tree # we build out-of-tree
_gccdir="$srcdir"/gcc-${_pkgbase:-$pkgver} _gccdir="$srcdir"/gcc-${_pkgbase:-$_pkgver}
_gcclibdir=/usr/lib/gcc/${CTARGET}/$pkgver _gcclibdir=/usr/lib/gcc/${CTARGET}/$_pkgver
_gcclibexec=/usr/libexec/gcc/${CTARGET}/$pkgver _gcclibexec=/usr/libexec/gcc/${CTARGET}/$_pkgver
prepare() { prepare() {
cd "$_gccdir" cd "$_gccdir"
@ -251,7 +252,7 @@ prepare() {
# see http://gcc.gnu.org/ml/java/2008-04/msg00027.html # see http://gcc.gnu.org/ml/java/2008-04/msg00027.html
mv "$srcdir"/ecj-*.jar ecj.jar mv "$srcdir"/ecj-*.jar ecj.jar
echo ${pkgver} > gcc/BASE-VER echo ${_pkgver} > gcc/BASE-VER
} }
build() { build() {
@ -328,7 +329,7 @@ build() {
--build=${CBUILD} \ --build=${CBUILD} \
--host=${CHOST} \ --host=${CHOST} \
--target=${CTARGET} \ --target=${CTARGET} \
--with-pkgversion="postmarketOS ${pkgver}" \ --with-pkgversion="postmarketOS ${_pkgver}" \
--enable-checking=release \ --enable-checking=release \
--disable-fixed-point \ --disable-fixed-point \
--disable-libstdcxx-pch \ --disable-libstdcxx-pch \

17
cross/gcc6-armhf/APKBUILD
View file

@ -23,13 +23,14 @@ CBUILDROOT="/"
_cross_configure="--disable-bootstrap --with-sysroot=/usr/$CTARGET" _cross_configure="--disable-bootstrap --with-sysroot=/usr/$CTARGET"
pkgname="gcc6-armhf" pkgname="gcc6-armhf"
pkgver=6.4.0 pkgver=9999
_pkgver=6.4.0
pkgrel=5 pkgrel=5
pkgdesc="Stage2 cross-compiler for armhf" pkgdesc="Stage2 cross-compiler for armhf"
url="http://gcc.gnu.org" 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"
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"
@ -160,7 +161,7 @@ if $LANG_ADA; then
fi fi
makedepends="$makedepends_build $makedepends_host" makedepends="$makedepends_build $makedepends_host"
source="http://gcc.gnu.org/pub/gcc/releases/gcc-${_pkgbase:-$pkgver}/gcc-${_pkgbase:-$pkgver}.tar.xz source="http://gcc.gnu.org/pub/gcc/releases/gcc-${_pkgbase:-$_pkgver}/gcc-${_pkgbase:-$_pkgver}.tar.xz
http://sourceware.org/pub/java/ecj-4.9.jar http://sourceware.org/pub/java/ecj-4.9.jar
001_all_default-ssp-strong.patch 001_all_default-ssp-strong.patch
@ -223,9 +224,9 @@ source="http://gcc.gnu.org/pub/gcc/releases/gcc-${_pkgbase:-$pkgver}/gcc-${_pkgb
" "
# we build out-of-tree # we build out-of-tree
_gccdir="$srcdir"/gcc-${_pkgbase:-$pkgver} _gccdir="$srcdir"/gcc-${_pkgbase:-$_pkgver}
_gcclibdir=/usr/lib/gcc/${CTARGET}/$pkgver _gcclibdir=/usr/lib/gcc/${CTARGET}/$_pkgver
_gcclibexec=/usr/libexec/gcc/${CTARGET}/$pkgver _gcclibexec=/usr/libexec/gcc/${CTARGET}/$_pkgver
prepare() { prepare() {
cd "$_gccdir" cd "$_gccdir"
@ -251,7 +252,7 @@ prepare() {
# see http://gcc.gnu.org/ml/java/2008-04/msg00027.html # see http://gcc.gnu.org/ml/java/2008-04/msg00027.html
mv "$srcdir"/ecj-*.jar ecj.jar mv "$srcdir"/ecj-*.jar ecj.jar
echo ${pkgver} > gcc/BASE-VER echo ${_pkgver} > gcc/BASE-VER
} }
build() { build() {
@ -328,7 +329,7 @@ build() {
--build=${CBUILD} \ --build=${CBUILD} \
--host=${CHOST} \ --host=${CHOST} \
--target=${CTARGET} \ --target=${CTARGET} \
--with-pkgversion="postmarketOS ${pkgver}" \ --with-pkgversion="postmarketOS ${_pkgver}" \
--enable-checking=release \ --enable-checking=release \
--disable-fixed-point \ --disable-fixed-point \
--disable-libstdcxx-pch \ --disable-libstdcxx-pch \