From a198a62b0d0e84d9708e5632ee9c2d1fa86f7a70 Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Mon, 22 Apr 2013 11:25:48 +0000
Subject: main/gcc: depend on libgomp

we don't bother create a separate libgomp-dev subpackage. just depend on libgomp
to make it simple

we also depend on the exact gcc version when we pullin gcc pkg.
---
 main/gcc/APKBUILD | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'main/gcc/APKBUILD')

diff --git a/main/gcc/APKBUILD b/main/gcc/APKBUILD
index 4f96e7f19b..ed8419b76e 100644
--- a/main/gcc/APKBUILD
+++ b/main/gcc/APKBUILD
@@ -7,12 +7,13 @@ _specs_gcc_ver=4.4.3
 
 _uclibc_abiver=0.9.32
 
-pkgrel=0
+_gccrel=$pkgver-r$pkgrel
+pkgrel=1
 pkgdesc="The GNU Compiler Collection"
 url="http://gcc.gnu.org"
 arch="all"
 license="GPL LGPL"
-depends="binutils"
+depends="binutils libgomp=$_gccrel"
 makedepends="bison flex gmp-dev mpfr-dev texinfo mpc1-dev gawk zlib-dev zip
 	cloog-dev"
 subpackages="$pkgname-doc libstdc++:libcxx g++:gpp libgcc libgomp"
@@ -285,7 +286,7 @@ libobjc() {
 objc() {
 	pkgdesc="GNU Objective-C"
 	replaces="gcc"
-	depends="libc-dev gcc"
+	depends="libc-dev gcc=$_gccrel"
 	local gcclibdir=usr/lib/gcc/${CHOST:-$_chost}/$pkgver
 	mkdir -p "$subpkgdir"/$gcclibdir/include \
 		"$subpkgdir"/$gcclibdir/plugin/include \
@@ -319,7 +320,7 @@ libgomp() {
 
 java() {
 	pkgdesc="Java support for GCC"
-	depends="zlib-dev"
+	depends="zlib-dev gcc=$_gccrel"
 	paxctl -c -pm "$pkgdir"/usr/libexec/gcc/*/*/ecj1 || return 1
 	mkdir -p "$subpkgdir"/usr/bin "$subpkgdir"/usr/lib
 	cd "$pkgdir"/usr/bin
@@ -381,7 +382,7 @@ libgo() {
 
 go() {
 	pkgdesc="Go support for GCC"
-	depends="gcc"
+	depends="gcc=$_gccrel"
 	local libexec=usr/libexec/gcc/${CHOST:-$_chost}/$pkgver
 	mkdir -p "$subpkgdir"/$libexec \
 		"$subpkgdir"/usr/lib \
-- 
cgit v1.2.3