diff --git a/srcpkgs/gcc/gcc-c++.template b/srcpkgs/gcc/gcc-c++.template index 853e5f4337..9d263c6f1b 100644 --- a/srcpkgs/gcc/gcc-c++.template +++ b/srcpkgs/gcc/gcc-c++.template @@ -1,15 +1,12 @@ # Template file for 'gcc-c++'. # -depends="libelf gcc>=${_majorver} libstdc++-devel>=${_majorver}" +depends="gcc>=${_majorver} libstdc++-devel>=${_majorver}" short_desc="GCC C++ support" long_desc="${long_desc} This package contains GCC C++ support." - - -do_install() -{ +do_install() { for f in g++ c++ ${_triplet}-g++ ${_triplet}-c++; do vmove usr/bin/${f} usr/bin done diff --git a/srcpkgs/gcc/gcc-objc++.template b/srcpkgs/gcc/gcc-objc++.template index 6bbf625ab8..f849bd62d0 100644 --- a/srcpkgs/gcc/gcc-objc++.template +++ b/srcpkgs/gcc/gcc-objc++.template @@ -1,13 +1,11 @@ # Template file for 'gcc-objc++'. # -depends="libelf gcc-c++>=${_majorver} gcc-objc>=${_majorver}" +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 \ usr/lib/gcc/${_triplet}/${_majorver} diff --git a/srcpkgs/gcc/gcc-objc.template b/srcpkgs/gcc/gcc-objc.template index c72b6a8b31..eb733aa553 100644 --- a/srcpkgs/gcc/gcc-objc.template +++ b/srcpkgs/gcc/gcc-objc.template @@ -1,13 +1,11 @@ # Template file for 'gcc-objc'. # -depends="libelf gcc>=${_majorver} libobjc>=${_majorver}" +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 \ usr/lib/gcc/${_triplet}/${_majorver}/include diff --git a/srcpkgs/gcc/template b/srcpkgs/gcc/template index 39a979acb5..ca4c268515 100644 --- a/srcpkgs/gcc/template +++ b/srcpkgs/gcc/template @@ -2,9 +2,8 @@ pkgname=gcc _majorver=4.7 version=${_majorver}.1 -revision=3 -makedepends="perl flex zlib-devel gmp-devel mpfr-devel mpc-devel -ppl-devel>=1.0 cloog-devel libelf-devel" +revision=4 +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"