summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2003-10-29 04:17:44 +0000
committerRobin H. Johnson <robbat2@gentoo.org>2003-10-29 04:17:44 +0000
commit2950b7d6dd58431c8f2762ca9e1133253ec2b85e (patch)
tree1e1cdd5060600ce9c4eba1e2c58d8088df450ebd
parentremove old selinux patches (diff)
downloadgentoo-2-2950b7d6dd58431c8f2762ca9e1133253ec2b85e.tar.gz
gentoo-2-2950b7d6dd58431c8f2762ca9e1133253ec2b85e.tar.bz2
gentoo-2-2950b7d6dd58431c8f2762ca9e1133253ec2b85e.zip
add fix to compile with gcc2.95
-rw-r--r--dev-embedded/gpsim/ChangeLog6
-rw-r--r--dev-embedded/gpsim/Manifest9
-rw-r--r--dev-embedded/gpsim/files/gpsim-0.20.14-gcc2_fix.patch14
-rw-r--r--dev-embedded/gpsim/gpsim-0.20.14-r1.ebuild7
4 files changed, 29 insertions, 7 deletions
diff --git a/dev-embedded/gpsim/ChangeLog b/dev-embedded/gpsim/ChangeLog
index c18d4773b308..1acb05e329bd 100644
--- a/dev-embedded/gpsim/ChangeLog
+++ b/dev-embedded/gpsim/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-embedded/gpsim
# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-embedded/gpsim/ChangeLog,v 1.3 2003/10/21 13:29:51 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/gpsim/ChangeLog,v 1.4 2003/10/29 04:17:42 robbat2 Exp $
+
+ 28 Oct 2003; Robin H. Johnson <robbat2@gentoo.org> gpsim-0.20.14-r1.ebuild,
+ files/gpsim-0.20.14-gcc2_fix.patch:
+ add fix to compile with gcc2.95
*gpsim-0.20.14-r1 (20 Oct 2003)
diff --git a/dev-embedded/gpsim/Manifest b/dev-embedded/gpsim/Manifest
index 1af169b26524..f26a7b2d2c0c 100644
--- a/dev-embedded/gpsim/Manifest
+++ b/dev-embedded/gpsim/Manifest
@@ -1,8 +1,9 @@
+MD5 105507edeae031707b1c8384bcf28855 gpsim-0.20.14-r1.ebuild 1063
+MD5 cceb0526fe9dfac44a176fce6c1e1a6b gpsim-0.20.14.ebuild 777
+MD5 2740155c266d185a8bb94627fa462aa3 ChangeLog 965
+MD5 420df847a3db1c4969aff20243f656dd metadata.xml 165
MD5 d19aef867a58fe25de6dbcbf6dfc32d9 files/digest-gpsim-0.20.14-r1 65
MD5 d19aef867a58fe25de6dbcbf6dfc32d9 files/digest-gpsim-0.20.14 65
+MD5 aad12da70389a0c7871624aadadeaa58 files/gpsim-0.20.14-gcc2_fix.patch 407
MD5 0cc5e44b9c088cc61934f34811234921 files/gpsim-0.20.14-gcc33.patch 124609
MD5 47fc63d545998cd4b05786a4cc0cfb2c files/gpsim-0.20.14-gcc3.2.patch 18376
-MD5 a239167c17e54902df69fcfcdacda98e gpsim-0.20.14-r1.ebuild 962
-MD5 8c85e3005c689bd32f19cf514c368950 gpsim-0.20.14.ebuild 778
-MD5 bfd367ec32d163fc85f4db2607d8bb55 ChangeLog 814
-MD5 420df847a3db1c4969aff20243f656dd metadata.xml 165
diff --git a/dev-embedded/gpsim/files/gpsim-0.20.14-gcc2_fix.patch b/dev-embedded/gpsim/files/gpsim-0.20.14-gcc2_fix.patch
new file mode 100644
index 000000000000..f0dc4d743291
--- /dev/null
+++ b/dev-embedded/gpsim/files/gpsim-0.20.14-gcc2_fix.patch
@@ -0,0 +1,14 @@
+diff -NurB gpsim-0.20.14-orig/cli/input.cc gpsim-0.20.14/cli/input.cc
+--- gpsim-0.20.14-orig/cli/input.cc 2003-10-21 01:32:05.000000000 -0500
++++ gpsim-0.20.14/cli/input.cc 2003-10-21 02:00:20.000000000 -0500
+@@ -34,8 +34,8 @@
+ extern void simulation_cleanup(void);
+ extern int use_gui;
+
+-//#define RALF
+-#define SCOTT
++#define RALF
++//#define SCOTT
+
+ //#if 0 //tsd removed in 0.20.4
+ extern "C" {
diff --git a/dev-embedded/gpsim/gpsim-0.20.14-r1.ebuild b/dev-embedded/gpsim/gpsim-0.20.14-r1.ebuild
index f113704dd305..9b3fc879ecaf 100644
--- a/dev-embedded/gpsim/gpsim-0.20.14-r1.ebuild
+++ b/dev-embedded/gpsim/gpsim-0.20.14-r1.ebuild
@@ -1,8 +1,8 @@
# Copyright 1999-2003 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-embedded/gpsim/gpsim-0.20.14-r1.ebuild,v 1.1 2003/10/21 03:22:21 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/gpsim/gpsim-0.20.14-r1.ebuild,v 1.2 2003/10/29 04:17:42 robbat2 Exp $
-inherit eutils
+inherit eutils flag-o-matic gcc
DESCRIPTION="A simulator for the Microchip PIC microcontrollers"
HOMEPAGE="http://www.dattalo.com/gnupic/gpsim.html"
@@ -20,6 +20,9 @@ src_unpack() {
cd ${S}
epatch ${FILESDIR}/${P}-gcc3.2.patch
epatch ${FILESDIR}/${P}-gcc33.patch
+ if [ `gcc-major-version` -eq 2 ]; then
+ epatch ${FILESDIR}/${P}-gcc2_fix.patch
+ fi
}
src_compile(){