From 81ddb0ead56e9b084180fb7e30ed31f0b2ba3efa Mon Sep 17 00:00:00 2001
From: Christian Neukirchen <chneukirchen@gmail.com>
Date: Wed, 27 Jan 2016 15:53:57 +0100
Subject: [PATCH] gcc: add libgcc-devel subpkg.

This package now contains the *crt*.o and libgcc*.a.

Closes #3472.
---
 srcpkgs/gcc/template | 14 +++++++++++---
 srcpkgs/libgcc-devel |  1 +
 2 files changed, 12 insertions(+), 3 deletions(-)
 create mode 120000 srcpkgs/libgcc-devel

diff --git a/srcpkgs/gcc/template b/srcpkgs/gcc/template
index 6650affe005..6d95d225f31 100644
--- a/srcpkgs/gcc/template
+++ b/srcpkgs/gcc/template
@@ -2,7 +2,7 @@
 pkgname=gcc
 _majorver=4.9
 version=${_majorver}.3
-revision=2
+revision=3
 short_desc="The GNU C Compiler"
 maintainer="Juan RP <xtraeme@voidlinux.eu>"
 homepage="http://gcc.gnu.org"
@@ -19,7 +19,7 @@ if [ "$CHROOT_READY" ]; then
 	hostmakedepends="perl flex"
 fi
 makedepends="zlib-devel libmpc-devel cloog-devel"
-depends="binutils libgcc-${version}_${revision}"
+depends="binutils libgcc-devel-${version}_${revision}"
 
 subpackages="libgcc libgomp libgomp-devel libatomic libatomic-devel"
 subpackages+=" libssp libssp-devel gcc-c++"
@@ -41,7 +41,7 @@ if [ -n "$CHROOT_READY" -a -z "$CROSS_BUILD" ]; then
 	esac
 fi
 
-subpackages+=" libstdc++-devel libstdc++"
+subpackages+=" libstdc++-devel libstdc++ libgcc-devel"
 
 case "$XBPS_TARGET_MACHINE" in
 	i686) _triplet="i686-pc-linux-gnu";;
@@ -483,6 +483,14 @@ libgcc_package() {
 		vlicense ${wrksrc}/COPYING.RUNTIME RUNTIME.LIBRARY.EXCEPTION
 	}
 }
+libgcc-devel_package() {
+	depends="libgcc-${version}_${revision}"
+	short_desc+=" - GCC library - development files"
+	pkg_install() {
+		vmove "usr/lib/gcc/${_triplet}/${_majorver}/*.o"
+		vmove "usr/lib/gcc/${_triplet}/${_majorver}/*.a"
+	}
+}
 libgomp-devel_package() {
 	depends="libgomp>=${_majorver}"
 	short_desc+=" - OpenMP v4.0 library - development files"
diff --git a/srcpkgs/libgcc-devel b/srcpkgs/libgcc-devel
new file mode 120000
index 00000000000..b08d5af5795
--- /dev/null
+++ b/srcpkgs/libgcc-devel
@@ -0,0 +1 @@
+gcc
\ No newline at end of file