gcc: update to 4.6.0.

srcpkgs/gcc-multilib/template

@@ -1,8 +1,8 @@
 # Template build file for 'gcc-multilib'
 pkgname=gcc-multilib
-version=4.5.2
+version=4.6.0
 _gmp_ver=5.0.1
-_mpfr_ver=3.0.0
+_mpfr_ver=3.0.1
 _mpc_ver=0.8.2
 wrksrc="gcc-${version}"
 distfiles="
@@ -10,19 +10,13 @@ http://ftp.gnu.org/pub/gnu/gcc/gcc-${version}/gcc-${version}.tar.bz2
 http://ftp.gnu.org/pub/gnu/gmp/gmp-${_gmp_ver}.tar.bz2
 http://www.mpfr.org/mpfr-current/mpfr-${_mpfr_ver}.tar.bz2
 http://www.multiprecision.org/mpc/download/mpc-${_mpc_ver}.tar.gz"
-build_style=gnu_configure
+build_style=custom-install
-build_wrksrc=build
-configure_script="../configure"
-configure_args="--enable-clocale=gnu --enable-shared --disable-bootstrap
---enable-threads=posix --enable-__cxa_atexit --disable-gold --disable-lto
---enable-languages=c,c++,objc,obj-c++ --disable-nls --with-system-zlib
---enable-multilib LDFLAGS="
 short_desc="The GNU C Compiler suite (multilib libraries)"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum="
-1d9362275ffd9d19fd41f1c3dae0805d6e3991c4d5aa80851f2eaf1bbaa21f88
+23bd0013d76ac6fb4537e5e8f4e5947129362dcc32f0d08563b7d4d9e44c0e17
 a2a610f01fd3298dc08c87bf30498c2402590e1bcb227fc40b15ee6d280939fb
-8f4e5f9c53536cb798a30455ac429b1f9fc75a0f8af32d6e0ac31ebf1024821f
+e1977099bb494319c0f0c1f85759050c418a56884e9c6cef1c540b9b13e38e7f
 ae79f8d41d8a86456b68607e9ca398d00f8b7342d1d83bcf4428178ac45380c7"
 long_desc="
  The GNU C Compiler suite, with support for C, C++, ObjC and ObjC++.
@@ -48,37 +42,42 @@ Add_dependency run glibc32-devel
 Add_dependency build glibc32-devel
 Add_dependency build zlib32-devel
 
-pre_configure()
+do_build()
 {
 	# As specified in the LFS book, disable installing libiberty.
-	sed -i 's/install_to_$(INSTALL_DEST) //' ${wrksrc}/libiberty/Makefile.in
+	sed -i 's/install_to_$(INSTALL_DEST) //' libiberty/Makefile.in
-
 	# "Add" ppl-0.11 compatibility
-	sed -i "/ppl_minor_version=/s#10#11#" ${wrksrc}/configure
+	sed -i "/ppl_minor_version=/s#10#11#" configure
-
 	# Do not run fixincludes
-	sed -i 's@\./fixinc\.sh@-c true@' ${wrksrc}/gcc/Makefile.in
+	sed -i 's@\./fixinc\.sh@-c true@' gcc/Makefile.in
 
 	mkdir -p ${build_wrksrc}/gmp
+	{ mv ${XBPS_BUILDDIR}/gmp-${_gmp_ver} gmp; \
+	mv ${XBPS_BUILDDIR}/mpfr-${_mpfr_ver} mpfr; \
+	mv ${XBPS_BUILDDIR}/mpc-${_mpc_ver} mpc; } || return 1
 
-	{ mv ${XBPS_BUILDDIR}/gmp-${_gmp_ver} ${wrksrc}/gmp; \
+	cp -a gmp/*.h ${build_wrksrc}/gmp
-	mv ${XBPS_BUILDDIR}/mpfr-${_mpfr_ver} ${wrksrc}/mpfr; \
-	mv ${XBPS_BUILDDIR}/mpc-${_mpc_ver} ${wrksrc}/mpc; } || return 1
 
-	cp -a ${wrksrc}/gmp/*.h ${wrksrc}/${build_wrksrc}/gmp
+	LDFLAGS= ./configure --prefix=/usr \
+		--enable-clocale=gnu --enable-shared --disable-bootstrap \
+		--enable-threads=posix --enable-__cxa_atexit \
+		--disable-gold --disable-lto --with-system-zlib \
+		--enable-languages=c,c++,objc,obj-c++ --disable-nls \
+		--enable-multilib
+
+	make ${makejobs}
 }
 
-pre_install()
+do_install()
-{
-	mkdir -p ${DESTDIR}/usr/lib
-	cd ${DESTDIR}/usr && ln -sf lib lib64 && cd ${wrksrc}/${build_wrksrc}
-}
-
-post_install()
 {
 	local libmddir="/usr/lib/gcc/x86_64-unknown-linux-gnu/${version}"
 	local dirn _dir_
 
+	mkdir -p ${DESTDIR}/usr/lib
+	cd ${DESTDIR}/usr && ln -sf lib lib64 && cd ${wrksrc}/${build_wrksrc}
+
+	make DESTDIR=${DESTDIR} install
+
 	# We are only interested in 32bit stuff, remove anything else.
 	rm -rf ${DESTDIR}/usr/{lib64,libexec,bin,share}
 	rm -f ${DESTDIR}/usr/lib/*.{spec,a,so*}
@@ -99,6 +98,6 @@ post_install()
 	mv ${wrksrc}/xbps_32bits_libstdc++ \
 		${DESTDIR}/usr/include/c++/${version}/x86_64-unknown-linux-gnu/32
 	# Install specs file overriding native gcc with no multilib support.
-	install -m644 ${wrksrc}/build/gcc/specs \
+	install -m644 ${wrksrc}/host-${xbps_machine}-unknown-linux-gnu/gcc/specs \
 		${DESTDIR}/${libmddir}
 }

srcpkgs/gcc/template

@@ -2,19 +2,12 @@
 # 
 # NOTE: don't forget to sync with gcc-multilib when this package is updated.
 pkgname=gcc
-version=4.5.2
+version=4.6.0
 distfiles="http://ftp.gnu.org/pub/gnu/gcc/gcc-$version/gcc-$version.tar.bz2"
-build_style=gnu_configure
+build_style=custom-install
-configure_args="--enable-clocale=gnu --disable-bootstrap
---enable-threads=posix --enable-__cxa_atexit --disable-multilib
---enable-languages=c,c++,objc,obj-c++ --enable-tls
---with-mpfr=$XBPS_MASTERDIR/usr --with-gmp=$XBPS_MASTERDIR/usr
---disable-rpath --with-system-zlib --enable-shared
---with-ppl=${XBPS_MASTERDIR}/usr --with-cloog=${XBPS_MASTERDIR}/usr
---enable-lto --with-libelf=${XBPS_MASTERDIR}/usr"
 short_desc="The GNU C Compiler"
 maintainer="Juan RP <xtraeme@gmail.com>"
-checksum=1d9362275ffd9d19fd41f1c3dae0805d6e3991c4d5aa80851f2eaf1bbaa21f88
+checksum=23bd0013d76ac6fb4537e5e8f4e5947129362dcc32f0d08563b7d4d9e44c0e17
 long_desc="
  The GNU C Compiler, with support for building C code.
  
@@ -39,6 +32,7 @@ Add_dependency run cloog-ppl
 Add_dependency run libelf
 Add_dependency run libssp-devel		">=${version}"
 Add_dependency run glibc-devel
+
 Add_dependency build gmp-devel
 Add_dependency build mpfr-devel
 Add_dependency build mpc-devel
@@ -46,28 +40,36 @@ Add_dependency build binutils-devel
 Add_dependency build cloog-ppl-devel
 Add_dependency build libelf-devel
 
-pre_configure()
+do_build()
 {
 	# As specified in the LFS book, disable installing libiberty.
-	sed -i 's/install_to_$(INSTALL_DEST) //' ${wrksrc}/libiberty/Makefile.in
+	sed -i 's/install_to_$(INSTALL_DEST) //' libiberty/Makefile.in
-
 	# "Add" ppl-0.11 compatibility
-	sed -i "/ppl_minor_version=/s#10#11#" ${wrksrc}/configure
+	sed -i "/ppl_minor_version=/s#10#11#" configure
-
 	# Do not run fixincludes
-	sed -i 's@\./fixinc\.sh@-c true@' ${wrksrc}/gcc/Makefile.in
+	sed -i 's@\./fixinc\.sh@-c true@' gcc/Makefile.in
+
+	./configure --prefix=/usr \
+		--enable-clocale=gnu --disable-bootstrap \
+		--enable-threads=posix --enable-__cxa_atexit --disable-multilib \
+		--enable-languages=c,c++,objc,obj-c++ --enable-tls \
+		--with-mpfr=$XBPS_MASTERDIR/usr --with-gmp=$XBPS_MASTERDIR/usr \
+		--disable-rpath --with-system-zlib --enable-shared \
+		--with-ppl=${XBPS_MASTERDIR}/usr --with-cloog=${XBPS_MASTERDIR}/usr \
+		--enable-lto --with-libelf=${XBPS_MASTERDIR}/usr
+
+	make ${makejobs}
 }
 
-pre_install()
+do_install()
 {
 	if [ "$xbps_machine" = "x86_64" ]; then
 		mkdir -p ${SRCPKGDESTDIR}/usr/lib
 		cd ${SRCPKGDESTDIR}/usr && ln -s lib lib64 && cd ${wrksrc}
 	fi
-}
 
-post_install()
+	make DESTDIR=${DESTDIR} install
-{
+
 	cd ${DESTDIR}/usr/bin && ln -sf gcc cc
 	#
 	# rpcgen wants /lib/cpp, make a symlink.