From 96cb3b82ba075f0abb881c4949e2845d82e64021 Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Wed, 13 May 2009 15:31:54 +0000
Subject: core/gcc: split out libstdc++. added support for GCC_SPECS

---
 core/gcc/APKBUILD | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

(limited to 'core/gcc/APKBUILD')

diff --git a/core/gcc/APKBUILD b/core/gcc/APKBUILD
index 49c9194171c..dbb656603ac 100644
--- a/core/gcc/APKBUILD
+++ b/core/gcc/APKBUILD
@@ -1,13 +1,13 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=gcc
 pkgver=4.3.3
-pkgrel=1
+pkgrel=2
 pkgdesc="The GNU Compiler Collection"
 url="http://gcc.gnu.org"
 license="GPL LGPL"
 depends="gmp mpfr libgcc binutils"
 makedepends="bison flex gmp-dev mpfr-dev texinfo"
-subpackages="$pkgname-doc g++:gpp libgcc"
+subpackages="$pkgname-doc libstdc++:libcxx g++:gpp libgcc"
 source="ftp://gcc.gnu.org/pub/gcc/releases/gcc-$pkgver/gcc-core-$pkgver.tar.bz2
 	ftp://gcc.gnu.org/pub/gcc/releases/gcc-$pkgver/gcc-g++-$pkgver.tar.bz2
 	00_all_gcc-4.0-cvs-incompat.patch
@@ -18,6 +18,7 @@ source="ftp://gcc.gnu.org/pub/gcc/releases/gcc-$pkgver/gcc-core-$pkgver.tar.bz2
 	gcc4-stack-protector-uclibc-no_tls.patch
 	gcc-4.2.0-cc1-no-stack-protector.patch
 	pt_gnu_eh_frame.patch
+	gcc-spec-env.patch
 	"
 
 build () 
@@ -74,10 +75,18 @@ build ()
 
 	# binutils provides libiberty.a
 	rm -f "$pkgdir"/usr/lib/libiberty.a
+}
 
+libcxx() {
+	pkgdesc="GNU C++ standard runtime library"
+	depends="uclibc libgcc"
+	mkdir -p "$subpkgdir"/usr/lib
+	mv "$pkgdir"/usr/lib/libstdc++.so* "$subpkgdir"/usr/lib/
 }
 
 gpp() {
+	pkgdesc="GNU C++ standard library and compiler"
+	depends="uclibc libstdc++"
 	local libexec=usr/libexec/gcc/${CHOST:-i486-alpine-linux-uclibc}/$pkgver
 	mkdir -p "$subpkgdir/$libexec" \
 		"$subpkgdir"/usr/bin \
@@ -91,6 +100,7 @@ gpp() {
 }
 
 libgcc() {
+	pkgdesc="GNU C compiler runtime library"
 	depends="uclibc"
 	mkdir -p "$subpkgdir"/usr/lib
 	mv "$pkgdir"/usr/lib/libgcc_s.so* "$subpkgdir"/usr/lib/
@@ -106,4 +116,5 @@ f0c6c419318537505ec2717a139a091b  00_all_gcc-4.0-cvs-incompat.patch
 ed3f5a947fed432fbef1dc0e71977ae7  03_all_gcc-4.3.2-hardened-default.patch
 15e77082db0e1a131af98debd3016290  gcc4-stack-protector-uclibc-no_tls.patch
 cff2e73a8455bfa844dcdd9c229b0875  gcc-4.2.0-cc1-no-stack-protector.patch
-2db1e3482c5dd59dab70f701afa2ca80  pt_gnu_eh_frame.patch"
+2db1e3482c5dd59dab70f701afa2ca80  pt_gnu_eh_frame.patch
+c4045bfa85d8be780affd465be9d8ca8  gcc-spec-env.patch"
-- 
cgit v1.2.3