From 25967063659719b2c6979fb5fb774382873d2dba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi>
Date: Fri, 12 Dec 2014 11:03:26 +0200
Subject: main/binutils: revert to ld.bfd as default

ref #3616 - Seems gold produces invalid libstdc++ for x86, and cannot
be yet enabled as default linker.

Keep building it, and split it to a separate package.
---
 main/binutils/APKBUILD | 27 +++++++++++++++++++--------
 1 file changed, 19 insertions(+), 8 deletions(-)

(limited to 'main')

diff --git a/main/binutils/APKBUILD b/main/binutils/APKBUILD
index 8f6e6ddb8b..f410b94512 100644
--- a/main/binutils/APKBUILD
+++ b/main/binutils/APKBUILD
@@ -1,14 +1,14 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=binutils
 pkgver=2.24
-pkgrel=4
+pkgrel=5
 pkgdesc="Tools necessary to build programs"
 url="http://www.gnu.org/software/binutils/"
 depends=""
 makedepends="bison flex texinfo zlib-dev"
 arch="all"
 license="GPL2 GPL3+ LGPL2 BSD"
-subpackages="$pkgname-doc $pkgname-libs"
+subpackages="$pkgname-doc $pkgname-libs $pkgname-gold"
 
 if [ "$CHOST" != "$CTARGET" ] && [ -n "$CHOST" -a -n "$CTARGET" ]; then
 	pkgname="$pkgname-$CTARGET"
@@ -60,8 +60,8 @@ build() {
 		--infodir=/usr/share/info \
 		--disable-multilib \
 		--enable-shared \
-		--enable-gold=default \
-		--enable-ld=yes \
+		--enable-ld=default \
+		--enable-gold=yes \
 		--enable-64-bit-bfd \
 		--enable-plugins \
 		--disable-werror \
@@ -87,10 +87,21 @@ package() {
 }
 
 libs() {
-       pkgdesc="Runtime libraries from binutils - libbfd and libopcodes"
-       replaces="binutils"
-       mkdir -p "$subpkgdir"/usr/lib
-       mv "$pkgdir"/usr/lib/lib*.so "$subpkgdir"/usr/lib/ || return 1
+	pkgdesc="Runtime libraries from binutils - libbfd and libopcodes"
+
+	mkdir -p "$subpkgdir"/usr/lib
+	mv "$pkgdir"/usr/lib/lib*.so "$subpkgdir"/usr/lib/ || return 1
+}
+
+gold() {
+	pkgdesc="GNU binutils - gold linker"
+
+	if [ -e "$pkgdir"/usr/bin/ld.gold ]; then
+		mkdir -p "$subpkgdir"/usr/bin
+		mv "$pkgdir"/usr/bin/ld.gold "$subpkgdir"/usr/bin
+	fi
+	mkdir -p "$subpkgdir"/usr/$CTARGET/bin
+	mv "$pkgdir"/usr/$CTARGET/bin/ld.gold "$subpkgdir"/usr/$CTARGET/bin/ld.gold
 }
 
 md5sums="e0f71a7b2ddab0f8612336ac81d9636b  binutils-2.24.tar.bz2
-- 
cgit v1.2.3