diff options
| author |   Maurice van der Pot <griffon26@gentoo.org> | 2005-12-14 00:59:32 +0000 |
|---|---|---|
| committer | Maurice van der Pot <griffon26@gentoo.org> | 2005-12-14 00:59:32 +0000 |
| commit | b29b1e68cb9f23f390e1ba855dfa3f354c295803 (patch) | |
| tree | 8930290da1fcc15cf72fc860ecaaf8216f1e31d4 /dev-lang | |
| parent | Tomcat needs a newer xml-apis.jar from xml-commons-external to work instead o... (diff) | |
| download | historical-b29b1e68cb9f23f390e1ba855dfa3f354c295803.tar.gz historical-b29b1e68cb9f23f390e1ba855dfa3f354c295803.tar.bz2 historical-b29b1e68cb9f23f390e1ba855dfa3f354c295803.zip | |
Fixed compilation of nqc with gcc 3.4.4 (bug #115474)
Package-Manager: portage-2.0.53_rc7
Diffstat (limited to 'dev-lang')
| -rw-r--r-- | dev-lang/nqc/ChangeLog | 7 | ||||
| -rw-r--r-- | dev-lang/nqc/Manifest | 15 | ||||
| -rw-r--r-- | dev-lang/nqc/files/nqc-2.5.1-gcc34-fix.patch | 19 | ||||
| -rw-r--r-- | dev-lang/nqc/nqc-2.5.1.ebuild | 10 |
4 files changed, 47 insertions, 4 deletions
diff --git a/dev-lang/nqc/ChangeLog b/dev-lang/nqc/ChangeLog index 6f43cf525f92..dad9f643265c 100644 --- a/dev-lang/nqc/ChangeLog +++ b/dev-lang/nqc/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for dev-lang/nqc # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/nqc/ChangeLog,v 1.8 2005/06/05 12:22:47 hansmi Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/nqc/ChangeLog,v 1.9 2005/12/14 00:59:32 griffon26 Exp $ + + 14 Dec 2005; Maurice van der Pot <griffon26@gentoo.org> + +files/nqc-2.5.1-gcc34-fix.patch, nqc-2.5.1.ebuild: + Fixed compilation with gcc 3.4.4, closing bug #115474. What this package + really needs is an up-to-date ebuild (see bug #89257). 05 Jun 2005; Michael Hanselmann <hansmi@gentoo.org> nqc-2.5.1.ebuild: Stable on ppc. diff --git a/dev-lang/nqc/Manifest b/dev-lang/nqc/Manifest index f0ea84a6a080..22b017d746b7 100644 --- a/dev-lang/nqc/Manifest +++ b/dev-lang/nqc/Manifest @@ -1,3 +1,14 @@ -MD5 1c5fe050f9988c8e7a0088f4937fe618 nqc-2.5.1.ebuild 1114 -MD5 b3ab5cc4f137e90d75a91799ac702496 ChangeLog 844 +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + +MD5 d232760d5fa8982a46068029078cce78 ChangeLog 1093 MD5 ec2eb2fa60d922ccddc0e768135303c4 files/digest-nqc-2.5.1 59 +MD5 397f6d97f513b13c40f92743258e64ff files/nqc-2.5.1-gcc34-fix.patch 425 +MD5 6b733ffb2ab2f5acc7d5f33531fa6d7e nqc-2.5.1.ebuild 1219 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.2 (GNU/Linux) + +iD8DBQFDn26CMGnpIbeahxwRAm9AAKDAQ3U9sAwpboqPbKz1+ZesNT1MewCdGAbn +wAtHmNLTZACi+TaA2boPP84= +=ThlR +-----END PGP SIGNATURE----- diff --git a/dev-lang/nqc/files/nqc-2.5.1-gcc34-fix.patch b/dev-lang/nqc/files/nqc-2.5.1-gcc34-fix.patch new file mode 100644 index 000000000000..d641aca7ec30 --- /dev/null +++ b/dev-lang/nqc/files/nqc-2.5.1-gcc34-fix.patch @@ -0,0 +1,19 @@ +diff -ruN nqc-2.5.r1/rcxlib/RCX_Image.h nqc-2.5.r1-fixed/rcxlib/RCX_Image.h +--- nqc-2.5.r1/rcxlib/RCX_Image.h 2003-04-13 19:19:57.000000000 +0200 ++++ nqc-2.5.r1-fixed/rcxlib/RCX_Image.h 2005-12-14 01:35:14.172693272 +0100 +@@ -78,7 +78,6 @@ + void Clear(); + int GetSize() const; + +-private: + class Chunk + { + public: +@@ -106,6 +105,7 @@ + friend class RCX_Image; + }; + ++private: + struct Variable + { + int fIndex; diff --git a/dev-lang/nqc/nqc-2.5.1.ebuild b/dev-lang/nqc/nqc-2.5.1.ebuild index eaf5183342d8..8be23a076cc8 100644 --- a/dev-lang/nqc/nqc-2.5.1.ebuild +++ b/dev-lang/nqc/nqc-2.5.1.ebuild @@ -1,6 +1,8 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/nqc/nqc-2.5.1.ebuild,v 1.9 2005/06/05 12:22:47 hansmi Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/nqc/nqc-2.5.1.ebuild,v 1.10 2005/12/14 00:59:32 griffon26 Exp $ + +inherit eutils My_PV="`echo $PV|cut -d. -f1,2`.r`echo $PV|cut -d. -f3`" My_P="${PN}-${My_PV}" @@ -16,6 +18,12 @@ IUSE="" DEPEND="virtual/libc" +src_unpack() { + unpack ${A} + cd "${S}" + epatch "${FILESDIR}/${P}-gcc34-fix.patch" +} + src_compile() { ${#NQC_SERIAL} && NQC_SERIAL="/dev/ttyS0" sed -e "s:/usr/local/bin:${D}/usr/bin:" -e "s:/usr/local/man:${D}/usr/share/man:" -e "s:-O6:${CFLAGS}:" < Makefile >makefile |