diff options
| author | Andreas Grapentin <andreas@grapentin.org> | 2018-02-08 22:14:37 +0100 |
|---|---|---|
| committer | Andreas Grapentin <andreas@grapentin.org> | 2018-02-09 14:31:11 +0100 |
| commit | 7fb34183f0fa4cf1582220359f73d06dc65dc393 (patch) | |
| tree | eeb53eb18519e435186ecb96d59f9a0826932e76 | |
| parent | 7f01f3ea7b83aa132f929b6341f21bba6485e096 (diff) | |
various fixes to pkgbuilds
| -rw-r--r-- | .gitignore | 4 | ||||
| -rw-r--r-- | toolchain-pkgbuilds/riscv64-linux-gnu-gcc-bootstrap/PKGBUILD | 4 | ||||
| -rw-r--r-- | toolchain-pkgbuilds/riscv64-linux-gnu-gcc/PKGBUILD | 7 | ||||
| -rw-r--r-- | toolchain-pkgbuilds/riscv64-linux-gnu-glibc/PKGBUILD | 2 |
4 files changed, 11 insertions, 6 deletions
@@ -1,3 +1,7 @@ # build dirs build/ + +# built packages +*.pkg.tar.xz +*.src.tar.gz diff --git a/toolchain-pkgbuilds/riscv64-linux-gnu-gcc-bootstrap/PKGBUILD b/toolchain-pkgbuilds/riscv64-linux-gnu-gcc-bootstrap/PKGBUILD index 9a48ab1..a96c6bb 100644 --- a/toolchain-pkgbuilds/riscv64-linux-gnu-gcc-bootstrap/PKGBUILD +++ b/toolchain-pkgbuilds/riscv64-linux-gnu-gcc-bootstrap/PKGBUILD @@ -78,8 +78,8 @@ build() { --disable-libgomp \ --disable-nls \ --disable-bootstrap \ - --enable-chehcking=release \ - --disable-multilib \ + --enable-checking=release \ + --disable-multilib make inhibit-libc=true all-gcc make inhibit-libc=true all-target-libgcc diff --git a/toolchain-pkgbuilds/riscv64-linux-gnu-gcc/PKGBUILD b/toolchain-pkgbuilds/riscv64-linux-gnu-gcc/PKGBUILD index b94b26e..6091815 100644 --- a/toolchain-pkgbuilds/riscv64-linux-gnu-gcc/PKGBUILD +++ b/toolchain-pkgbuilds/riscv64-linux-gnu-gcc/PKGBUILD @@ -15,7 +15,7 @@ url='https://github.com/riscv/riscv-gnu-toolchain' license=(GPL LGPL FDL) depends=($_target-binutils $_target-glibc libmpc zlib) makedepends=(git) -options=(!emptydirs !strip) +options=(!emptydirs !strip staticlibs) conflicts=($pkgname-bootstrap) replaces=($pkgname-bootstrap) source=("$_target::git+https://github.com/riscv/riscv-gnu-toolchain#tag=v$_snapshot") @@ -70,7 +70,7 @@ build() { --disable-libquadmath \ --disable-nls \ --disable-bootstrap \ - --enable-chehcking=release \ + --enable-checking=release \ --disable-multilib make @@ -79,7 +79,7 @@ build() { package() { cd gcc-build - make DESTDIR="$pkgdir" install-gcc install-target-libgcc install-target-libstdc++-v3 + make DESTDIR="$pkgdir" install # strip target binaries find "$pkgdir"/usr/lib/gcc/$_target/ "$pkgdir"/usr/$_target/lib -type f -and \( -name \*.a -or -name \*.o \) -exec $_target-objcopy -R .comment -R .note -R .debug_info -R .debug_aranges -R .debug_pubnames -R .debug_pubtypes -R .debug_abbrev -R .debug_line -R .debug_str -R .debug_ranges -R .debug_loc '{}' \; @@ -88,6 +88,7 @@ package() { find "$pkgdir"/usr/bin/ "$pkgdir"/usr/lib/gcc/$_target/ -type f -and \( -executable \) -exec strip '{}' \; # Remove files that conflict with host gcc package + rm -r "$pkgdir"/usr/lib/libcc1.so{,.0,.0.0.0} rm -r "$pkgdir"/usr/share/man/man7 rm -r "$pkgdir"/usr/share/info rm -r "$pkgdir"/usr/share/gcc-$pkgver diff --git a/toolchain-pkgbuilds/riscv64-linux-gnu-glibc/PKGBUILD b/toolchain-pkgbuilds/riscv64-linux-gnu-glibc/PKGBUILD index 124836d..556296d 100644 --- a/toolchain-pkgbuilds/riscv64-linux-gnu-glibc/PKGBUILD +++ b/toolchain-pkgbuilds/riscv64-linux-gnu-glibc/PKGBUILD @@ -10,7 +10,7 @@ _snapshot=20171231 pkgver=2.26.v$_snapshot pkgrel=1 pkgdesc="GNU C Library riscv64 target" -arch=(any) +arch=('x86_64') url='https://github.com/riscv/riscv-gnu-toolchain' license=('GPL' 'LGPL') depends=($_target-gcc $_target-linux-api-headers) |