diff --git a/srcpkgs/gcc/gcc-c++-multilib.template b/srcpkgs/gcc/gcc-c++-multilib.template index 2a612043ea..a518d2a389 100644 --- a/srcpkgs/gcc/gcc-c++-multilib.template +++ b/srcpkgs/gcc/gcc-c++-multilib.template @@ -7,7 +7,6 @@ long_desc=" On architectures with multilib support, the package contains files and dependencies for the non-default multilib architecture(s)." -revision=1 noverifyrdeps=yes Add_dependency run gcc-c++ ">=${_majorver}" diff --git a/srcpkgs/gcc/gcc-c++.template b/srcpkgs/gcc/gcc-c++.template index 7faf9b1b9f..0889bde23e 100644 --- a/srcpkgs/gcc/gcc-c++.template +++ b/srcpkgs/gcc/gcc-c++.template @@ -5,7 +5,6 @@ long_desc="${long_desc} This package contains GCC C++ support." -revision=1 Add_dependency run libelf Add_dependency run gcc ">=${_majorver}" diff --git a/srcpkgs/gcc/gcc-fortran.template b/srcpkgs/gcc/gcc-fortran.template index 1a72afcdce..61b533c5ff 100644 --- a/srcpkgs/gcc/gcc-fortran.template +++ b/srcpkgs/gcc/gcc-fortran.template @@ -5,7 +5,6 @@ long_desc="${long_desc} This package contains the GCC Fortran frontend." -revision=2 Add_dependency run gcc ">=${_majorver}" Add_dependency run libgfortran-devel ">=${_majorver}" diff --git a/srcpkgs/gcc/gcc-go.template b/srcpkgs/gcc/gcc-go.template index a6727477ec..cebb3e3642 100644 --- a/srcpkgs/gcc/gcc-go.template +++ b/srcpkgs/gcc/gcc-go.template @@ -5,7 +5,6 @@ long_desc="${long_desc} This package contains the GCC Go frontend." -revision=1 Add_dependency run gcc ">=${_majorver}" Add_dependency run libgo-devel ">=${_majorver}" diff --git a/srcpkgs/gcc/gcc-multilib.template b/srcpkgs/gcc/gcc-multilib.template index 530da9c1c0..7263627828 100644 --- a/srcpkgs/gcc/gcc-multilib.template +++ b/srcpkgs/gcc/gcc-multilib.template @@ -7,12 +7,12 @@ long_desc=" On architectures with multilib support, the package contains files and dependencies for the non-default multilib architecture(s)." -revision=1 noverifyrdeps=yes Add_dependency run gcc ">=${_majorver}" Add_dependency run libgcc32 ">=${_majorver}" Add_dependency run libgomp32 ">=${_majorver}" +Add_dependency run libitm32 ">=${_majorver}" Add_dependency run zlib32 Add_dependency run glibc32-devel @@ -20,6 +20,6 @@ do_install() { local libmddir="usr/lib/gcc/${_triplet}/${_majorver}" vmove ${libmddir}/32 ${libmddir} - vmove "usr/lib32/libssp*.a" ${libmddir}/32 + vmove "usr/lib32/libssp*.a" usr/lib32 vinstall host-${_triplet}/gcc/specs 644 ${libmddir} } diff --git a/srcpkgs/gcc/gcc-objc++.template b/srcpkgs/gcc/gcc-objc++.template index 724b351b16..338d451829 100644 --- a/srcpkgs/gcc/gcc-objc++.template +++ b/srcpkgs/gcc/gcc-objc++.template @@ -5,7 +5,6 @@ long_desc="${long_desc} This package contains GCC Objective-C++ support." -revision=1 Add_dependency run libelf Add_dependency run gcc-c++ ">=${_majorver}" diff --git a/srcpkgs/gcc/gcc-objc-multilib.template b/srcpkgs/gcc/gcc-objc-multilib.template index 09c98be165..50b833c634 100644 --- a/srcpkgs/gcc/gcc-objc-multilib.template +++ b/srcpkgs/gcc/gcc-objc-multilib.template @@ -8,7 +8,6 @@ long_desc=" On architectures with multilib support, the package contains files and dependencies for the non-default multilib architecture(s)." -revision=1 noverifyrdeps=yes Add_dependency run gcc-multilib ">=${_majorver}" diff --git a/srcpkgs/gcc/gcc-objc.template b/srcpkgs/gcc/gcc-objc.template index 50627399c6..b0abf18643 100644 --- a/srcpkgs/gcc/gcc-objc.template +++ b/srcpkgs/gcc/gcc-objc.template @@ -5,7 +5,6 @@ long_desc="${long_desc} This package contains GCC Objective-C support." -revision=1 Add_dependency run libelf Add_dependency run gcc ">=${_majorver}" diff --git a/srcpkgs/gcc/libgfortran-devel.template b/srcpkgs/gcc/libgfortran-devel.template index 5e86010c5d..f75e1b1831 100644 --- a/srcpkgs/gcc/libgfortran-devel.template +++ b/srcpkgs/gcc/libgfortran-devel.template @@ -5,7 +5,6 @@ long_desc="${long_desc} This package contains the GCC Fortran headers and static libraries." -revision=1 Add_dependency run libgfortran ">=${_majorver}" diff --git a/srcpkgs/gcc/libgfortran.rshlibs b/srcpkgs/gcc/libgfortran.rshlibs index 993effcf38..8c3e675b8d 100644 --- a/srcpkgs/gcc/libgfortran.rshlibs +++ b/srcpkgs/gcc/libgfortran.rshlibs @@ -1,3 +1,4 @@ libquadmath.so.0 libm.so.6 libc.so.6 +libgcc_s.so.1 diff --git a/srcpkgs/gcc/libgfortran.template b/srcpkgs/gcc/libgfortran.template index 944faad240..98d6531ac5 100644 --- a/srcpkgs/gcc/libgfortran.template +++ b/srcpkgs/gcc/libgfortran.template @@ -5,7 +5,6 @@ long_desc="${long_desc} This package contains the GCC Fortran shared library." -revision=1 do_install() { vmove "usr/lib/libgfortran.so*" usr/lib diff --git a/srcpkgs/gcc/libgo-devel.template b/srcpkgs/gcc/libgo-devel.template index 2ab4848a5b..498e455189 100644 --- a/srcpkgs/gcc/libgo-devel.template +++ b/srcpkgs/gcc/libgo-devel.template @@ -5,7 +5,6 @@ long_desc="${long_desc} This package contains the GCC Go headers and static libraries." -revision=1 Add_dependency run libgo ">=${_majorver}" diff --git a/srcpkgs/gcc/libgomp-devel.template b/srcpkgs/gcc/libgomp-devel.template index 429dfb7626..fc8082fee2 100644 --- a/srcpkgs/gcc/libgomp-devel.template +++ b/srcpkgs/gcc/libgomp-devel.template @@ -6,7 +6,6 @@ long_desc="${long_desc} This package contains GCC OpenMP headers and static libraries for OpenMP v3.0 support." -revision=1 Add_dependency run libgomp ">=${_majorver}" diff --git a/srcpkgs/gcc/libgomp.template b/srcpkgs/gcc/libgomp.template index 03919f0c46..ca88729937 100644 --- a/srcpkgs/gcc/libgomp.template +++ b/srcpkgs/gcc/libgomp.template @@ -6,7 +6,6 @@ long_desc="${long_desc} This package contains GCC shared support library which is needed for OpenMP v3.0 support." -revision=2 replaces="gcc>=4.6.3<4.6.3_3" do_install() { diff --git a/srcpkgs/gcc/libitm.rshlibs b/srcpkgs/gcc/libitm.rshlibs new file mode 100644 index 0000000000..f01ca453cc --- /dev/null +++ b/srcpkgs/gcc/libitm.rshlibs @@ -0,0 +1,3 @@ +libgcc_s.so.1 +libpthread.so.0 +libc.so.6 diff --git a/srcpkgs/gcc/libitm.template b/srcpkgs/gcc/libitm.template new file mode 100644 index 0000000000..2278e04ffb --- /dev/null +++ b/srcpkgs/gcc/libitm.template @@ -0,0 +1,13 @@ +# Template file for 'libitm'. +# +short_desc="GCC Transactional Memory support library" +long_desc="${long_desc} + + This package contains GCC support for Transactional Memory, which is + used when C code is built with -fgnu-tm flag." + +do_install() { + vmove "usr/lib/libitm.*" usr/lib + vmove usr/share/info/libitm.info usr/share/info + touch ${DESTDIR}/usr/share/info/dir +} diff --git a/srcpkgs/gcc/libitm32.template b/srcpkgs/gcc/libitm32.template new file mode 100644 index 0000000000..4bbe52226e --- /dev/null +++ b/srcpkgs/gcc/libitm32.template @@ -0,0 +1,15 @@ +# Template file for 'libitm'. +# +short_desc="GCC Transactional Memory support library (32bit)" +long_desc="${long_desc} + + This package contains GCC support for Transactional Memory, which is + used when C code is built with -fgnu-tm flag." + +noverifyrdeps=yes + +Add_dependency run libgcc32 + +do_install() { + vmove "usr/lib32/libitm*" usr/lib32 +} diff --git a/srcpkgs/gcc/libmudflap-devel.template b/srcpkgs/gcc/libmudflap-devel.template index 156970adfd..63f0f534c1 100644 --- a/srcpkgs/gcc/libmudflap-devel.template +++ b/srcpkgs/gcc/libmudflap-devel.template @@ -6,7 +6,6 @@ long_desc="${long_desc} This package contains GCC mudflap headers and static libraries for building mudflap-instrumented programs." -revision=1 Add_dependency run libmudflap ">=${_majorver}" diff --git a/srcpkgs/gcc/libmudflap.template b/srcpkgs/gcc/libmudflap.template index 5275477990..77c8010206 100644 --- a/srcpkgs/gcc/libmudflap.template +++ b/srcpkgs/gcc/libmudflap.template @@ -6,7 +6,6 @@ long_desc="${long_desc} This package contains GCC shared support library which is needed for mudflap support." -revision=1 do_install() { vmove "usr/lib/libmudflap*.so*" usr/lib diff --git a/srcpkgs/gcc/libobjc-devel.template b/srcpkgs/gcc/libobjc-devel.template index 96a80cf356..dccf051ff6 100644 --- a/srcpkgs/gcc/libobjc-devel.template +++ b/srcpkgs/gcc/libobjc-devel.template @@ -6,7 +6,6 @@ long_desc="${long_desc} This package contains GCC Objective-C headers and static libs, to build Objective-C programs." -revision=1 Add_dependency run libobjc ">=${_majorver}" diff --git a/srcpkgs/gcc/libquadmath-devel.template b/srcpkgs/gcc/libquadmath-devel.template index d80b21f7ed..b70f225c4d 100644 --- a/srcpkgs/gcc/libquadmath-devel.template +++ b/srcpkgs/gcc/libquadmath-devel.template @@ -6,7 +6,6 @@ long_desc="${long_desc} This package contains GCC quadmath headers and static libraries for building mudflap-instrumented programs." -revision=1 Add_dependency run libquadmath ">=${_majorver}" diff --git a/srcpkgs/gcc/libquadmath.template b/srcpkgs/gcc/libquadmath.template index ea30926330..73992d039d 100644 --- a/srcpkgs/gcc/libquadmath.template +++ b/srcpkgs/gcc/libquadmath.template @@ -5,7 +5,6 @@ long_desc="${long_desc} This package contains the GCC quadmath shared library." -revision=1 do_install() { vmove "usr/lib/libquadmath.so*" usr/lib diff --git a/srcpkgs/gcc/libssp-devel.template b/srcpkgs/gcc/libssp-devel.template index 25d87edf0e..e88f5c0449 100644 --- a/srcpkgs/gcc/libssp-devel.template +++ b/srcpkgs/gcc/libssp-devel.template @@ -6,7 +6,6 @@ long_desc="${long_desc} This package contains the Stack Smashing Protection development files provided by GCC." -revision=1 Add_dependency run glibc-devel Add_dependency run libssp ">=${_majorver}" diff --git a/srcpkgs/gcc/libssp.template b/srcpkgs/gcc/libssp.template index 31e0cbfc9a..552003f7e7 100644 --- a/srcpkgs/gcc/libssp.template +++ b/srcpkgs/gcc/libssp.template @@ -6,7 +6,6 @@ long_desc="${long_desc} This package contains the Stack Smashing Protection shared library provided by GCC." -revision=1 do_install() { vmove "usr/lib/libssp.so*" usr/lib diff --git a/srcpkgs/gcc/libstdc++-devel.template b/srcpkgs/gcc/libstdc++-devel.template index c88780c9a3..0c03234045 100644 --- a/srcpkgs/gcc/libstdc++-devel.template +++ b/srcpkgs/gcc/libstdc++-devel.template @@ -6,7 +6,6 @@ long_desc="${long_desc} This package contains GCC Header files and libraries for C++ development." -revision=1 Add_dependency run libstdc++ ">=${_majorver}" diff --git a/srcpkgs/gcc/template b/srcpkgs/gcc/template index 55b0e8efb4..212e71d5e0 100644 --- a/srcpkgs/gcc/template +++ b/srcpkgs/gcc/template @@ -1,14 +1,13 @@ # Template build file for 'gcc' pkgname=gcc -_majorver=4.6 -version=${_majorver}.3 -revision=3 +_majorver=4.7 +version=${_majorver}.0 distfiles="http://ftp.gnu.org/pub/gnu/gcc/gcc-$version/gcc-$version.tar.bz2" short_desc="The GNU C Compiler" maintainer="Juan RP " homepage="http://gcc.gnu.org" license="GFDL-1.2, GPL-3, LGPL-2.1" -checksum=e8f5853d4eec2f5ebaf8a72ae4d53c436aacf98153b2499f8635b48c4718a093 +checksum=a680083e016f656dab7acd45b9729912e70e71bbffcbf0e3e8aa1cccf19dc9a5 long_desc=" The GNU C Compiler, with support for building C code. @@ -16,9 +15,10 @@ long_desc=" for ObjectiveC++ install gcc-objc++, for Go install gcc-go, for Fortran install gcc-fortran." -Add_dependency run libgomp ">=${_majorver}" Add_dependency run binutils Add_dependency run libelf +Add_dependency run libgomp ">=${_majorver}" +Add_dependency run libitm ">=${_majorver}" Add_dependency run libssp-devel ">=${_majorver}" Add_dependency build perl @@ -39,7 +39,7 @@ if [ "${XBPS_MACHINE}" = "x86_64" ]; then subpackages="${subpackages} gcc-objc-multilib libgcc32 libgomp32" subpackages="${subpackages} libmudflap32-devel libmudflap32" subpackages="${subpackages} libobjc32 libssp32 libstdc++32-devel" - subpackages="${subpackages} libstdc++32" + subpackages="${subpackages} libstdc++32 libitm32" _triplet="${XBPS_MACHINE}-unknown-linux-gnu" else @@ -47,7 +47,7 @@ else fi subpackages="${subpackages} libgcc libgo libssp libssp-devel libstdc++ libstdc++-devel libgomp" -subpackages="${subpackages} libquadmath libquadmath-devel libgo-devel libgomp-devel" +subpackages="${subpackages} libquadmath libquadmath-devel libgo-devel libgomp-devel libitm" subpackages="${subpackages} libmudflap libmudflap-devel libobjc libobjc-devel" subpackages="${subpackages} libgfortran libgfortran-devel gcc-fortran" subpackages="${subpackages} gcc-c++ gcc-objc gcc-objc++ gcc-go" @@ -58,7 +58,7 @@ do_configure() { # Do not run fixincludes sed -i 's@\./fixinc\.sh@-c true@' gcc/Makefile.in - CONFIG_SHELL=/bin/bash ./configure --libexecdir=/usr/lib \ + ./configure --libexecdir=/usr/lib \ --enable-clocale=gnu --disable-bootstrap --libdir=/usr/lib \ --enable-threads=posix --enable-__cxa_atexit --enable-multilib \ --enable-languages=c,c++,objc,obj-c++,fortran,go,lto --enable-tls \ diff --git a/srcpkgs/libitm b/srcpkgs/libitm new file mode 120000 index 0000000000..b08d5af579 --- /dev/null +++ b/srcpkgs/libitm @@ -0,0 +1 @@ +gcc \ No newline at end of file diff --git a/srcpkgs/libitm32 b/srcpkgs/libitm32 new file mode 120000 index 0000000000..b08d5af579 --- /dev/null +++ b/srcpkgs/libitm32 @@ -0,0 +1 @@ +gcc \ No newline at end of file