From dd17dc5c0675ca7b2c222d97043646aed0b20182 Mon Sep 17 00:00:00 2001
From: Oliver Smith <ollieparanoid@bitmessage.ch>
Date: Mon, 1 Oct 2018 18:16:47 +0200
Subject: [PATCH] */gcc6*: properly regenerate aports with aportgen

I did it manually in the previous commit and replaced the wrong for
loop in gcc6-armhf. [skip ci]
---
 cross/gcc6-aarch64/APKBUILD | 2 +-
 cross/gcc6-armhf/APKBUILD   | 8 ++++----
 cross/gcc6-x86_64/APKBUILD  | 2 +-
 main/gcc6/APKBUILD          | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/cross/gcc6-aarch64/APKBUILD b/cross/gcc6-aarch64/APKBUILD
index e520bc48b..cf8af2f5b 100644
--- a/cross/gcc6-aarch64/APKBUILD
+++ b/cross/gcc6-aarch64/APKBUILD
@@ -24,7 +24,7 @@ _cross_configure="--disable-bootstrap --with-sysroot=/usr/$CTARGET"
 
 pkgname="gcc6-aarch64"
 pkgver=6.4.0
-pkgrel=4
+pkgrel=5
 pkgdesc="Stage2 cross-compiler for aarch64"
 url="http://gcc.gnu.org"
 arch="armhf x86_64 x86"
diff --git a/cross/gcc6-armhf/APKBUILD b/cross/gcc6-armhf/APKBUILD
index ec9ed1953..4b3bdd43f 100644
--- a/cross/gcc6-armhf/APKBUILD
+++ b/cross/gcc6-armhf/APKBUILD
@@ -24,7 +24,7 @@ _cross_configure="--disable-bootstrap --with-sysroot=/usr/$CTARGET"
 
 pkgname="gcc6-armhf"
 pkgver=6.4.0
-pkgrel=4
+pkgrel=5
 pkgdesc="Stage2 cross-compiler for armhf"
 url="http://gcc.gnu.org"
 arch="aarch64 x86_64 x86"
@@ -413,8 +413,7 @@ package() {
 		# failing and causes many headaches). See also: '-B' in 'man gcc'.
 		echo "Link binutils binaries to /usr/gcc6"
 		mkdir -p "$pkgdir$prefix/$CTARGET/bin"
-		for i in "elfedit" "gprof" "addr2line" "strings" "as" "ld" "size" "ld.bfd" \
-			"readelf" "nm" "ar" "strip" "dwp" "objdump" "objcopy" "c++filt" "ranlib"; do
+		for i in "as" "ld"; do
 			ln -sv "/usr/$CTARGET/bin/$i" \
 				"$pkgdir$prefix/$CTARGET/bin/$i"
 		done
@@ -422,7 +421,8 @@ package() {
 		# Link binutils to gcc6-* (so 'CROSS_COMPILE=gcc6-...' works)
 		echo "Link binutils to gcc6-*"
 		mkdir -p "$pkgdir/usr/bin"
-		for i in "ld" "ar" "nm" "objcopy" "objdump"; do
+		for i in "elfedit" "gprof" "addr2line" "strings" "as" "ld" "size" "ld.bfd" \
+			"readelf" "nm" "ar" "strip" "dwp" "objdump" "objcopy" "c++filt" "ranlib"; do
 			ln -sv "/usr/bin/$CTARGET-$i" \
 				"$pkgdir/usr/bin/gcc6-$CTARGET-$i"
 		done
diff --git a/cross/gcc6-x86_64/APKBUILD b/cross/gcc6-x86_64/APKBUILD
index e9c40aa3a..7f176bf7d 100644
--- a/cross/gcc6-x86_64/APKBUILD
+++ b/cross/gcc6-x86_64/APKBUILD
@@ -24,7 +24,7 @@ _cross_configure="--disable-bootstrap --with-sysroot=/usr/$CTARGET"
 
 pkgname="gcc6-x86_64"
 pkgver=6.4.0
-pkgrel=4
+pkgrel=5
 pkgdesc="Stage2 cross-compiler for x86_64"
 url="http://gcc.gnu.org"
 arch="armhf aarch64 x86"
diff --git a/main/gcc6/APKBUILD b/main/gcc6/APKBUILD
index 2eb6efa8a..e1b45edb8 100644
--- a/main/gcc6/APKBUILD
+++ b/main/gcc6/APKBUILD
@@ -1,6 +1,6 @@
 pkgname=gcc6
 pkgver=6.4.0
-pkgrel=4
+pkgrel=5
 pkgdesc="Old GCC for old vendor kernels (C compiler only)"
 url="http://gcc.gnu.org"
 arch="all"