aboutsummaryrefslogtreecommitdiffstats
path: root/main/gcc/APKBUILD
diff options
context:
space:
mode:
authorSören Tempel <soeren+git@soeren-tempel.net>2020-09-05 11:46:14 +0200
committerSören Tempel <soeren+git@soeren-tempel.net>2020-09-05 12:39:37 +0200
commitdfa02021c57f4d0fa36e81d7f5965d6ea7680987 (patch)
tree77eea7160fb7783a6f216a14c4d38fe555af09fe /main/gcc/APKBUILD
parentb45b4b8fc68c866214fbbcb20b3ba86382de6d15 (diff)
downloadaports-dfa02021c57f4d0fa36e81d7f5965d6ea7680987.tar.gz
aports-dfa02021c57f4d0fa36e81d7f5965d6ea7680987.tar.bz2
aports-dfa02021c57f4d0fa36e81d7f5965d6ea7680987.tar.xz
main/gcc: update go() subpkg function
Without this change gcc conflicts with go as they both ship /usr/bin/go and /usr/bin/gofmt. This commit moves these files to the go subpkg.
Diffstat (limited to 'main/gcc/APKBUILD')
-rw-r--r--main/gcc/APKBUILD9
1 files changed, 8 insertions, 1 deletions
diff --git a/main/gcc/APKBUILD b/main/gcc/APKBUILD
index 6876a10270..c06773eb23 100644
--- a/main/gcc/APKBUILD
+++ b/main/gcc/APKBUILD
@@ -6,7 +6,7 @@ pkgver=10.2.0
[ "$CHOST" != "$CTARGET" ] && _target="-$CTARGET_ARCH" || _target=""
pkgname="$pkgname$_target"
-pkgrel=3
+pkgrel=4
pkgdesc="The GNU Compiler Collection"
url="https://gcc.gnu.org"
arch="all"
@@ -550,10 +550,17 @@ go() {
"$subpkgdir"/usr/bin
mv "$pkgdir"/usr/lib/go "$subpkgdir"/usr/lib/
mv "$pkgdir"/usr/bin/*gccgo "$subpkgdir"/usr/bin/
+ mv "$pkgdir"/usr/bin/*go "$subpkgdir"/usr/bin
+ mv "$pkgdir"/usr/bin/*gofmt "$subpkgdir"/usr/bin
mv "$pkgdir"/$_gcclibexec/go1 "$subpkgdir"/$_gcclibexec/
+ mv "$pkgdir"/$_gcclibexec/cgo "$subpkgdir"/$_gcclibexec/
+ mv "$pkgdir"/$_gcclibexec/buildid "$subpkgdir"/$_gcclibexec/
+ mv "$pkgdir"/$_gcclibexec/test2json "$subpkgdir"/$_gcclibexec/
+ mv "$pkgdir"/$_gcclibexec/vet "$subpkgdir"/$_gcclibexec/
mv "$pkgdir"/usr/lib/libgo.a \
"$pkgdir"/usr/lib/libgo.so \
"$pkgdir"/usr/lib/libgobegin.a \
+ "$pkgdir"/usr/lib/libgolibbegin.a \
"$subpkgdir"/usr/lib/
}