diff options
| author | Timo Teräs <timo.teras@iki.fi> | 2014-12-12 11:03:26 +0200 |
|---|---|---|
| committer | Timo Teräs <timo.teras@iki.fi> | 2014-12-12 11:03:26 +0200 |
| commit | 25967063659719b2c6979fb5fb774382873d2dba (patch) | |
| tree | 5aa9672392d07206b16264bb251dac05153b1ca3 | |
| parent | 21d10d3c2c3687b1475a4616ec9f341e3931f05b (diff) | |
| download | aports-25967063659719b2c6979fb5fb774382873d2dba.tar.bz2 aports-25967063659719b2c6979fb5fb774382873d2dba.tar.xz | |
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.
| -rw-r--r-- | main/binutils/APKBUILD | 27 |
1 files changed, 19 insertions, 8 deletions
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 |