diff options
| author | Michael Mason <ms13sp@gmail.com> | 2009-03-10 15:09:43 +0000 |
|---|---|---|
| committer | Michael Mason <ms13sp@gmail.com> | 2009-03-10 15:09:43 +0000 |
| commit | 2eed539c2e0caf3cbfa8181f5a9ac35b5db94375 (patch) | |
| tree | edb83a51e2d9de99627343f856a67b002eabeb07 | |
| parent | 8d4bf1802fe5ba0818ccb1404f0bfdc9861c6d36 (diff) | |
| parent | 9636f34248179dfe4ad9a78275c95ce93850221e (diff) | |
| download | aports-2eed539c2e0caf3cbfa8181f5a9ac35b5db94375.tar.bz2 aports-2eed539c2e0caf3cbfa8181f5a9ac35b5db94375.tar.xz | |
Merge branch 'master' of git://dev.alpinelinux.org/aports
| -rw-r--r-- | core/gcc/APKBUILD | 13 | ||||
| -rw-r--r-- | core/libtool/APKBUILD | 4 |
2 files changed, 12 insertions, 5 deletions
diff --git a/core/gcc/APKBUILD b/core/gcc/APKBUILD index c38766acbf..49c9194171 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=0 +pkgrel=1 pkgdesc="The GNU Compiler Collection" url="http://gcc.gnu.org" license="GPL LGPL" -depends="gmp mpfr" +depends="gmp mpfr libgcc binutils" makedepends="bison flex gmp-dev mpfr-dev texinfo" -subpackages="$pkgname-doc g++:gpp" +subpackages="$pkgname-doc 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 @@ -90,6 +90,13 @@ gpp() { mv "$pkgdir"/usr/bin/*++ "$subpkgdir"/usr/bin/ } +libgcc() { + depends="uclibc" + mkdir -p "$subpkgdir"/usr/lib + mv "$pkgdir"/usr/lib/libgcc_s.so* "$subpkgdir"/usr/lib/ +} + + md5sums="1739288c2c7b1472796b33d641dbdbbd gcc-core-4.3.3.tar.bz2 18428e313a9927d38b313e688c62219b gcc-g++-4.3.3.tar.bz2 f0c6c419318537505ec2717a139a091b 00_all_gcc-4.0-cvs-incompat.patch diff --git a/core/libtool/APKBUILD b/core/libtool/APKBUILD index e3f154b170..185e2df9fc 100644 --- a/core/libtool/APKBUILD +++ b/core/libtool/APKBUILD @@ -7,7 +7,7 @@ pkgdesc="A generic library support script" license='GPL' url="http://www.gnu.org/software/libtool" source="ftp://ftp.gnu.org/pub/gnu/libtool/${pkgname}-${pkgver}.tar.gz" -depends="uclibc" +depends="uclibc libltdl" subpackages="libltdl" build() { @@ -17,10 +17,10 @@ build() { make DESTDIR=${startdir}/pkg install rm -f ${pkgdir}/usr/share/info/dir - depends="$depends libltdl" } libltdl() { + depends="uclibc" mkdir -p "$subpkgdir/usr/lib" mv "$pkgdir/usr/lib/libltdl.so"* "$subpkgdir/usr/lib/" } |