aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Xu (Hello71) <alex_y_xu@yahoo.ca>2020-07-04 19:00:42 -0400
committerNatanael Copa <ncopa@alpinelinux.org>2020-07-14 11:19:13 +0000
commit5929c47dbf972f5a53d6ac7a70f9835a6bc144c6 (patch)
treed60f6958a1e101b16aa5ec9e00cbf58a14cccbec
parentfe9d7bdbadc0696b4add580295474b22a707eb83 (diff)
downloadaports-5929c47dbf972f5a53d6ac7a70f9835a6bc144c6.tar.gz
aports-5929c47dbf972f5a53d6ac7a70f9835a6bc144c6.tar.bz2
aports-5929c47dbf972f5a53d6ac7a70f9835a6bc144c6.tar.xz
main/gcc: split more subpackage files
-rw-r--r--main/gcc/APKBUILD13
1 files changed, 10 insertions, 3 deletions
diff --git a/main/gcc/APKBUILD b/main/gcc/APKBUILD
index d1c028ed52..64346e09cd 100644
--- a/main/gcc/APKBUILD
+++ b/main/gcc/APKBUILD
@@ -6,7 +6,7 @@ pkgver=9.3.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"
@@ -480,8 +480,10 @@ objc() {
replaces="gcc"
depends="libc-dev gcc=$_gccrel libobjc=$_gccrel"
- mkdir -p "$subpkgdir"/$_gcclibdir/include \
+ mkdir -p "$subpkgdir/$_gcclibexec" \
+ "$subpkgdir"/$_gcclibdir/include \
"$subpkgdir"/usr/lib
+ mv "$pkgdir/$_gcclibexec/cc1obj" "$subpkgdir/$_gcclibexec/"
mv "$pkgdir"/$_gcclibdir/include/objc "$subpkgdir"/$_gcclibdir/include/
mv "$pkgdir"/usr/lib/libobjc.so "$pkgdir"/usr/lib/libobjc.a \
"$subpkgdir"/usr/lib/
@@ -518,15 +520,19 @@ gdc() {
depends="gcc=$_gccrel libgphobos=$_gccrel musl-dev"
depends="$depends libucontext-dev"
- mkdir -p "$subpkgdir"/$_gcclibdir/include/d/ \
+ mkdir -p "$subpkgdir/$_gcclibexec" \
+ "$subpkgdir"/$_gcclibdir/include/d/ \
"$subpkgdir"/usr/lib \
"$subpkgdir"/usr/bin
# Copy: The installed '.d' files, the static lib, the binary itself
# The shared libs are part of 'libgphobos' so one can run program
# without installing the compiler
+ mv "$pkgdir/$_gcclibexec/d21" "$subpkgdir/$_gcclibexec/"
mv "$pkgdir"/$_gcclibdir/include/d/* "$subpkgdir"/$_gcclibdir/include/d/
mv "$pkgdir"/usr/lib/libgdruntime.a "$subpkgdir"/usr/lib/
mv "$pkgdir"/usr/lib/libgphobos.a "$subpkgdir"/usr/lib/
+ mv "$pkgdir"/usr/lib/libgphobos.spec "$subpkgdir"/usr/lib/
+ mv "$pkgdir"/usr/bin/$CTARGET-gdc "$subpkgdir"/usr/bin/
mv "$pkgdir"/usr/bin/gdc "$subpkgdir"/usr/bin/
}
@@ -591,6 +597,7 @@ gfortran() {
"$pkgdir"/usr/lib/libquadmath.so \
"$subpkgdir"/usr/lib/
fi
+ mv "$pkgdir"/$_gcclibdir/finclude "$subpkgdir"/$_gcclibdir/
mv "$pkgdir"/$_gcclibexec/f951 "$subpkgdir"/$_gcclibexec
mv "$pkgdir"/usr/lib/libgfortran.spec "$subpkgdir"/$_gcclibdir
}