From 984476227fbf24ccdf1f0d7cb6438f0b77691505 Mon Sep 17 00:00:00 2001 From: Oliver Smith Date: Mon, 31 Dec 2018 08:53:12 +0100 Subject: [PATCH] cross/binutils-*: regenerate with pmbootstrap Changes spaces to tabs in the APKBUILDs, thanks to this fix: https://gitlab.com/postmarketOS/pmbootstrap/merge_requests/1734 Alpine uses tabs in almost all their APKBUILDs, so we should do it the same way. [skip ci]. --- cross/binutils-aarch64/APKBUILD | 40 ++++++++++++++++----------------- cross/binutils-armhf/APKBUILD | 40 ++++++++++++++++----------------- cross/binutils-armv7/APKBUILD | 40 ++++++++++++++++----------------- 3 files changed, 60 insertions(+), 60 deletions(-) diff --git a/cross/binutils-aarch64/APKBUILD b/cross/binutils-aarch64/APKBUILD index 766c36d29..0f6024898 100644 --- a/cross/binutils-aarch64/APKBUILD +++ b/cross/binutils-aarch64/APKBUILD @@ -35,30 +35,30 @@ fi # - CVE-2017-7614 build() { - _target="$(arch_to_hostspec aarch64)" - cd "$builddir" - "$builddir"/configure \ - --build="$CBUILD" \ - --target=$_target \ - --with-lib-path=/usr/lib \ - --prefix=/usr \ - --with-sysroot=/usr/$_target \ - --enable-ld=default \ - --enable-gold=yes \ - --enable-plugins \ - --enable-deterministic-archives \ - --disable-multilib \ - --disable-werror \ - --disable-nls - make + _target="$(arch_to_hostspec aarch64)" + cd "$builddir" + "$builddir"/configure \ + --build="$CBUILD" \ + --target=$_target \ + --with-lib-path=/usr/lib \ + --prefix=/usr \ + --with-sysroot=/usr/$_target \ + --enable-ld=default \ + --enable-gold=yes \ + --enable-plugins \ + --enable-deterministic-archives \ + --disable-multilib \ + --disable-werror \ + --disable-nls + make } package() { - cd "$builddir" - make install DESTDIR="$pkgdir" + cd "$builddir" + make install DESTDIR="$pkgdir" - # remove man, info folders - rm -rf "$pkgdir"/usr/share + # remove man, info folders + rm -rf "$pkgdir"/usr/share } diff --git a/cross/binutils-armhf/APKBUILD b/cross/binutils-armhf/APKBUILD index f567a3095..887e2dcc2 100644 --- a/cross/binutils-armhf/APKBUILD +++ b/cross/binutils-armhf/APKBUILD @@ -35,30 +35,30 @@ fi # - CVE-2017-7614 build() { - _target="$(arch_to_hostspec armhf)" - cd "$builddir" - "$builddir"/configure \ - --build="$CBUILD" \ - --target=$_target \ - --with-lib-path=/usr/lib \ - --prefix=/usr \ - --with-sysroot=/usr/$_target \ - --enable-ld=default \ - --enable-gold=yes \ - --enable-plugins \ - --enable-deterministic-archives \ - --disable-multilib \ - --disable-werror \ - --disable-nls - make + _target="$(arch_to_hostspec armhf)" + cd "$builddir" + "$builddir"/configure \ + --build="$CBUILD" \ + --target=$_target \ + --with-lib-path=/usr/lib \ + --prefix=/usr \ + --with-sysroot=/usr/$_target \ + --enable-ld=default \ + --enable-gold=yes \ + --enable-plugins \ + --enable-deterministic-archives \ + --disable-multilib \ + --disable-werror \ + --disable-nls + make } package() { - cd "$builddir" - make install DESTDIR="$pkgdir" + cd "$builddir" + make install DESTDIR="$pkgdir" - # remove man, info folders - rm -rf "$pkgdir"/usr/share + # remove man, info folders + rm -rf "$pkgdir"/usr/share } diff --git a/cross/binutils-armv7/APKBUILD b/cross/binutils-armv7/APKBUILD index d64f7ed28..0013966b0 100644 --- a/cross/binutils-armv7/APKBUILD +++ b/cross/binutils-armv7/APKBUILD @@ -35,30 +35,30 @@ fi # - CVE-2017-7614 build() { - _target="$(arch_to_hostspec armv7)" - cd "$builddir" - "$builddir"/configure \ - --build="$CBUILD" \ - --target=$_target \ - --with-lib-path=/usr/lib \ - --prefix=/usr \ - --with-sysroot=/usr/$_target \ - --enable-ld=default \ - --enable-gold=yes \ - --enable-plugins \ - --enable-deterministic-archives \ - --disable-multilib \ - --disable-werror \ - --disable-nls - make + _target="$(arch_to_hostspec armv7)" + cd "$builddir" + "$builddir"/configure \ + --build="$CBUILD" \ + --target=$_target \ + --with-lib-path=/usr/lib \ + --prefix=/usr \ + --with-sysroot=/usr/$_target \ + --enable-ld=default \ + --enable-gold=yes \ + --enable-plugins \ + --enable-deterministic-archives \ + --disable-multilib \ + --disable-werror \ + --disable-nls + make } package() { - cd "$builddir" - make install DESTDIR="$pkgdir" + cd "$builddir" + make install DESTDIR="$pkgdir" - # remove man, info folders - rm -rf "$pkgdir"/usr/share + # remove man, info folders + rm -rf "$pkgdir"/usr/share }