diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2013-04-22 19:40:24 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2013-04-23 08:26:58 +0000 |
| commit | 9909cc120cf93f7c1eb5dc64fa7af4a82ceccd32 (patch) | |
| tree | 5a8dabdfaa4424c80229a928565c9028504af481 | |
| parent | a4c5119df24b23bf2aa1ab0f7bad5ec7edac4f57 (diff) | |
| download | aports-9909cc120cf93f7c1eb5dc64fa7af4a82ceccd32.tar.bz2 aports-9909cc120cf93f7c1eb5dc64fa7af4a82ceccd32.tar.xz | |
main/gcc: try again to get the versioned dependency right
| -rw-r--r-- | main/gcc/APKBUILD | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/main/gcc/APKBUILD b/main/gcc/APKBUILD index 66c699189b..c46d21bc0e 100644 --- a/main/gcc/APKBUILD +++ b/main/gcc/APKBUILD @@ -7,15 +7,16 @@ _specs_gcc_ver=4.4.3 _uclibc_abiver=0.9.32 -pkgrel=2 +pkgrel=3 pkgdesc="The GNU Compiler Collection" url="http://gcc.gnu.org" arch="all" license="GPL LGPL" +_gccrel=$pkgver-r$pkgrel 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" +subpackages="$pkgname-doc libgcc libgomp libstdc++:libcxx g++:gpp" replaces="libstdc++" if [ -n "$BOOTSTRAP" ]; then @@ -30,16 +31,16 @@ if [ "$LANG_OBJC" != "off" ]; then _languages="$_languages,objc" fi if [ "$LANG_JAVA" != "off" ]; then - subpackages="$subpackages $pkgname-java libgcj" + subpackages="$subpackages libgcj $pkgname-java" makedepends="$makedepends paxctl" _languages="$_languages,java" fi if [ "$LANG_GO" != "off" ]; then - subpackages="$subpackages $pkgname-go libgo" + subpackages="$subpackages libgo $pkgname-go" _languages="$_languages,go" fi if [ "$LANG_FORTRAN" != "off" ]; then - subpackages="$subpackages gfortran libgfortran libquadmath" + subpackages="$subpackages libgfortran libquadmath gfortran" _languages="$_languages,fortran" fi @@ -68,7 +69,6 @@ source="ftp://gcc.gnu.org/pub/gcc/releases/gcc-$pkgver/gcc-$pkgver.tar.bz2 gcc-go.patch " -_gccrel=$pkgver-r$pkgrel # we build out-of-tree _gccdir="$srcdir"/gcc-$pkgver @@ -261,7 +261,7 @@ libcxx() { gpp() { pkgdesc="GNU C++ standard library and compiler" - depends="libstdc++ libc-dev" + depends="libstdc++=$_gccrel gcc=$_gccrel libc-dev" local libexec=usr/libexec/gcc/${CHOST:-$_chost}/$pkgver mkdir -p "$subpkgdir/$libexec" \ "$subpkgdir"/usr/bin \ @@ -287,7 +287,7 @@ libobjc() { objc() { pkgdesc="GNU Objective-C" replaces="gcc" - depends="libc-dev gcc=$_gccrel" + depends="libc-dev gcc=$_gccrel libobjc=$_gccrel" local gcclibdir=usr/lib/gcc/${CHOST:-$_chost}/$pkgver mkdir -p "$subpkgdir"/$gcclibdir/include \ "$subpkgdir"/$gcclibdir/plugin/include \ @@ -321,7 +321,7 @@ libgomp() { java() { pkgdesc="Java support for GCC" - depends="zlib-dev gcc=$_gccrel" + depends="zlib-dev gcc=$_gccrel libgcj=$_gccrel" paxctl -c -pm "$pkgdir"/usr/libexec/gcc/*/*/ecj1 || return 1 mkdir -p "$subpkgdir"/usr/bin "$subpkgdir"/usr/lib cd "$pkgdir"/usr/bin @@ -383,7 +383,7 @@ libgo() { go() { pkgdesc="Go support for GCC" - depends="gcc=$_gccrel" + depends="gcc=$_gccrel libgo=$_gccrel" local libexec=usr/libexec/gcc/${CHOST:-$_chost}/$pkgver mkdir -p "$subpkgdir"/$libexec \ "$subpkgdir"/usr/lib \ @@ -399,6 +399,7 @@ go() { libgfortran() { pkgdesc="Fortran runtime library for GCC" + depends= mkdir -p "$subpkgdir"/usr/lib mv "$pkgdir"/usr/lib/libgfortran.so.* "$subpkgdir"/usr/lib/ } @@ -413,7 +414,7 @@ libquadmath() { gfortran() { pkgdesc="GNU Fortran Compiler" - depends="gcc libgfortran libquadmath" + depends="gcc=$_gccrel libgfortran=$_gccrel libquadmath=$_gccrel" replaces="gcc" local libexec=usr/libexec/gcc/${CHOST:-$_chost}/$pkgver local gcclibs=usr/lib/gcc/${CHOST:-$_chost}/$pkgver |