gcc-multilib: update to 4.5.1.

srcpkgs/gcc-multilib/gcc-c++-multilib.template

@@ -7,8 +7,6 @@ long_desc="
  On architectures with multilib support, the package contains files and
  dependencies for the non-default multilib architecture(s)."
 
-revision=1
-
 Add_dependency run gcc-c++		">=${version}"
 Add_dependency run gcc-multilib		">=${version}"
 Add_dependency run libstdc++32-devel	">=${version}"

srcpkgs/gcc-multilib/gcc-objc-multilib.template

@@ -8,8 +8,6 @@ long_desc="
  On architectures with multilib support, the package contains files and
  dependencies for the non-default multilib architecture(s)."
 
-revision=1
-
 Add_dependency run gcc		">=${version}"
 Add_dependency run gcc-multilib	">=${version}"
 Add_dependency run gcc-objc	">=${version}"

srcpkgs/gcc-multilib/libgcc32.template

@@ -5,7 +5,7 @@ long_desc="${long_desc}
 
  This package contains the 32bit GCC shared library for x86_64 systems."
 
-revision=1
+noverifyrdeps=yes
 
 do_install()
 {

srcpkgs/gcc-multilib/libgomp32.template

@@ -6,8 +6,6 @@ long_desc="${long_desc}
  This package contains the 32bit GCC shared support library which is needed
  for OpenMP v3.0 support."
 
-revision=1
-
 Add_dependency run libgcc32
 Add_dependency run glibc32
 

srcpkgs/gcc-multilib/libmudflap32-devel.template

@@ -7,8 +7,6 @@ long_desc="
 
  This package contains the headers and the static libraries." 
 
-revision=1
-
 Add_dependency run gcc-multilib
 Add_dependency run glibc32-devel
 Add_dependency run libmudflap32

srcpkgs/gcc-multilib/libmudflap32.template

@@ -5,8 +5,6 @@ long_desc="
  The libmudflap libraries are used by GCC for instrumenting pointer
  and array dereferencing operations."
 
-revision=1
-
 Add_dependency run gcc-multilib
 Add_dependency run glibc32
 

srcpkgs/gcc-multilib/libobjc32.template

@@ -6,8 +6,6 @@ long_desc="${long_desc}
  This package contains the 32bit GCC Objective-C shared support library
  which is needed to run Objective-C dynamically linked programs."
 
-revision=1
-
 Add_dependency run libgcc32
 Add_dependency run glibc32
 

srcpkgs/gcc-multilib/libssp32.template

@@ -6,8 +6,6 @@ long_desc="${long_desc}
  This package contains the 32bit Stack Smashing Protection shared library
  provided by GCC."
 
-revision=1
-
 Add_dependency run glibc32
 
 do_install()

srcpkgs/gcc-multilib/libstdc++32.template

@@ -6,8 +6,6 @@ long_desc="${long_desc}
  This package contains a rewritten standard compliant GCC Standard
  C++ library 32bit for x86_64 systems."
 
-revision=1
-
 Add_dependency run libgcc32
 Add_dependency run glibc32
 

srcpkgs/gcc-multilib/template

@@ -1,30 +1,29 @@
 # Template build file for 'gcc-multilib'
 pkgname=gcc-multilib
-version=4.5.0
+version=4.5.1
-revision=1
 _gmp_ver=5.0.1
-_mpfr_ver=2.4.2
+_mpfr_ver=3.0.0
-_mpc_ver=0.8.1
+_mpc_ver=0.8.2
 wrksrc="gcc-${version}"
 distfiles="
 http://ftp.gnu.org/pub/gnu/gcc/gcc-${version}/gcc-${version}.tar.bz2
-ftp://ftp.gmplib.org/pub/gmp-${_gmp_ver}/gmp-${_gmp_ver}.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://gcc-uk.internet.bs/infrastructure/mpc-${_mpc_ver}.tar.gz"
+http://www.multiprecision.org/mpc/download/mpc-${_mpc_ver}.tar.gz"
 build_style=gnu_configure
 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"
+--enable-multilib LDFLAGS="
 short_desc="The GNU C Compiler suite (multilib libraries)"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum="
-8293e9efa68a8ec0fdd0dae9c9bd128a8e742566acd9c8fbcfe79d98ed3756c8
+45fa81face89203ccbf3ec73f7a372769d855f3ba7446f50125b613d9c163e2c
 a2a610f01fd3298dc08c87bf30498c2402590e1bcb227fc40b15ee6d280939fb
-c7e75a08a8d49d2082e4caee1591a05d11b9d5627514e678f02d66a124bcf2ba
+8f4e5f9c53536cb798a30455ac429b1f9fc75a0f8af32d6e0ac31ebf1024821f
-e664603757251fd8a352848276497a4c79b7f8b21fd8aedd5cc0598a38fee3e4"
+ae79f8d41d8a86456b68607e9ca398d00f8b7342d1d83bcf4428178ac45380c7"
 long_desc="
  The GNU C Compiler suite, with support for C, C++, ObjC and ObjC++.
 
@@ -40,7 +39,7 @@ disable_parallel_build=yes
 noverifyrdeps=yes
 only_for_archs=x86_64
 
-Add_dependency run gcc
+Add_dependency run gcc		">=${version}"
 Add_dependency run libgcc32	">=${version}"
 Add_dependency run libgomp32	">=${version}"
 Add_dependency run zlib32
@@ -51,10 +50,22 @@ Add_dependency build zlib32-devel
 
 pre_configure()
 {
-	mkdir -p ${build_wrksrc}
+	# As specified in the LFS book, disable installing libiberty.
-	{ mv ${XBPS_BUILDDIR}/gmp-${_gmp_ver} ${wrksrc}/gmp;	\
+	sed -i 's/install_to_$(INSTALL_DEST) //' ${wrksrc}/libiberty/Makefile.in
-	mv ${XBPS_BUILDDIR}/mpfr-${_mpfr_ver} ${wrksrc}/mpfr;	\
+
+	# "Add" ppl-0.11 compatibility
+	sed -i "/ppl_minor_version=/s#10#11#" ${wrksrc}/configure
+
+	# Do not run fixincludes
+	sed -i 's@\./fixinc\.sh@-c true@' ${wrksrc}/gcc/Makefile.in
+
+	mkdir -p ${build_wrksrc}/gmp
+
+	{ mv ${XBPS_BUILDDIR}/gmp-${_gmp_ver} ${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
 }
 
 pre_install()