gcc: require >= majorver to make it work with chroot-gcc vpkgs.

This commit is contained in:
Juan RP 2012-03-02 08:22:21 +01:00
parent 5ab134f6a3
commit 4cc478a220
25 changed files with 77 additions and 79 deletions

View file

@ -7,11 +7,12 @@ long_desc="
On architectures with multilib support, the package contains files and On architectures with multilib support, the package contains files and
dependencies for the non-default multilib architecture(s)." dependencies for the non-default multilib architecture(s)."
revision=1
noverifyrdeps=yes noverifyrdeps=yes
Add_dependency run gcc-c++ ">=${version}" Add_dependency run gcc-c++ ">=${_majorver}"
Add_dependency run gcc-multilib ">=${version}" Add_dependency run gcc-multilib ">=${_majorver}"
Add_dependency run libstdc++32-devel ">=${version}" Add_dependency run libstdc++32-devel ">=${_majorver}"
do_install() { do_install() {
local libmddir="usr/lib/gcc/${_triplet}/${_majorver}" local libmddir="usr/lib/gcc/${_triplet}/${_majorver}"

View file

@ -5,9 +5,11 @@ long_desc="${long_desc}
This package contains GCC C++ support." This package contains GCC C++ support."
revision=1
Add_dependency run libelf Add_dependency run libelf
Add_dependency run gcc ">=$version" Add_dependency run gcc ">=${_majorver}"
Add_dependency run libstdc++-devel ">=$version" Add_dependency run libstdc++-devel ">=${_majorver}"
do_install() do_install()
{ {

View file

@ -5,11 +5,10 @@ long_desc="${long_desc}
This package contains the GCC Fortran frontend." This package contains the GCC Fortran frontend."
revision=1 revision=2
Add_dependency run libgcc ">=$version" Add_dependency run gcc ">=${_majorver}"
Add_dependency run libgfortran ">=$version" Add_dependency run libgfortran-devel ">=${_majorver}"
Add_dependency run gcc ">=$version"
do_install() { do_install() {
for f in gfortran ${_triplet}-gfortran; do for f in gfortran ${_triplet}-gfortran; do

View file

@ -5,8 +5,10 @@ long_desc="${long_desc}
This package contains the GCC Go frontend." This package contains the GCC Go frontend."
Add_dependency run gcc ">=$version" revision=1
Add_dependency run libgo-devel ">=$version"
Add_dependency run gcc ">=${_majorver}"
Add_dependency run libgo-devel ">=${_majorver}"
do_install() do_install()
{ {

View file

@ -7,11 +7,12 @@ long_desc="
On architectures with multilib support, the package contains files and On architectures with multilib support, the package contains files and
dependencies for the non-default multilib architecture(s)." dependencies for the non-default multilib architecture(s)."
revision=1
noverifyrdeps=yes noverifyrdeps=yes
Add_dependency run gcc ">=${version}" Add_dependency run gcc ">=${_majorver}"
Add_dependency run libgcc32 ">=${version}" Add_dependency run libgcc32 ">=${_majorver}"
Add_dependency run libgomp32 ">=${version}" Add_dependency run libgomp32 ">=${_majorver}"
Add_dependency run zlib32 Add_dependency run zlib32
Add_dependency run glibc32-devel Add_dependency run glibc32-devel

View file

@ -5,13 +5,13 @@ long_desc="${long_desc}
This package contains GCC Objective-C++ support." This package contains GCC Objective-C++ support."
revision=1
Add_dependency run libelf Add_dependency run libelf
Add_dependency run gcc-c++ ">=$version" Add_dependency run gcc-c++ ">=${_majorver}"
Add_dependency run gcc-objc ">=$version" Add_dependency run gcc-objc ">=${_majorver}"
do_install() do_install() {
{
vmove usr/lib/gcc/${_triplet}/${_majorver}/cc1objplus \ vmove usr/lib/gcc/${_triplet}/${_majorver}/cc1objplus \
usr/lib/gcc/${_triplet}/${_majorver} usr/lib/gcc/${_triplet}/${_majorver}
} }

View file

@ -8,11 +8,12 @@ long_desc="
On architectures with multilib support, the package contains files and On architectures with multilib support, the package contains files and
dependencies for the non-default multilib architecture(s)." dependencies for the non-default multilib architecture(s)."
revision=1
noverifyrdeps=yes noverifyrdeps=yes
Add_dependency run gcc-multilib ">=${version}" Add_dependency run gcc-multilib ">=${_majorver}"
Add_dependency run gcc-objc ">=${version}" Add_dependency run gcc-objc ">=${_majorver}"
Add_dependency run libobjc32 ">=${version}" Add_dependency run libobjc32 ">=${_majorver}"
do_install() { do_install() {
local libmddir="/usr/lib/gcc/${_triplet}/${_majorver}" local libmddir="/usr/lib/gcc/${_triplet}/${_majorver}"

View file

@ -5,13 +5,13 @@ long_desc="${long_desc}
This package contains GCC Objective-C support." This package contains GCC Objective-C support."
revision=1
Add_dependency run libelf Add_dependency run libelf
Add_dependency run gcc ">=$version" Add_dependency run gcc ">=${_majorver}"
Add_dependency run libobjc ">=$version" Add_dependency run libobjc ">=${_majorver}"
do_install() do_install() {
{
vmove usr/lib/gcc/${_triplet}/${_majorver}/include/objc \ vmove usr/lib/gcc/${_triplet}/${_majorver}/include/objc \
usr/lib/gcc/${_triplet}/${_majorver}/include usr/lib/gcc/${_triplet}/${_majorver}/include
vmove usr/lib/gcc/${_triplet}/${_majorver}/cc1obj \ vmove usr/lib/gcc/${_triplet}/${_majorver}/cc1obj \

View file

@ -5,11 +5,11 @@ long_desc="${long_desc}
This package contains the GCC Fortran headers and static libraries." This package contains the GCC Fortran headers and static libraries."
revision=1
Add_dependency run libgfortran ">=${version}" Add_dependency run libgfortran ">=${_majorver}"
do_install() do_install() {
{
# create version -> major symlink # create version -> major symlink
vmkdir usr/lib/gcc/${_triplet}/${_majorver} vmkdir usr/lib/gcc/${_triplet}/${_majorver}
ln -sf /usr/lib/gcc/${_triplet}/${_majorver} \ ln -sf /usr/lib/gcc/${_triplet}/${_majorver} \

View file

@ -5,10 +5,9 @@ long_desc="${long_desc}
This package contains the GCC Fortran shared library." This package contains the GCC Fortran shared library."
Add_dependency run libgcc ">=$version" revision=1
do_install() do_install() {
{
vmove "usr/lib/libgfortran.so*" usr/lib vmove "usr/lib/libgfortran.so*" usr/lib
vmove usr/lib/libgfortran.spec usr/lib vmove usr/lib/libgfortran.spec usr/lib
vinstall COPYING.RUNTIME 644 \ vinstall COPYING.RUNTIME 644 \

View file

@ -5,10 +5,11 @@ long_desc="${long_desc}
This package contains the GCC Go headers and static libraries." This package contains the GCC Go headers and static libraries."
Add_dependency run libgo ">=${version}" revision=1
do_install() Add_dependency run libgo ">=${_majorver}"
{
do_install() {
vmove usr/lib/libgo.a usr/lib vmove usr/lib/libgo.a usr/lib
vmove usr/lib/libgobegin.a usr/lib vmove usr/lib/libgobegin.a usr/lib
} }

View file

@ -5,9 +5,7 @@ long_desc="${long_desc}
This package contains the GO shared library." This package contains the GO shared library."
do_install() {
do_install()
{
vmove "usr/lib/libgo.so*" usr/lib vmove "usr/lib/libgo.so*" usr/lib
vinstall COPYING.RUNTIME 644 \ vinstall COPYING.RUNTIME 644 \
usr/share/licenses/$pkgname RUNTIME.LIBRARY.EXCEPTION usr/share/licenses/$pkgname RUNTIME.LIBRARY.EXCEPTION

View file

@ -6,10 +6,11 @@ long_desc="${long_desc}
This package contains GCC OpenMP headers and static libraries This package contains GCC OpenMP headers and static libraries
for OpenMP v3.0 support." for OpenMP v3.0 support."
Add_dependency run libgomp ">=${version}" revision=1
do_install() Add_dependency run libgomp ">=${_majorver}"
{
do_install() {
vmove usr/lib/libgomp.a usr/lib vmove usr/lib/libgomp.a usr/lib
vmove usr/share/info/libgomp.info usr/share/info vmove usr/share/info/libgomp.info usr/share/info
touch ${DESTDIR}/usr/share/info/dir touch ${DESTDIR}/usr/share/info/dir

View file

@ -6,10 +6,9 @@ long_desc="${long_desc}
This package contains GCC shared support library which is needed This package contains GCC shared support library which is needed
for OpenMP v3.0 support." for OpenMP v3.0 support."
Add_dependency run libgcc ">=${version}" revision=1
do_install() do_install() {
{
vmove "usr/lib/libgomp*.so*" usr/lib vmove "usr/lib/libgomp*.so*" usr/lib
vmove usr/lib/libgomp.spec usr/lib vmove usr/lib/libgomp.spec usr/lib
vinstall COPYING.RUNTIME 644 \ vinstall COPYING.RUNTIME 644 \

View file

@ -6,9 +6,10 @@ long_desc="${long_desc}
This package contains GCC mudflap headers and static libraries for This package contains GCC mudflap headers and static libraries for
building mudflap-instrumented programs." building mudflap-instrumented programs."
Add_dependency run libmudflap ">=$version" revision=1
do_install() Add_dependency run libmudflap ">=${_majorver}"
{
do_install() {
vmove "usr/lib/libmudflap*.a" usr/lib vmove "usr/lib/libmudflap*.a" usr/lib
} }

View file

@ -6,10 +6,9 @@ long_desc="${long_desc}
This package contains GCC shared support library which is needed This package contains GCC shared support library which is needed
for mudflap support." for mudflap support."
Add_dependency run libgcc ">=${version}" revision=1
do_install() do_install() {
{
vmove "usr/lib/libmudflap*.so*" usr/lib vmove "usr/lib/libmudflap*.so*" usr/lib
vinstall COPYING.RUNTIME 644 \ vinstall COPYING.RUNTIME 644 \
usr/share/licenses/$pkgname RUNTIME.LIBRARY.EXCEPTION usr/share/licenses/$pkgname RUNTIME.LIBRARY.EXCEPTION

View file

@ -6,9 +6,10 @@ long_desc="${long_desc}
This package contains GCC Objective-C headers and static libs, to This package contains GCC Objective-C headers and static libs, to
build Objective-C programs." build Objective-C programs."
Add_dependency run libobjc ">=$version" revision=1
do_install() Add_dependency run libobjc ">=${_majorver}"
{
do_install() {
vmove "usr/lib/libobjc.*a" usr/lib vmove "usr/lib/libobjc.*a" usr/lib
} }

View file

@ -6,9 +6,7 @@ long_desc="${long_desc}
This package contains GCC Objective-C shared support library which is needed This package contains GCC Objective-C shared support library which is needed
to run Objective-C dynamically linked programs." to run Objective-C dynamically linked programs."
do_install() {
do_install()
{
vmove "usr/lib/libobjc.so*" usr/lib vmove "usr/lib/libobjc.so*" usr/lib
vinstall COPYING.RUNTIME 644 \ vinstall COPYING.RUNTIME 644 \
usr/share/licenses/$pkgname RUNTIME.LIBRARY.EXCEPTION usr/share/licenses/$pkgname RUNTIME.LIBRARY.EXCEPTION

View file

@ -6,10 +6,11 @@ long_desc="${long_desc}
This package contains GCC quadmath headers and static libraries for This package contains GCC quadmath headers and static libraries for
building mudflap-instrumented programs." building mudflap-instrumented programs."
Add_dependency run libquadmath ">=$version" revision=1
do_install() Add_dependency run libquadmath ">=${_majorver}"
{
do_install() {
vmove "usr/lib/libquadmath*.a" usr/lib vmove "usr/lib/libquadmath*.a" usr/lib
vmove usr/share/info/libquadmath.info usr/share/info vmove usr/share/info/libquadmath.info usr/share/info
touch ${DESTDIR}/usr/share/info/dir touch ${DESTDIR}/usr/share/info/dir

View file

@ -5,10 +5,9 @@ long_desc="${long_desc}
This package contains the GCC quadmath shared library." This package contains the GCC quadmath shared library."
Add_dependency run libgcc ">=$version" revision=1
do_install() do_install() {
{
vmove "usr/lib/libquadmath.so*" usr/lib vmove "usr/lib/libquadmath.so*" usr/lib
vinstall COPYING.RUNTIME 644 \ vinstall COPYING.RUNTIME 644 \
usr/share/licenses/$pkgname RUNTIME.LIBRARY.EXCEPTION usr/share/licenses/$pkgname RUNTIME.LIBRARY.EXCEPTION

View file

@ -6,15 +6,13 @@ long_desc="${long_desc}
This package contains the Stack Smashing Protection development This package contains the Stack Smashing Protection development
files provided by GCC." files provided by GCC."
revision=1
Add_dependency run glibc-devel Add_dependency run glibc-devel
Add_dependency run libssp Add_dependency run libssp ">=${_majorver}"
do_install() do_install() {
{
vmove "usr/lib/libssp*.a" usr/lib vmove "usr/lib/libssp*.a" usr/lib
vmove usr/lib/libssp.so usr/lib
vmove usr/lib/gcc/${_triplet}/${_majorver}/include/ssp \ vmove usr/lib/gcc/${_triplet}/${_majorver}/include/ssp \
usr/lib/gcc/${_triplet}/${_majorver}/include usr/lib/gcc/${_triplet}/${_majorver}/include
} }

View file

@ -6,10 +6,10 @@ long_desc="${long_desc}
This package contains the Stack Smashing Protection shared library This package contains the Stack Smashing Protection shared library
provided by GCC." provided by GCC."
revision=1
do_install() do_install() {
{ vmove "usr/lib/libssp.so*" usr/lib
vmove "usr/lib/libssp.so.*" usr/lib
vinstall COPYING.RUNTIME 644 \ vinstall COPYING.RUNTIME 644 \
usr/share/licenses/$pkgname RUNTIME.LIBRARY.EXCEPTION usr/share/licenses/$pkgname RUNTIME.LIBRARY.EXCEPTION
} }

View file

@ -6,11 +6,11 @@ long_desc="${long_desc}
This package contains GCC Header files and libraries for This package contains GCC Header files and libraries for
C++ development." C++ development."
revision=1
Add_dependency run libstdc++ ">=$version" Add_dependency run libstdc++ ">=${_majorver}"
do_install() do_install() {
{
vmove "usr/lib/libstdc++.*a" usr/lib vmove "usr/lib/libstdc++.*a" usr/lib
vmove "usr/lib/libsupc++.*" usr/lib vmove "usr/lib/libsupc++.*" usr/lib
vmove usr/include/c++ usr/include vmove usr/include/c++ usr/include

View file

@ -6,10 +6,7 @@ long_desc="${long_desc}
This package contains a rewritten standard compliant GCC Standard This package contains a rewritten standard compliant GCC Standard
C++ library." C++ library."
do_install() {
do_install()
{
vmove "usr/lib/libstdc++.so*" usr/lib vmove "usr/lib/libstdc++.so*" usr/lib
vmove usr/share/locale/fr/LC_MESSAGES/libstdc++.mo \ vmove usr/share/locale/fr/LC_MESSAGES/libstdc++.mo \
usr/share/locale/fr/LC_MESSAGES usr/share/locale/fr/LC_MESSAGES

View file

@ -2,7 +2,7 @@
pkgname=gcc pkgname=gcc
_majorver=4.6 _majorver=4.6
version=${_majorver}.3 version=${_majorver}.3
revision=1 revision=2
distfiles="http://ftp.gnu.org/pub/gnu/gcc/gcc-$version/gcc-$version.tar.bz2" distfiles="http://ftp.gnu.org/pub/gnu/gcc/gcc-$version/gcc-$version.tar.bz2"
short_desc="The GNU C Compiler" short_desc="The GNU C Compiler"
maintainer="Juan RP <xtraeme@gmail.com>" maintainer="Juan RP <xtraeme@gmail.com>"
@ -16,10 +16,10 @@ long_desc="
for ObjectiveC++ install gcc-objc++, for Go install gcc-go, for ObjectiveC++ install gcc-objc++, for Go install gcc-go,
for Fortran install gcc-fortran." for Fortran install gcc-fortran."
Add_dependency run libgomp ">=${version}" Add_dependency run libgomp ">=${_majorver}"
Add_dependency run binutils Add_dependency run binutils
Add_dependency run libelf Add_dependency run libelf
Add_dependency run libssp-devel ">=${version}" Add_dependency run libssp-devel ">=${_majorver}"
Add_dependency build perl Add_dependency build perl
Add_dependency build flex Add_dependency build flex