From 3f7874105a8cbf1d320a850ec20b2e30341b4191 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Thu, 30 Oct 2014 16:48:42 +0100 Subject: [PATCH] gcc: update to 4.9.2. --- srcpkgs/gcc/patches/gcc-bug-61801.patch | 14 --------- srcpkgs/gcc/template | 40 ++----------------------- 2 files changed, 3 insertions(+), 51 deletions(-) delete mode 100644 srcpkgs/gcc/patches/gcc-bug-61801.patch diff --git a/srcpkgs/gcc/patches/gcc-bug-61801.patch b/srcpkgs/gcc/patches/gcc-bug-61801.patch deleted file mode 100644 index ef0d279a4d8..00000000000 --- a/srcpkgs/gcc/patches/gcc-bug-61801.patch +++ /dev/null @@ -1,14 +0,0 @@ -https://gcc.gnu.org/bugzilla/show_bug.cgi?id=61801 - ---- gcc/sched-deps.c 2014/04/11 12:49:40 209304 -+++ gcc/sched-deps.c 2014/07/17 07:48:49 212739 -@@ -2750,7 +2750,8 @@ - Consider for instance a volatile asm that changes the fpu rounding - mode. An insn should not be moved across this even if it only uses - pseudo-regs because it might give an incorrectly rounded result. */ -- if (code != ASM_OPERANDS || MEM_VOLATILE_P (x)) -+ if ((code != ASM_OPERANDS || MEM_VOLATILE_P (x)) -+ && !DEBUG_INSN_P (insn)) - reg_pending_barrier = TRUE_BARRIER; - - /* For all ASM_OPERANDS, we must traverse the vector of input operands. diff --git a/srcpkgs/gcc/template b/srcpkgs/gcc/template index fe4bb7a5f68..0b225382465 100644 --- a/srcpkgs/gcc/template +++ b/srcpkgs/gcc/template @@ -1,14 +1,14 @@ # Template build file for 'gcc' pkgname=gcc _majorver=4.9 -version=${_majorver}.1 -revision=8 +version=${_majorver}.2 +revision=1 short_desc="The GNU C Compiler" maintainer="Juan RP " homepage="http://gcc.gnu.org" license="GFDL-1.2, GPL-3, LGPL-2.1" distfiles="http://ftp.gnu.org/pub/gnu/gcc/gcc-$version/gcc-$version.tar.bz2" -checksum=d334781a124ada6f38e63b545e2a3b8c2183049515a1abab6d513f109f1d717e +checksum=2020c98295856aa13fda0f2f3a4794490757fc24bcca918d52cc8b4917b972dd lib32disabled=yes bootstrap=yes @@ -89,14 +89,12 @@ do_configure() { --enable-cloog-backend=isl --with-linker-hash-style=gnu \ --enable-languages=${_langs} --enable-sjlj-exceptions=no ${_args} } - do_build() { if [ -z "$CHROOT_READY" ]; then export LD_LIBRARY_PATH="${XBPS_MASTERDIR}/usr/lib" fi make ${makejobs} } - pre_install() { if [ "$CROSS_BUILD" ]; then # XXX otherwise links to host libpthread @@ -106,7 +104,6 @@ pre_install() { done fi } - do_install() { if [ "$XBPS_TARGET_MACHINE" = "x86_64" ]; then vmkdir usr/lib @@ -190,7 +187,6 @@ gcc-gcj_package() { touch ${PKGDESTDIR}/usr/share/info/dir } } - gcc-go_package() { lib32disabled=yes depends="gcc>=${_majorver} libgo-devel>=${_majorver}" @@ -206,7 +202,6 @@ gcc-go_package() { vmove usr/lib/go } } - gcc-fortran_package() { lib32disabled=yes depends="gcc>=${_majorver} libgfortran-devel>=${_majorver}" @@ -222,7 +217,6 @@ gcc-fortran_package() { vmove usr/share/man/man1/gfortran.1 } } - gcc-objc++_package() { lib32disabled=yes depends="gcc-c++>=${_majorver} gcc-objc>=${_majorver}" @@ -231,7 +225,6 @@ gcc-objc++_package() { vmove usr/lib/gcc/${_triplet}/${_majorver}/cc1objplus } } - gcc-objc_package() { lib32disabled=yes depends="gcc>=${_majorver} libobjc>=${_majorver}" @@ -241,7 +234,6 @@ gcc-objc_package() { vmove usr/lib/gcc/${_triplet}/${_majorver}/cc1obj } } - libgcj-devel_package() { short_desc+=" - Java library - development files" pkg_install() { @@ -259,7 +251,6 @@ libgcj-devel_package() { vmove usr/lib/pkgconfig/libgcj-${_majorver}.pc } } - libgcj_package() { short_desc+=" - Java libraries" pkg_install() { @@ -272,7 +263,6 @@ libgcj_package() { vmove usr/share/java } } - libgfortran-devel_package() { depends="libgfortran>=${_majorver}" short_desc+=" - Fortran library - development files" @@ -281,7 +271,6 @@ libgfortran-devel_package() { vmove usr/lib/gcc/${_triplet}/${_majorver}/libgfortranbegin.a } } - libgfortran_package() { short_desc+=" - Fortran library" pkg_install() { @@ -290,7 +279,6 @@ libgfortran_package() { vinstall ${wrksrc}/COPYING.RUNTIME 644 usr/share/licenses/$pkgname RUNTIME.LIBRARY.EXCEPTION } } - libgo-devel_package() { depends="libgo>=${_majorver}" short_desc+=" - Go library - development files" @@ -299,7 +287,6 @@ libgo-devel_package() { vmove usr/lib/libgobegin.a } } - libgo_package() { short_desc+=" - Go library" pkg_install() { @@ -307,7 +294,6 @@ libgo_package() { vinstall ${wrksrc}/COPYING.RUNTIME 644 usr/share/licenses/$pkgname RUNTIME.LIBRARY.EXCEPTION } } - libobjc-devel_package() { depends="libobjc>=${_majorver}" short_desc+=" - Objective-C library - development files" @@ -315,7 +301,6 @@ libobjc-devel_package() { vmove "usr/lib/libobjc.*a" } } - libobjc_package() { short_desc+=" - Objective-C library" pkg_install() { @@ -338,7 +323,6 @@ libquadmath-devel_package() { touch ${PKGDESTDIR}/usr/share/info/dir } } - libquadmath_package() { short_desc+=" - quadmath library" pkg_install() { @@ -346,7 +330,6 @@ libquadmath_package() { vinstall ${wrksrc}/COPYING.RUNTIME 644 usr/share/licenses/$pkgname RUNTIME.LIBRARY.EXCEPTION } } - libcilkrts-devel_package() { depends="libcilkrts>=${_majorver}" short_desc+=" - Intel(R) Cilk(TM) Plus runtime library - development files" @@ -358,14 +341,12 @@ libcilkrts-devel_package() { vmove usr/lib/libcilkrts.spec } } - libcilkrts_package() { short_desc+=" - Intel(R) Cilk(TM) Plus runtime library" pkg_install() { vmove usr/lib/libcilkrts.so.* } } - libvtv-devel_package() { depends="libvtv>=${_majorver}" short_desc+=" - Vtable Verification Runtime Library - development files" @@ -374,7 +355,6 @@ libvtv-devel_package() { vmove usr/lib/libvtv.so } } - libvtv_package() { short_desc+=" - Vtable Verification Runtime Library" pkg_install() { @@ -392,14 +372,12 @@ libatomic-devel_package() { vmove usr/lib/libatomic.so } } - libatomic_package() { short_desc+=" - Atomics library" pkg_install() { vmove usr/lib/libatomic.so.* } } - libgcc_package() { short_desc+=" - GCC library" noverifyrdeps=yes @@ -408,7 +386,6 @@ libgcc_package() { vinstall ${wrksrc}/COPYING.RUNTIME 644 usr/share/licenses/$pkgname RUNTIME.LIBRARY.EXCEPTION } } - libgomp-devel_package() { depends="libgomp>=${_majorver}" short_desc+=" - OpenMP v4.0 library - development files" @@ -421,7 +398,6 @@ libgomp-devel_package() { touch ${PKGDESTDIR}/usr/share/info/dir } } - libgomp_package() { short_desc+=" - OpenMP v4.0 library" pkg_install() { @@ -429,7 +405,6 @@ libgomp_package() { vinstall ${wrksrc}/COPYING.RUNTIME 644 usr/share/licenses/$pkgname RUNTIME.LIBRARY.EXCEPTION } } - libitm-devel_package() { depends="libitm>=${_majorver}" short_desc+=" - Transactional Memory library - development files" @@ -442,15 +417,12 @@ libitm-devel_package() { touch ${PKGDESTDIR}/usr/share/info/dir } } - libitm_package() { short_desc+=" -Transactional Memory library" pkg_install() { vmove "usr/lib/libitm.so.*" } } - - libsanitizer-devel_package() { depends="libsanitizer>=${_majorver}" short_desc+=" - Sanitizer libraries - development files" @@ -461,14 +433,12 @@ libsanitizer-devel_package() { vmove usr/lib/libsanitizer.spec } } - libsanitizer_package() { short_desc+=" - Sanitizer libraries" pkg_install() { vmove "usr/lib/lib*san*.so.*" } } - libssp-devel_package() { depends="glibc-devel libssp>=${_majorver}" short_desc+=" - SSP (StackSmashingProtection) library - development files" @@ -477,7 +447,6 @@ libssp-devel_package() { vmove usr/lib/gcc/${_triplet}/${_majorver}/include/ssp } } - libssp_package() { short_desc+=" - SSP (StackSmashingProtection) library" pkg_install() { @@ -485,7 +454,6 @@ libssp_package() { vinstall ${wrksrc}/COPYING.RUNTIME 644 usr/share/licenses/$pkgname RUNTIME.LIBRARY.EXCEPTION } } - libstdc++-devel_package() { depends="libstdc++>=${_majorver}" short_desc+=" - Standard C++ Library - development files" @@ -495,7 +463,6 @@ libstdc++-devel_package() { vmove usr/include/c++ } } - libstdc++_package() { short_desc+=" - Standard C++ Library" pkg_install() { @@ -505,7 +472,6 @@ libstdc++_package() { vinstall ${wrksrc}/COPYING.RUNTIME 644 usr/share/licenses/$pkgname RUNTIME.LIBRARY.EXCEPTION } } - gcc-c++_package() { lib32disabled=yes depends="gcc>=${_majorver} libstdc++-devel>=${_majorver}"