main/gcc: upgrade to 4.7.1

Disable gcc-go for now. It needs ucontext which we don't have.

1 files changed, 44 insertions, 39 deletions

diff --git a/main/gcc/APKBUILD b/main/gcc/APKBUILD
index da967dbb4..2b7b747c9 100644
--- a/main/gcc/APKBUILD
+++ b/main/gcc/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=gcc
-pkgver=4.6.3
-_piepatchver=0.4.5
+pkgver=4.7.1
+_piepatchver=0.5.3
 _specs_ver=0.2.0
 _specs_gcc_ver=4.4.3
 
@@ -12,12 +12,15 @@ pkgdesc="The GNU Compiler Collection"
 url="http://gcc.gnu.org"
 arch="all"
 license="GPL LGPL"
-depends="binutils libgcc libgomp libobjc"
-makedepends="bison flex gmp-dev mpfr-dev texinfo libmpc-dev gawk zlib-dev zip
+depends="binutils libgomp libobjc"
+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"
 replaces="libstdc++"
 
+# disable Go til we have getcontex/setcontext
+LANG_GO=off
+
 if [ -n "$BOOTSTRAP" ]; then
 	LANG_OBJC=off
 	LANG_JAVA=off
@@ -43,33 +46,29 @@ if [ "$LANG_FORTRAN" != "off" ]; then
 	_languages="$_languages,fortran"
 fi
 
-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
-	ftp://gcc.gnu.org/pub/gcc/releases/gcc-$pkgver/gcc-objc-$pkgver.tar.bz2
-	ftp://gcc.gnu.org/pub/gcc/releases/gcc-$pkgver/gcc-java-$pkgver.tar.bz2
-	ftp://gcc.gnu.org/pub/gcc/releases/gcc-$pkgver/gcc-go-$pkgver.tar.bz2
-	ftp://gcc.gnu.org/pub/gcc/releases/gcc-$pkgver/gcc-fortran-$pkgver.tar.bz2
-	http://distfiles.gentoo.org/distfiles/gcc-4.6.1-piepatches-v${_piepatchver}.tar.bz2
+source="ftp://gcc.gnu.org/pub/gcc/releases/gcc-$pkgver/gcc-$pkgver.tar.bz2
+	http://distfiles.gentoo.org/distfiles/gcc-4.7.1-piepatches-v${_piepatchver}.tar.bz2
 	http://distfiles.gentoo.org/distfiles/gcc-$_specs_gcc_ver-specs-$_specs_ver.tar.bz2
 	ftp://sourceware.org/pub/java/ecj-latest.jar
 	
-	08_all_cross-compile.patch
 	11_all_default-warn-format-security.patch
 	12_all_default-warn-trampolines.patch
 	15_all_libgomp-Werror.patch
-	34_all_ia64_note.GNU-stack.patch
+	16_all_libgo-Werror-pr53679.patch
+	29_all_arm_armv4t-default.patch
+	49_all_gcc-4.7-x86-libitm-pr52695.patch
 	51_all_libiberty-pic.patch
-	74_all_gcc46_cloog-dl.patch
+	67_all_gcc-poison-system-directories.patch
+	74_all_gcc47_cloog-dl.patch
 
 	gcc-spec-env.patch
 	pt_gnu_eh_frame.patch
 	uclibc-getipinfo.patch
-	gcc-4.6-dynamic-linker.patch
+	gcc-4.7-dynamic-linker.patch
 	gcc-4.6-pr32219.patch
 	boehem-gc-uclibc.patch
 	gcc-pure64.patch
 	gcc-go.patch
-	gcc-libgcc-x86.get_pc_thunk.bx.patch
 	"
 
 # we build out-of-tree
@@ -119,10 +118,9 @@ prepare() {
 	# by default for everything else.
 	local _hard_cflags="-DEFAULT_PIE_SSP -DEFAULT_RELRO -DEFAULT_BIND_NOW"
 	sed -e "/^ALL_CFLAGS/iHARD_CFLAGS = ${_hard_cflags}" \
-		-e 's|^ALL_CFLAGS = |ALL_CFLAGS = $(HARD_CFLAGS) -fno-PIE |' \
+		-e 's|^ALL_CFLAGS = |ALL_CFLAGS = $(HARD_CFLAGS) |' \
+		-e 's|^ALL_CXXFLAGS = |ALL_CXXFLAGS = $(HARD_CFLAGS) |' \
 		-i gcc/Makefile.in || return 1
-	sed -e "/stage1_cflags=/s/-fno-stack-protector/-fno-stack-protector -fno-PIE/" \
-		-i configure
 
 	# see http://gcc.gnu.org/ml/java/2008-04/msg00027.html
 	mv "$srcdir"/ecj-latest.jar ecj.jar
@@ -173,6 +171,7 @@ build() {
 		--target=${CTARGET} \
 		--with-pkgversion="Alpine ${pkgver}-r${pkgrel}" \
 		--disable-altivec \
+		--disable-build-with-cxx \
 		--disable-checking \
 		--disable-fixed-point \
 		--disable-libssp \
@@ -192,7 +191,8 @@ build() {
 		$_dynamic_linker \
 		--with-dynamic-linker-prefix=/lib \
 		--with-system-zlib \
-		--without-system-libunwind 
+		--without-system-libunwind \
+		|| return 1
 
 	make || return 1
 }
@@ -288,6 +288,7 @@ libgomp() {
 
 java() {
 	pkgdesc="Java support for GCC"
+	depends="zlib-dev"
 	paxctl -c -pm "$pkgdir"/usr/libexec/gcc/*/*/ecj1 || return 1
 	mkdir -p "$subpkgdir"/usr/bin "$subpkgdir"/usr/lib
 	cd "$pkgdir"/usr/bin
@@ -297,8 +298,12 @@ java() {
 		mkdir -p "$subpkgdir"/${i%/*}
 		mv "$pkgdir"/$i "$subpkgdir"/$i || return 1
 	done
+	for i in "$pkgdir"/usr/lib/libgcj*.so; do
+		if [ -L "$i" ]; then
+			mv "$i" "$subpkgdir"/usr/lib/
+		fi
+	done
 	mv \
-		"$pkgdir"/usr/lib/libgcj*.so \
 		"$pkgdir"/usr/lib/libgij.so \
 		"$pkgdir"/usr/lib/libgcj.spec \
 		"$subpkgdir"/usr/lib/
@@ -306,9 +311,11 @@ java() {
 
 libgcj() {
 	pkgdesc="Java runtime library for gcc"
+	# libgcj_bc.so moved from gcc-java to libgcj
+	replaces="gcc-java"
 	mkdir -p "$subpkgdir"/usr/bin
 	cd "$pkgdir"/usr/bin
-	paxctl -c -pmE "$pkgdir"/usr/bin/gij || return 1
+	paxctl -c -pmsE "$pkgdir"/usr/bin/gij || return 1
 	mv aot-compile gappletviewer gc-analyze gij gjar gjarsigner gkeytool\
 		gnative2ascii gorbd grmic grmid grmiregistry gserialver \
 		gtnameserv i486-alpine-linux-uclibc-gcj jv-convert \
@@ -321,11 +328,13 @@ libgcj() {
 	done
 	mkdir -p "$subpkgdir"/usr/lib
 	mv "$pkgdir"/usr/lib/gcj-* \
+		"$pkgdir"/usr/lib/libgcj_bc.so \
 		"$pkgdir"/usr/lib/libgcj*.so.* \
 		"$pkgdir"/usr/lib/libgij.so.* \
 		"$pkgdir"/usr/lib/logging.properties \
 		"$pkgdir"/usr/lib/security \
-		"$subpkgdir"/usr/lib/
+		"$subpkgdir"/usr/lib/ \
+		|| return 1
 
 	mkdir -p "$subpkgdir"/usr/share/
 	mv "$pkgdir"/usr/share/java "$subpkgdir"/usr/share/
@@ -388,28 +397,24 @@ gfortran() {
 		"$subpkgdir"/$gcclibs
 }
 
-md5sums="766091220c6a14fcaa2c06dd573e3758  gcc-core-4.6.3.tar.bz2
-37515158a0fb3d0800ec41a08c05e69e  gcc-g++-4.6.3.tar.bz2
-48ba23770c34b1cb468f72618b4452c5  gcc-objc-4.6.3.tar.bz2
-ea47e796f9e53118cd6e262fa220085c  gcc-java-4.6.3.tar.bz2
-92166ef431c165054467a9524d0819c8  gcc-go-4.6.3.tar.bz2
-26a18d5727f7c8c18581ba924cce1e5f  gcc-fortran-4.6.3.tar.bz2
-5dc7efd84b526801b94fed21462aea62  gcc-4.6.1-piepatches-v0.4.5.tar.bz2
+md5sums="933e6f15f51c031060af64a9e14149ff  gcc-4.7.1.tar.bz2
+2e1d99664efcdbd86549a40ddf37d405  gcc-4.7.1-piepatches-v0.5.3.tar.bz2
 441c76504e1d97170117c294e65c7a72  gcc-4.4.3-specs-0.2.0.tar.bz2
 d7cd6a27c8801e66cbaa964a039ecfdb  ecj-latest.jar
-b1b5987e7c53f2c8a0fa929444bd9129  08_all_cross-compile.patch
 34e4a0260e9dbd434ac84b9dda381240  11_all_default-warn-format-security.patch
-a78022925c0ecb1f13384238b81adbe7  12_all_default-warn-trampolines.patch
+1570f30f65f1c4941d2bd690a7148836  12_all_default-warn-trampolines.patch
 6862cb5268fef68a4a1906e0c4ea0d46  15_all_libgomp-Werror.patch
-1a8ce6b7a0b9a115e37fdda311704451  34_all_ia64_note.GNU-stack.patch
+2a6a0be54c283c311a39bba359cc01f4  16_all_libgo-Werror-pr53679.patch
+681499caf97fbdb4d5c97e312cddf47c  29_all_arm_armv4t-default.patch
+4e35639c74fe4b6111f74a91bb3d52a8  49_all_gcc-4.7-x86-libitm-pr52695.patch
 d8692c56f04b92667096f59d843e95c5  51_all_libiberty-pic.patch
-a90d4d1ee358b19f2068fe2e4fd5d001  74_all_gcc46_cloog-dl.patch
+406fc6f29ab3d746eaef0202c50fd7e9  67_all_gcc-poison-system-directories.patch
+f24f07ed008324eaecb0f75417c99116  74_all_gcc47_cloog-dl.patch
 a695d7648509b4f8e18b389a19e6037c  gcc-spec-env.patch
-2db1e3482c5dd59dab70f701afa2ca80  pt_gnu_eh_frame.patch
+ab83248e10b2bf4b3d9240de0fefb52b  pt_gnu_eh_frame.patch
 6cc2385c5bbd6d0da6eaedd53c8bf547  uclibc-getipinfo.patch
-3be85df859fa1d5c875bbfcc2dee8288  gcc-4.6-dynamic-linker.patch
+3d8131bdfa70e51be4ae186114097173  gcc-4.7-dynamic-linker.patch
 32e8e4c0e23ed8f5de95a591cb30f1da  gcc-4.6-pr32219.patch
 2c6cb49bb9bfd8b6e690222e66ccc901  boehem-gc-uclibc.patch
-d1d3ad2b0c185b5548125a1b81bee154  gcc-pure64.patch
-c94014ece84407a36d239417a2bad25d  gcc-go.patch
-978e3fac97ad99902a86bafc6f283727  gcc-libgcc-x86.get_pc_thunk.bx.patch"
+94c36cc724f5c5d6c8cb8650195ee83d  gcc-pure64.patch
+c94014ece84407a36d239417a2bad25d  gcc-go.patch"