summaryrefslogtreecommitdiff
path: root/print
diff options
context:
space:
mode:
authorfredb <fredb>2002-04-18 15:59:55 +0000
committerfredb <fredb>2002-04-18 15:59:55 +0000
commit641820a36d48c87afe8ace9293c35ace61c3b814 (patch)
tree781f198be91de91dd4c4c3205b7fb55f649ccb05 /print
parent3be7a4c82c39fe045d7e6b0047cfa867f749f068 (diff)
downloadpkgsrc-641820a36d48c87afe8ace9293c35ace61c3b814.tar.gz
Work around a bug in gcc-2.95.3 (NetBSD-1.5ZC-m68k).
Diffstat (limited to 'print')
-rw-r--r--print/lyx/distinfo3
-rw-r--r--print/lyx/patches/patch-ab32
2 files changed, 34 insertions, 1 deletions
diff --git a/print/lyx/distinfo b/print/lyx/distinfo
index a4b34cda654..564714cb361 100644
--- a/print/lyx/distinfo
+++ b/print/lyx/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.7 2002/04/17 04:45:16 fredb Exp $
+$NetBSD: distinfo,v 1.8 2002/04/18 15:59:55 fredb Exp $
SHA1 (lyx-1.1.6fix4.tar.gz) = 0256ba5955bf98068f8dc0768224d70840858418
Size (lyx-1.1.6fix4.tar.gz) = 5564584 bytes
SHA1 (patch-aa) = 4ebd6cab59d6db11c5a8e49db610573fb8bb80f2
+SHA1 (patch-ab) = d56a17928e8ddc6dc0b76140f8ecf9d592049794
diff --git a/print/lyx/patches/patch-ab b/print/lyx/patches/patch-ab
new file mode 100644
index 00000000000..9122a94a461
--- /dev/null
+++ b/print/lyx/patches/patch-ab
@@ -0,0 +1,32 @@
+$NetBSD: patch-ab,v 1.1 2002/04/18 15:59:56 fredb Exp $
+
+Avoid the following error with gcc-2.95.3 (NetBSD-1.5ZC-m68k):
+
+ c++ -DHAVE_CONFIG_H -I. -I. -I. -I.. -I.. -I../boost -I/usr/X11R6/include
+ -I/usr/X11R6/include/X11 -isystem /usr/X11R6/include -O2 -c lyxfunc.C
+ lyxfunc.C: In method `const class string LyXFunc::Dispatch(int, const string & = string())':
+ lyxfunc.C:3027: Internal compiler error.
+ lyxfunc.C:3027: Please submit a full bug report.
+ lyxfunc.C:3027: See <URL:http://www.gnu.org/software/gcc/bugs.html> for instructions.
+ *** Error code 1
+
+ Stop.
+ make: stopped in /t/pkgobj/print/lyx/work.m68k/lyx-1.1.6fix4/src
+ [and so on]
+
+Line 3027 is a single close bracket, the end of a switch statement that starts
+on line 675. Increasing the process stack size to 32768 didn't help.
+
+--- src/Makefile.in.orig Wed Apr 17 10:36:29 2002
++++ src/Makefile.in
+@@ -414,6 +414,10 @@
+ lyx$(EXEEXT): $(lyx_OBJECTS) $(lyx_DEPENDENCIES)
+ @rm -f lyx$(EXEEXT)
+ $(CXXLINK) $(lyx_LDFLAGS) $(lyx_OBJECTS) $(lyx_LDADD) $(LIBS)
++lyxfunc.o: lyxfunc.C
++ $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) -O -c $<
++lyxfunc.lo: lyxfunc.C
++ $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) -O -c $<
+ .C.o:
+ $(CXXCOMPILE) -c $<
+ .C.lo: