diff --git a/srcpkgs/gcc/gcc-c++-multilib.template b/srcpkgs/gcc/gcc-c++-multilib.template index d9e8b89737f..60d57cac4da 100644 --- a/srcpkgs/gcc/gcc-c++-multilib.template +++ b/srcpkgs/gcc/gcc-c++-multilib.template @@ -1,16 +1,10 @@ # Template file for 'gcc-c++-multilib'. # -depends="gcc-c++>=${_majorver} gcc-multilib>=${_majorver} libstdc++32-devel>=${_majorver}" +depends="gcc-c++>=${_majorver} gcc-multilib>=${_majorver} + libstdc++32-devel>=${_majorver}" short_desc="GCC C++ compiler (multilib files)" -long_desc=" - This is the GNU C++ compiler, a fairly portable optimizing compiler for C++. - - On architectures with multilib support, the package contains files and - dependencies for the non-default multilib architecture(s)." - noverifyrdeps=yes - do_install() { local libmddir="usr/lib/gcc/${_triplet}/${_majorver}" diff --git a/srcpkgs/gcc/gcc-c++.template b/srcpkgs/gcc/gcc-c++.template index 9d263c6f1b9..bca5733e8d2 100644 --- a/srcpkgs/gcc/gcc-c++.template +++ b/srcpkgs/gcc/gcc-c++.template @@ -2,9 +2,6 @@ # depends="gcc>=${_majorver} libstdc++-devel>=${_majorver}" short_desc="GCC C++ support" -long_desc="${long_desc} - - This package contains GCC C++ support." do_install() { for f in g++ c++ ${_triplet}-g++ ${_triplet}-c++; do diff --git a/srcpkgs/gcc/gcc-fortran.template b/srcpkgs/gcc/gcc-fortran.template index 0a32934ac59..2c910a086ae 100644 --- a/srcpkgs/gcc/gcc-fortran.template +++ b/srcpkgs/gcc/gcc-fortran.template @@ -2,11 +2,6 @@ # depends="gcc>=${_majorver} libgfortran-devel>=${_majorver}" short_desc="GCC Fortran compiler frontend" -long_desc="${long_desc} - - This package contains the GCC Fortran frontend." - - do_install() { for f in gfortran ${_triplet}-gfortran; do diff --git a/srcpkgs/gcc/gcc-go.template b/srcpkgs/gcc/gcc-go.template index e4194069fa6..60896282b38 100644 --- a/srcpkgs/gcc/gcc-go.template +++ b/srcpkgs/gcc/gcc-go.template @@ -2,14 +2,8 @@ # depends="gcc>=${_majorver} libgo-devel>=${_majorver}" short_desc="GCC Go compiler frontend" -long_desc="${long_desc} - This package contains the GCC Go frontend." - - - -do_install() -{ +do_install() { for f in gccgo ${_triplet}-gccgo; do vmove usr/bin/${f} usr/bin done diff --git a/srcpkgs/gcc/gcc-multilib.template b/srcpkgs/gcc/gcc-multilib.template index 3ff24e00782..bb7b0fd7cb2 100644 --- a/srcpkgs/gcc/gcc-multilib.template +++ b/srcpkgs/gcc/gcc-multilib.template @@ -1,16 +1,10 @@ # Template file for 'gcc-c-multilib'. # -depends="gcc>=${_majorver} libgcc32>=${_majorver} libgomp32>=${_majorver} libitm32>=${_majorver} zlib32 glibc32-devel" +depends="gcc>=${_majorver} libgcc32>=${_majorver} libgomp32>=${_majorver} + libitm32>=${_majorver} zlib32 glibc32-devel" short_desc="GCC C compiler (multilib files)" -long_desc=" - This is the GNU C compiler, a fairly portable optimizing compiler for C. - - On architectures with multilib support, the package contains files and - dependencies for the non-default multilib architecture(s)." - noverifyrdeps=yes - do_install() { local libmddir="usr/lib/gcc/${_triplet}/${_majorver}" diff --git a/srcpkgs/gcc/gcc-objc++.template b/srcpkgs/gcc/gcc-objc++.template index f849bd62d01..5fd988e052c 100644 --- a/srcpkgs/gcc/gcc-objc++.template +++ b/srcpkgs/gcc/gcc-objc++.template @@ -2,9 +2,6 @@ # depends="gcc-c++>=${_majorver} gcc-objc>=${_majorver}" short_desc="GCC Objective-C++ support" -long_desc="${long_desc} - - This package contains GCC Objective-C++ support." do_install() { vmove usr/lib/gcc/${_triplet}/${_majorver}/cc1objplus \ diff --git a/srcpkgs/gcc/gcc-objc-multilib.template b/srcpkgs/gcc/gcc-objc-multilib.template index 365c27bf3ee..3dc612cb979 100644 --- a/srcpkgs/gcc/gcc-objc-multilib.template +++ b/srcpkgs/gcc/gcc-objc-multilib.template @@ -2,16 +2,8 @@ # depends="gcc-multilib>=${_majorver} gcc-objc>=${_majorver} libobjc32>=${_majorver}" short_desc="The GNU Objective-C compiler (multilib files)" -long_desc=" - This is the GNU Objective-C compiler, which compiles Objective-C on - platforms supported by the GCC compiler. - - On architectures with multilib support, the package contains files and - dependencies for the non-default multilib architecture(s)." - noverifyrdeps=yes - do_install() { local libmddir="/usr/lib/gcc/${_triplet}/${_majorver}" diff --git a/srcpkgs/gcc/gcc-objc.template b/srcpkgs/gcc/gcc-objc.template index eb733aa553f..b47642746e2 100644 --- a/srcpkgs/gcc/gcc-objc.template +++ b/srcpkgs/gcc/gcc-objc.template @@ -2,9 +2,6 @@ # depends="gcc>=${_majorver} libobjc>=${_majorver}" short_desc="GCC Objective-C support" -long_desc="${long_desc} - - This package contains GCC Objective-C support." do_install() { vmove usr/lib/gcc/${_triplet}/${_majorver}/include/objc \ diff --git a/srcpkgs/gcc/libgcc.template b/srcpkgs/gcc/libgcc.template index c97e1a15dfe..68240819734 100644 --- a/srcpkgs/gcc/libgcc.template +++ b/srcpkgs/gcc/libgcc.template @@ -1,10 +1,6 @@ # Template file for 'gcc-libgcc'. # short_desc="GCC version ${version} shared library support" -long_desc="${long_desc} - - This package contains the GCC shared library." - noverifyrdeps=yes do_install() diff --git a/srcpkgs/gcc/libgcc32.template b/srcpkgs/gcc/libgcc32.template index 67ab4771f2d..f121b02bb3d 100644 --- a/srcpkgs/gcc/libgcc32.template +++ b/srcpkgs/gcc/libgcc32.template @@ -1,10 +1,6 @@ # Template file for 'libgcc32'. # short_desc="GCC version ${version} shared library support (32bit)" -long_desc="${long_desc} - - This package contains the 32bit GCC shared library for x86_64 systems." - noverifyrdeps=yes do_install() { diff --git a/srcpkgs/gcc/libgfortran-devel.template b/srcpkgs/gcc/libgfortran-devel.template index 196c29304ba..13b1a7eaa09 100644 --- a/srcpkgs/gcc/libgfortran-devel.template +++ b/srcpkgs/gcc/libgfortran-devel.template @@ -2,11 +2,6 @@ # depends="libgfortran>=${_majorver}" short_desc="GCC Fortran library ${version} - development files" -long_desc="${long_desc} - - This package contains the GCC Fortran headers and static libraries." - - do_install() { # create version -> major symlink diff --git a/srcpkgs/gcc/libgfortran.template b/srcpkgs/gcc/libgfortran.template index 98d6531ac57..1ce34865e4a 100644 --- a/srcpkgs/gcc/libgfortran.template +++ b/srcpkgs/gcc/libgfortran.template @@ -1,10 +1,6 @@ # Template file for 'libgfortran'. # short_desc="GCC Fortran library ${version} shared library support" -long_desc="${long_desc} - - This package contains the GCC Fortran shared library." - do_install() { vmove "usr/lib/libgfortran.so*" usr/lib diff --git a/srcpkgs/gcc/libgo-devel.template b/srcpkgs/gcc/libgo-devel.template index b540a857d05..a035b3925c5 100644 --- a/srcpkgs/gcc/libgo-devel.template +++ b/srcpkgs/gcc/libgo-devel.template @@ -2,11 +2,6 @@ # depends="libgo>=${_majorver}" short_desc="GCC Go library ${version} shared library support - development files" -long_desc="${long_desc} - - This package contains the GCC Go headers and static libraries." - - do_install() { vmove usr/lib/libgo.a usr/lib diff --git a/srcpkgs/gcc/libgo.template b/srcpkgs/gcc/libgo.template index 402372ab552..e1dd872df45 100644 --- a/srcpkgs/gcc/libgo.template +++ b/srcpkgs/gcc/libgo.template @@ -1,9 +1,6 @@ # Template file for 'libgo'. # short_desc="Go library ${version} shared library support" -long_desc="${long_desc} - - This package contains the GO shared library." do_install() { vmove "usr/lib/libgo.so*" usr/lib diff --git a/srcpkgs/gcc/libgomp.template b/srcpkgs/gcc/libgomp.template index ca887299372..c03c95fd14c 100644 --- a/srcpkgs/gcc/libgomp.template +++ b/srcpkgs/gcc/libgomp.template @@ -1,11 +1,6 @@ # Template file for 'libgomp'. # short_desc="GCC OpenMP v3.0 shared support library" -long_desc="${long_desc} - - This package contains GCC shared support library which is needed - for OpenMP v3.0 support." - replaces="gcc>=4.6.3<4.6.3_3" do_install() { diff --git a/srcpkgs/gcc/libgomp32.template b/srcpkgs/gcc/libgomp32.template index e3c768b2d7e..af597a3f4e3 100644 --- a/srcpkgs/gcc/libgomp32.template +++ b/srcpkgs/gcc/libgomp32.template @@ -2,14 +2,8 @@ # depends="libgcc32 glibc32" short_desc="GCC OpenMP v3.0 shared support library (32bit)" -long_desc="${long_desc} - - This package contains the 32bit GCC shared support library which is needed - for OpenMP v3.0 support." - noverifyrdeps=yes - do_install() { vmove "usr/lib32/libgomp.*" usr/lib32 } diff --git a/srcpkgs/gcc/libitm.template b/srcpkgs/gcc/libitm.template index 2278e04ffb0..33e25863fcd 100644 --- a/srcpkgs/gcc/libitm.template +++ b/srcpkgs/gcc/libitm.template @@ -1,10 +1,6 @@ # 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 diff --git a/srcpkgs/gcc/libitm32.template b/srcpkgs/gcc/libitm32.template index 5bc38780de9..860ed9b8060 100644 --- a/srcpkgs/gcc/libitm32.template +++ b/srcpkgs/gcc/libitm32.template @@ -2,14 +2,8 @@ # depends="libgcc32" 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 - do_install() { vmove "usr/lib32/libitm*" usr/lib32 } diff --git a/srcpkgs/gcc/libmudflap-devel.template b/srcpkgs/gcc/libmudflap-devel.template index 3a356275b47..921e04fe86e 100644 --- a/srcpkgs/gcc/libmudflap-devel.template +++ b/srcpkgs/gcc/libmudflap-devel.template @@ -2,12 +2,6 @@ # depends="libmudflap>=${_majorver}" short_desc="GCC mudflap shared support library (development files)" -long_desc="${long_desc} - - This package contains GCC mudflap headers and static libraries for - building mudflap-instrumented programs." - - do_install() { vmove "usr/lib/libmudflap*.a" usr/lib diff --git a/srcpkgs/gcc/libmudflap.template b/srcpkgs/gcc/libmudflap.template index 77c8010206c..5d4f532740c 100644 --- a/srcpkgs/gcc/libmudflap.template +++ b/srcpkgs/gcc/libmudflap.template @@ -1,11 +1,6 @@ # Template file for 'gcc-libmudflap'. # short_desc="GCC mudflap shared support library" -long_desc="${long_desc} - - This package contains GCC shared support library which is needed - for mudflap support." - do_install() { vmove "usr/lib/libmudflap*.so*" usr/lib diff --git a/srcpkgs/gcc/libmudflap32-devel.template b/srcpkgs/gcc/libmudflap32-devel.template index eb29093e185..d16681b91a5 100644 --- a/srcpkgs/gcc/libmudflap32-devel.template +++ b/srcpkgs/gcc/libmudflap32-devel.template @@ -2,12 +2,6 @@ # depends="gcc-multilib glibc32-devel libmudflap32" short_desc="GCC 32bit mudflap support libraries (development files)" -long_desc=" - The libmudflap libraries are used by GCC for instrumenting pointer - and array dereferencing operations. - - This package contains the headers and the static libraries." - do_install() { vmove "usr/lib32/libmudflap*.a" usr/lib32 diff --git a/srcpkgs/gcc/libmudflap32.template b/srcpkgs/gcc/libmudflap32.template index 8b37f42c007..08e4ac63288 100644 --- a/srcpkgs/gcc/libmudflap32.template +++ b/srcpkgs/gcc/libmudflap32.template @@ -2,13 +2,8 @@ # depends="gcc-multilib glibc32" short_desc="GCC mudflap shared support libraries (32bit)" -long_desc=" - The libmudflap libraries are used by GCC for instrumenting pointer - and array dereferencing operations." - noverifyrdeps=yes - do_install() { vmove "usr/lib32/libmudflap*.so*" usr/lib32 } diff --git a/srcpkgs/gcc/libobjc-devel.template b/srcpkgs/gcc/libobjc-devel.template index bfd59cbbae9..5b4eab39a3d 100644 --- a/srcpkgs/gcc/libobjc-devel.template +++ b/srcpkgs/gcc/libobjc-devel.template @@ -2,12 +2,6 @@ # depends="libobjc>=${_majorver}" short_desc="GCC Objective-C shared library support (development files)" -long_desc="${long_desc} - - This package contains GCC Objective-C headers and static libs, to - build Objective-C programs." - - do_install() { vmove "usr/lib/libobjc.*a" usr/lib diff --git a/srcpkgs/gcc/libobjc.template b/srcpkgs/gcc/libobjc.template index 2ed3a901d7f..6dfe610c158 100644 --- a/srcpkgs/gcc/libobjc.template +++ b/srcpkgs/gcc/libobjc.template @@ -1,10 +1,6 @@ # Template file for 'libobjc'. # short_desc="GCC Objective-C shared library support" -long_desc="${long_desc} - - This package contains GCC Objective-C shared support library which is needed - to run Objective-C dynamically linked programs." do_install() { vmove "usr/lib/libobjc.so*" usr/lib diff --git a/srcpkgs/gcc/libobjc32.template b/srcpkgs/gcc/libobjc32.template index 18da2646bed..2ae4a9ee719 100644 --- a/srcpkgs/gcc/libobjc32.template +++ b/srcpkgs/gcc/libobjc32.template @@ -2,14 +2,8 @@ # depends="libgcc32 glibc32" short_desc="GCC Objective-C shared library support (32bit)" -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." - noverifyrdeps=yes - do_install() { vmove "usr/lib32/libobjc.so*" usr/lib32 } diff --git a/srcpkgs/gcc/libquadmath-devel.template b/srcpkgs/gcc/libquadmath-devel.template index c9e7c7bb406..f28e2056e90 100644 --- a/srcpkgs/gcc/libquadmath-devel.template +++ b/srcpkgs/gcc/libquadmath-devel.template @@ -2,12 +2,6 @@ # depends="libquadmath>=${_majorver}" short_desc="GCC quadmath shared support library (development files)" -long_desc="${long_desc} - - This package contains GCC quadmath headers and static libraries for - building mudflap-instrumented programs." - - do_install() { vmove "usr/lib/libquadmath*.a" usr/lib diff --git a/srcpkgs/gcc/libquadmath.template b/srcpkgs/gcc/libquadmath.template index 73992d039d9..2af2d681d4e 100644 --- a/srcpkgs/gcc/libquadmath.template +++ b/srcpkgs/gcc/libquadmath.template @@ -1,10 +1,6 @@ # Template file for 'libquadmath' # short_desc="GCC quad match ${version} shared library support" -long_desc="${long_desc} - - This package contains the GCC quadmath shared library." - do_install() { vmove "usr/lib/libquadmath.so*" usr/lib diff --git a/srcpkgs/gcc/libssp.template b/srcpkgs/gcc/libssp.template index 552003f7e74..cc58bee8d3a 100644 --- a/srcpkgs/gcc/libssp.template +++ b/srcpkgs/gcc/libssp.template @@ -1,11 +1,6 @@ # Template file for 'libssp'. # short_desc="GCC SSP shared library support" -long_desc="${long_desc} - - This package contains the Stack Smashing Protection shared library - provided by GCC." - do_install() { vmove "usr/lib/libssp.so*" usr/lib diff --git a/srcpkgs/gcc/libssp32.template b/srcpkgs/gcc/libssp32.template index 52caa09aa9d..296d45f4d2d 100644 --- a/srcpkgs/gcc/libssp32.template +++ b/srcpkgs/gcc/libssp32.template @@ -2,14 +2,8 @@ # depends="glibc32" short_desc="GCC SSP shared library support (32bit)" -long_desc="${long_desc} - - This package contains the 32bit Stack Smashing Protection shared library - provided by GCC." - noverifyrdeps=yes - do_install() { vmove "usr/lib32/libssp.so*" usr/lib32 } diff --git a/srcpkgs/gcc/libstdc++-devel.template b/srcpkgs/gcc/libstdc++-devel.template index 9bfbd3b7cca..0da15059f85 100644 --- a/srcpkgs/gcc/libstdc++-devel.template +++ b/srcpkgs/gcc/libstdc++-devel.template @@ -2,12 +2,6 @@ # depends="libstdc++>=${_majorver}" short_desc="GCC Standard C++ Library (development files)" -long_desc="${long_desc} - - This package contains GCC Header files and libraries for - C++ development." - - do_install() { vmove "usr/lib/libstdc++.*a" usr/lib diff --git a/srcpkgs/gcc/libstdc++.template b/srcpkgs/gcc/libstdc++.template index 3433faa2b7b..a8bfc290c02 100644 --- a/srcpkgs/gcc/libstdc++.template +++ b/srcpkgs/gcc/libstdc++.template @@ -1,10 +1,6 @@ # Template file for 'gcc-libstdc++'. # short_desc="GCC Standard C++ Library" -long_desc="${long_desc} - - This package contains a rewritten standard compliant GCC Standard - C++ library." do_install() { vmove "usr/lib/libstdc++.so*" usr/lib diff --git a/srcpkgs/gcc/libstdc++32-devel.template b/srcpkgs/gcc/libstdc++32-devel.template index 13e0e5f8312..846cf6691d2 100644 --- a/srcpkgs/gcc/libstdc++32-devel.template +++ b/srcpkgs/gcc/libstdc++32-devel.template @@ -2,14 +2,8 @@ # depends="libstdc++-devel libstdc++32" short_desc="GCC Standard C++ Library (32bit) development files" -long_desc="${long_desc} - - This package contains a rewritten 32bit standard compliant GCC Standard - C++ development files and headers for x86_64 systems." - noverifyrdeps=yes - do_install() { vmove usr/include/c++/${_majorver}/${_triplet}/32 \ usr/include/c++/${_majorver}/${_triplet} diff --git a/srcpkgs/gcc/libstdc++32.template b/srcpkgs/gcc/libstdc++32.template index d5c66fc3287..482de5c3a54 100644 --- a/srcpkgs/gcc/libstdc++32.template +++ b/srcpkgs/gcc/libstdc++32.template @@ -2,14 +2,8 @@ # depends="libgcc32 glibc32 libstdc++" short_desc="GCC Standard C++ Library (32bit)" -long_desc="${long_desc} - - This package contains a rewritten standard compliant GCC Standard - C++ library 32bit for x86_64 systems." - noverifyrdeps=yes - do_install() { vmove "usr/lib32/libstdc++.so*" usr/lib32 } diff --git a/srcpkgs/gcc/template b/srcpkgs/gcc/template index 28fec57c2c1..2539cd9cd45 100644 --- a/srcpkgs/gcc/template +++ b/srcpkgs/gcc/template @@ -2,8 +2,9 @@ pkgname=gcc _majorver=4.7 version=${_majorver}.2 -revision=1 -makedepends="perl flex zlib-devel gmp-devel mpfr-devel mpc-devel ppl-devel>=1.0 cloog-devel" +revision=2 +makedepends="perl flex zlib-devel gmp-devel mpfr-devel mpc-devel + ppl-devel>=1.0 cloog-devel" short_desc="The GNU C Compiler" maintainer="Juan RP " homepage="http://gcc.gnu.org" @@ -11,19 +12,12 @@ license="GFDL-1.2, GPL-3, LGPL-2.1" distfiles="http://ftp.gnu.org/pub/gnu/gcc/gcc-$version/gcc-$version.tar.bz2" depends="binutils libgomp>=${_majorver} libitm>=${_majorver} libssp-devel>=${_majorver}" checksum=8a9283d7010fb9fe5ece3ca507e0af5c19412626384f8a5e9434251ae100b084 -long_desc=" - The GNU C Compiler, with support for building C code. - - For C++ install gcc-c++, for ObjectiveC install gcc-objc, - for ObjectiveC++ install gcc-objc++, for Go install gcc-go, - for Fortran install gcc-fortran." if [ "${XBPS_MACHINE}" = "x86_64" ]; then # Required stuff for multilib packages. makedepends="${makedepends} glibc32-devel" - subpackages="gcc-multilib gcc-c++-multilib" - subpackages="${subpackages} gcc-objc-multilib libgcc32 libgomp32" - subpackages="${subpackages} libmudflap32-devel libmudflap32" + subpackages="gcc-multilib gcc-c++-multilib gcc-objc-multilib libgcc32" + subpackages="${subpackages} libgomp32 libmudflap32-devel libmudflap32" subpackages="${subpackages} libobjc32 libssp32 libstdc++32-devel" subpackages="${subpackages} libstdc++32 libitm32" @@ -32,11 +26,13 @@ else _triplet="${XBPS_MACHINE}-pc-linux-gnu" fi -subpackages="${subpackages} libgcc libgo libssp libssp-devel libstdc++ libstdc++-devel libgomp" -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" +disable_debug=yes + +subpackages="${subpackages} libgcc libgo libssp libssp-devel libstdc++ + libstdc++-devel libgomp libquadmath libquadmath-devel libgo-devel + libgomp-devel libitm libmudflap libmudflap-devel libobjc + libobjc-devel libgfortran libgfortran-devel gcc-fortran gcc-c++ + gcc-objc gcc-objc++ gcc-go" do_configure() { # As specified in the LFS book, disable installing libiberty.