diff options
| -rw-r--r-- | main/binutils/APKBUILD | 22 |
1 files changed, 5 insertions, 17 deletions
diff --git a/main/binutils/APKBUILD b/main/binutils/APKBUILD index c0019147ff..8af895f51c 100644 --- a/main/binutils/APKBUILD +++ b/main/binutils/APKBUILD @@ -10,8 +10,8 @@ arch="all" license="GPL2 GPL3+ LGPL2 BSD" subpackages="$pkgname-dev $pkgname-doc $pkgname-libs $pkgname-gold" -if [ "$CHOST" != "$CTARGET" ] && [ -n "$CHOST" -a -n "$CTARGET" ]; then - pkgname="$pkgname-$CTARGET" +if [ "$CHOST" != "$CTARGET" ]; then + pkgname="$pkgname-$CTARGET_ARCH" subpackages="" sonameprefix="$pkgname:" fi @@ -21,19 +21,7 @@ source="http://ftp.gnu.org/gnu/binutils/binutils-$pkgver.tar.bz2 hash-style-gnu.patch " -_builddir="$srcdir/binutils-$pkgver" -prepare() { - local i - cd "$_builddir" - for i in $source; do - case $i in - *.patch|*.diff) - msg "Applying $i..." - patch -p1 -i "$srcdir"/$i || return 1 - ;; - esac - done -} +builddir="$srcdir/binutils-$pkgver" build() { local _sysroot=/ @@ -44,7 +32,7 @@ build() { _cross_configure="--disable-install-libiberty" fi - cd "$_builddir" + cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -68,7 +56,7 @@ build() { } package() { - cd "$_builddir" + cd "$builddir" make install DESTDIR="$pkgdir" || return 1 if [ -d "$pkgdir"/usr/lib64 ]; then mv "$pkgdir"/usr/lib64/* "$pkgdir"/usr/lib/ |