From 4ec976ae9fa5cdd14e1f243f7150746a2f221e4d Mon Sep 17 00:00:00 2001 From: Karol Wojtaszek Date: Mon, 27 Sep 2004 15:39:59 +0000 Subject: Fixed gcc-3.4 compile issues. Ebuild clean up --- dev-lang/tcc/ChangeLog | 7 ++- dev-lang/tcc/files/digest-tcc-0.9.14 | 1 - dev-lang/tcc/files/digest-tcc-0.9.16 | 1 - dev-lang/tcc/files/digest-tcc-0.9.7 | 1 - dev-lang/tcc/files/digest-tcc-0.9.8 | 1 - dev-lang/tcc/files/tcc-0.9.20-gcc34.patch | 75 +++++++++++++++++++++++++++++++ dev-lang/tcc/tcc-0.9.14.ebuild | 43 ------------------ dev-lang/tcc/tcc-0.9.16.ebuild | 43 ------------------ dev-lang/tcc/tcc-0.9.20.ebuild | 11 ++++- dev-lang/tcc/tcc-0.9.7.ebuild | 27 ----------- dev-lang/tcc/tcc-0.9.8.ebuild | 30 ------------- 11 files changed, 91 insertions(+), 149 deletions(-) delete mode 100644 dev-lang/tcc/files/digest-tcc-0.9.14 delete mode 100644 dev-lang/tcc/files/digest-tcc-0.9.16 delete mode 100644 dev-lang/tcc/files/digest-tcc-0.9.7 delete mode 100644 dev-lang/tcc/files/digest-tcc-0.9.8 create mode 100644 dev-lang/tcc/files/tcc-0.9.20-gcc34.patch delete mode 100644 dev-lang/tcc/tcc-0.9.14.ebuild delete mode 100644 dev-lang/tcc/tcc-0.9.16.ebuild delete mode 100644 dev-lang/tcc/tcc-0.9.7.ebuild delete mode 100644 dev-lang/tcc/tcc-0.9.8.ebuild (limited to 'dev-lang') diff --git a/dev-lang/tcc/ChangeLog b/dev-lang/tcc/ChangeLog index fc720550e272..a255f12f79e2 100644 --- a/dev-lang/tcc/ChangeLog +++ b/dev-lang/tcc/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for dev-lang/tcc # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/tcc/ChangeLog,v 1.14 2004/07/02 04:32:26 eradicator Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/tcc/ChangeLog,v 1.15 2004/09/27 15:39:59 sekretarz Exp $ + + 27 Sep 2004; Karol Wojtaszek + +files/tcc-0.9.20-gcc34.patch, -tcc-0.9.14.ebuild, -tcc-0.9.16.ebuild, + tcc-0.9.20.ebuild, -tcc-0.9.7.ebuild, -tcc-0.9.8.ebuild: + Fixed gcc-3.4 compile issues, Bug #65346. Ebuild clean up. 01 Jul 2004; Jeremy Huddleston tcc-0.9.14.ebuild, tcc-0.9.16.ebuild, tcc-0.9.19.ebuild, tcc-0.9.20.ebuild, tcc-0.9.8.ebuild: diff --git a/dev-lang/tcc/files/digest-tcc-0.9.14 b/dev-lang/tcc/files/digest-tcc-0.9.14 deleted file mode 100644 index 830dd5d3da05..000000000000 --- a/dev-lang/tcc/files/digest-tcc-0.9.14 +++ /dev/null @@ -1 +0,0 @@ -MD5 d26a8fc2f319204824fc24b02f54918d tcc-0.9.14.tar.gz 154837 diff --git a/dev-lang/tcc/files/digest-tcc-0.9.16 b/dev-lang/tcc/files/digest-tcc-0.9.16 deleted file mode 100644 index 422de2ef7a56..000000000000 --- a/dev-lang/tcc/files/digest-tcc-0.9.16 +++ /dev/null @@ -1 +0,0 @@ -MD5 ea967671a6e2827424b8d234f7db8d9c tcc-0.9.16.tar.gz 175253 diff --git a/dev-lang/tcc/files/digest-tcc-0.9.7 b/dev-lang/tcc/files/digest-tcc-0.9.7 deleted file mode 100644 index 94886fb23738..000000000000 --- a/dev-lang/tcc/files/digest-tcc-0.9.7 +++ /dev/null @@ -1 +0,0 @@ -MD5 928161509f3f7d59dd50c6b53a18bbf9 tcc-0.9.7.tar.gz 105118 diff --git a/dev-lang/tcc/files/digest-tcc-0.9.8 b/dev-lang/tcc/files/digest-tcc-0.9.8 deleted file mode 100644 index 2f0796e37be0..000000000000 --- a/dev-lang/tcc/files/digest-tcc-0.9.8 +++ /dev/null @@ -1 +0,0 @@ -MD5 fa15a9f7d7ada821048f1896d590826e tcc-0.9.8.tar.gz 133061 diff --git a/dev-lang/tcc/files/tcc-0.9.20-gcc34.patch b/dev-lang/tcc/files/tcc-0.9.20-gcc34.patch new file mode 100644 index 000000000000..a703f5a4d105 --- /dev/null +++ b/dev-lang/tcc/files/tcc-0.9.20-gcc34.patch @@ -0,0 +1,75 @@ +--- tcc-0.9.20.orig/bcheck.c ++++ tcc-0.9.20/bcheck.c +@@ -76,7 +76,9 @@ + + /* currently, tcc cannot compile that because we use unsupported GNU C + extensions */ +-#if !defined(__TINYC__) ++#if defined(__TINYC__) ++#define __attribute__(ignore) ++#endif + void *__bound_ptr_add(void *p, int offset) __attribute__((regparm(2))); + void *__bound_ptr_indir1(void *p, int offset) __attribute__((regparm(2))); + void *__bound_ptr_indir2(void *p, int offset) __attribute__((regparm(2))); +@@ -86,7 +88,6 @@ + void *__bound_ptr_indir16(void *p, int offset) __attribute__((regparm(2))); + void __bound_local_new(void *p) __attribute__((regparm(1))); + void __bound_local_delete(void *p) __attribute__((regparm(1))); +-#endif + + void *__bound_malloc(size_t size, const void *caller); + void *__bound_memalign(size_t size, size_t align, const void *caller); +@@ -168,7 +169,7 @@ + + /* return '(p + offset)' for pointer arithmetic (a pointer can reach + the end of a region in this case */ +-void *__bound_ptr_add(void *p, int offset) ++void * __attribute__((regparm(2))) __bound_ptr_add(void *p, int offset) + { + unsigned long addr = (unsigned long)p; + BoundEntry *e; +@@ -194,7 +195,8 @@ + /* return '(p + offset)' for pointer indirection (the resulting must + be strictly inside the region */ + #define BOUND_PTR_INDIR(dsize) \ +-void *__bound_ptr_indir ## dsize (void *p, int offset) \ ++void * __attribute__((regparm(2))) __bound_ptr_indir ## dsize \ ++ (void *p, int offset) \ + { \ + unsigned long addr = (unsigned long)p; \ + BoundEntry *e; \ +@@ -227,7 +229,7 @@ + #endif + + /* called when entering a function to add all the local regions */ +-void __bound_local_new(void *p1) ++void __attribute__((regparm(1))) __bound_local_new(void *p1) + { + unsigned long addr, size, fp, *p = p1; + GET_CALLER_FP(fp); +@@ -243,7 +245,7 @@ + } + + /* called when leaving a function to delete all the local regions */ +-void __bound_local_delete(void *p1) ++void __attribute__((regparm(1))) __bound_local_delete(void *p1) + { + unsigned long addr, fp, *p = p1; + GET_CALLER_FP(fp); +@@ -266,13 +268,14 @@ + { + } + +-void *__bound_ptr_add(void *p, int offset) ++void * __attribute__((regparm(2))) __bound_ptr_add(void *p, int offset) + { + return p + offset; + } + + #define BOUND_PTR_INDIR(dsize) \ +-void *__bound_ptr_indir ## dsize (void *p, int offset) \ ++void * __attribute__((regparm(2))) __bound_ptr_indir ## dsize\ ++ (void *p, int offset)\ + { \ + return p + offset; \ + } diff --git a/dev-lang/tcc/tcc-0.9.14.ebuild b/dev-lang/tcc/tcc-0.9.14.ebuild deleted file mode 100644 index 88bdbaf78e56..000000000000 --- a/dev-lang/tcc/tcc-0.9.14.ebuild +++ /dev/null @@ -1,43 +0,0 @@ -# Copyright 1999-2004 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/tcc/tcc-0.9.14.ebuild,v 1.7 2004/07/02 04:32:26 eradicator Exp $ - -IUSE="" - -DESCRIPTION="A very small C compiler for ix86" -HOMEPAGE="http://www.tinycc.org/" -LICENSE="GPL-2" -DEPEND="virtual/libc" -SRC_URI="http://fabrice.bellard.free.fr/tcc/${P}.tar.gz" - -SLOT="0" -KEYWORDS="x86 -sparc" - -src_compile() { - mv Makefile Makefile.orig || die - sed -e 's:prefix=/usr/local:prefix=/usr:g' \ - -e 's:$(INSTALL) tcc.1 $(manpath)/man1::' \ - -e "s:-O2:${CFLAGS} -DRTLD_DEFAULT=NULL:g" \ - -e 's:-m386::g' \ - Makefile.orig > Makefile || die - emake || die - - # Fix examples - for example in ex*.c; do - tail -n +2 $example >$example.temp - echo '#! /usr/bin/env tcc' >$example - cat $example.temp >>$example - chmod 755 $example - done -} - -src_install () { - dodir /usr/bin - dodir /usr/lib - make prefix=${D}/usr install || die - doman tcc.1 - dodoc Changelog README TODO - dohtml tcc-doc.html - mkdir ${D}/usr/share/doc/${P}/examples - cp ex*.c ${D}/usr/share/doc/${P}/examples/ -} diff --git a/dev-lang/tcc/tcc-0.9.16.ebuild b/dev-lang/tcc/tcc-0.9.16.ebuild deleted file mode 100644 index 99420a3ab907..000000000000 --- a/dev-lang/tcc/tcc-0.9.16.ebuild +++ /dev/null @@ -1,43 +0,0 @@ -# Copyright 1999-2004 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/tcc/tcc-0.9.16.ebuild,v 1.6 2004/07/14 13:59:42 agriffis Exp $ - -DESCRIPTION="A very small C compiler for ix86" -HOMEPAGE="http://www.tinycc.org/" -SRC_URI="http://fabrice.bellard.free.fr/tcc/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="x86 -sparc" -IUSE="" - -DEPEND="virtual/libc" - -src_compile() { - mv Makefile Makefile.orig || die - sed -e 's:prefix=/usr/local:prefix=/usr:g' \ - -e 's:$(INSTALL) tcc.1 $(manpath)/man1::' \ - -e "s:-O2:${CFLAGS} -DRTLD_DEFAULT=NULL:g" \ - -e 's:-m386::g' \ - Makefile.orig > Makefile || die - emake || die - - # Fix examples - for example in ex*.c; do - tail -n +2 $example >$example.temp - echo '#! /usr/bin/env tcc' >$example - cat $example.temp >>$example - chmod 755 $example - done -} - -src_install() { - dodir /usr/bin - dodir /usr/lib - make prefix=${D}/usr install || die - doman tcc.1 - dodoc Changelog README TODO - dohtml tcc-doc.html - mkdir ${D}/usr/share/doc/${PF}/examples - cp ex*.c ${D}/usr/share/doc/${PF}/examples/ -} diff --git a/dev-lang/tcc/tcc-0.9.20.ebuild b/dev-lang/tcc/tcc-0.9.20.ebuild index 847ed0214274..89628a5a05f3 100644 --- a/dev-lang/tcc/tcc-0.9.20.ebuild +++ b/dev-lang/tcc/tcc-0.9.20.ebuild @@ -1,6 +1,8 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/tcc/tcc-0.9.20.ebuild,v 1.4 2004/07/02 04:32:26 eradicator Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/tcc/tcc-0.9.20.ebuild,v 1.5 2004/09/27 15:39:59 sekretarz Exp $ + +inherit eutils; IUSE="" @@ -14,6 +16,13 @@ KEYWORDS="~x86 -sparc" DEPEND="virtual/libc" +src_unpack() { + unpack ${A} + cd ${S} + + epatch ${FILESDIR}/${P}-gcc34.patch +} + src_compile() { econf || die "configure failed" emake || die diff --git a/dev-lang/tcc/tcc-0.9.7.ebuild b/dev-lang/tcc/tcc-0.9.7.ebuild deleted file mode 100644 index fc059af80972..000000000000 --- a/dev-lang/tcc/tcc-0.9.7.ebuild +++ /dev/null @@ -1,27 +0,0 @@ -# Copyright 1999-2004 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/tcc/tcc-0.9.7.ebuild,v 1.11 2004/07/14 13:59:42 agriffis Exp $ - -DESCRIPTION="A very small C compiler for ix86" -HOMEPAGE="http://www.tinycc.org/" -LICENSE="GPL-2" -DEPEND="" -SRC_URI="http://fabrice.bellard.free.fr/tcc/${P}.tar.gz" - -SLOT="0" -KEYWORDS="x86 -sparc" -IUSE="" - -src_compile() { - mv Makefile Makefile.orig || die - sed -e 's:prefix=/usr/local:prefix=/usr:g' Makefile.orig > Makefile || die - emake || die -} - -src_install () { - dodir /usr/bin - dodir /usr/lib - make prefix=${D}/usr install || die - dodoc Changelog README TODO ex*.c - dohtml tcc-doc.html -} diff --git a/dev-lang/tcc/tcc-0.9.8.ebuild b/dev-lang/tcc/tcc-0.9.8.ebuild deleted file mode 100644 index f3f2a4886ff9..000000000000 --- a/dev-lang/tcc/tcc-0.9.8.ebuild +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright 1999-2004 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/tcc/tcc-0.9.8.ebuild,v 1.11 2004/07/14 13:59:42 agriffis Exp $ - -DESCRIPTION="A very small C compiler for ix86" -HOMEPAGE="http://www.tinycc.org/" -LICENSE="GPL-2" -DEPEND="virtual/libc" -SRC_URI="http://fabrice.bellard.free.fr/tcc/${P}.tar.gz" - -SLOT="0" -KEYWORDS="x86 -sparc" -IUSE="" - -src_compile() { - mv Makefile Makefile.orig || die - sed -e 's:prefix=/usr/local:prefix=/usr:g' \ - -e 's:$(INSTALL) tcc.1 $(prefix)/man/man1:# Gentoo \: Manpage handled by doman:' \ - Makefile.orig > Makefile || die - emake || die -} - -src_install () { - dodir /usr/bin - dodir /usr/lib - make prefix=${D}/usr install || die - doman tcc.1 - dodoc Changelog README TODO ex*.c - dohtml tcc-doc.html -} -- cgit v1.2.3-65-gdbad