diff options
author | dmcmahill <dmcmahill> | 2002-08-16 10:36:25 +0000 |
---|---|---|
committer | dmcmahill <dmcmahill> | 2002-08-16 10:36:25 +0000 |
commit | a6d10a74561659be6fb54a52500ae9dbf65a800f (patch) | |
tree | 2816c9006fe659e56317430d85c1ddfd3e579f24 /print | |
parent | cc41b36813fd94568ac859f1acb4233b6f56005c (diff) | |
download | pkgsrc-a6d10a74561659be6fb54a52500ae9dbf65a800f.tar.gz |
fix compilation on alpha by decreasing optimization level on a handful
of problem files (c++ -O2 causes as(1) to never finish bug).
Diffstat (limited to 'print')
-rw-r--r-- | print/cjk-lyx/distinfo | 7 | ||||
-rw-r--r-- | print/cjk-lyx/patches/patch-ab | 75 | ||||
-rw-r--r-- | print/cjk-lyx/patches/patch-ad | 41 | ||||
-rw-r--r-- | print/cjk-lyx/patches/patch-ae | 26 | ||||
-rw-r--r-- | print/cjk-lyx/patches/patch-af | 68 |
5 files changed, 204 insertions, 13 deletions
diff --git a/print/cjk-lyx/distinfo b/print/cjk-lyx/distinfo index c57d4f78f42..5d4d5da2a35 100644 --- a/print/cjk-lyx/distinfo +++ b/print/cjk-lyx/distinfo @@ -1,9 +1,12 @@ -$NetBSD: distinfo,v 1.1.1.1 2002/07/19 12:32:32 agc Exp $ +$NetBSD: distinfo,v 1.2 2002/08/16 10:36:25 dmcmahill Exp $ SHA1 (lyx-1.2.0.tar.gz) = 56db850f316c18e00c4b10946216b6eb25107dab Size (lyx-1.2.0.tar.gz) = 6418424 bytes SHA1 (CJK-LyX-1.2.0-patch) = d84540cd832f68d79fadf7f4527f84b55660adee Size (CJK-LyX-1.2.0-patch) = 126189 bytes SHA1 (patch-aa) = 3c020c72d8ac850ebb76c5ff65d546e8cfd9b587 -SHA1 (patch-ab) = 1e23ff0e596ba9d6dd1b65b70a2940daa94f0843 +SHA1 (patch-ab) = 48faac82be2a99d7801e751e13a602622817fbc6 SHA1 (patch-ac) = a7770d4a60e3c634f37fd283b43de9bbdb8f05b6 +SHA1 (patch-ad) = 48cb4ee6bfee21ee981db52d20e34c8e23316928 +SHA1 (patch-ae) = 5b744b75ac59a4f47fd3d02fe0a4b9ce551a39b7 +SHA1 (patch-af) = f09bdf2b9e8da14e9b58b683ab40e89775344ec3 diff --git a/print/cjk-lyx/patches/patch-ab b/print/cjk-lyx/patches/patch-ab index 1ce33f93564..e6d0235d332 100644 --- a/print/cjk-lyx/patches/patch-ab +++ b/print/cjk-lyx/patches/patch-ab @@ -1,4 +1,4 @@ -$NetBSD: patch-ab,v 1.1.1.1 2002/07/19 12:32:32 agc Exp $ +$NetBSD: patch-ab,v 1.2 2002/08/16 10:36:26 dmcmahill Exp $ --- src/Makefile.in.orig Thu May 23 20:05:19 2002 +++ src/Makefile.in @@ -28,16 +28,69 @@ $NetBSD: patch-ab,v 1.1.1.1 2002/07/19 12:32:32 agc Exp $ lyxfont.$(OBJEXT) lyxfind.$(OBJEXT) lyxfunc.$(OBJEXT) \ lyxgluelength.$(OBJEXT) lyxlayout.$(OBJEXT) lyxlength.$(OBJEXT) \ lyxlex.$(OBJEXT) lyxlex_pimpl.$(OBJEXT) lyxlookup.$(OBJEXT) \ -@@ -651,6 +656,12 @@ - lyx$(EXEEXT): $(lyx_OBJECTS) $(lyx_DEPENDENCIES) - @rm -f lyx$(EXEEXT) - $(CXXLINK) $(lyx_LDFLAGS) $(lyx_OBJECTS) $(lyx_LDADD) $(LIBS) +@@ -548,6 +548,11 @@ depcomp = $(SHELL) $(top_srcdir)/config/ + @AMDEP_TRUE@ $(DEPDIR)/undo_funcs.Po $(DEPDIR)/undostack.Po \ + @AMDEP_TRUE@ $(DEPDIR)/vc-backend.Po $(DEPDIR)/version.Po \ + @AMDEP_TRUE@ $(DEPDIR)/vspace.Po ++CXXCOMPILE_NOOPT = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ ++ $(AM_CPPFLAGS) $(CPPFLAGS_NOOPT) $(AM_CXXFLAGS) $(CXXFLAGS_NOOPT) ++LTCXXCOMPILE_NOOPT = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \ ++ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS_NOOPT) \ ++ $(AM_CXXFLAGS) $(CXXFLAGS_NOOPT) + CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ + $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) + LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \ +@@ -558,6 +563,8 @@ CXXLINK = $(LIBTOOL) --mode=link $(CXXLD + $(AM_LDFLAGS) $(LDFLAGS) -o $@ + CXXFLAGS = @CXXFLAGS@ + CFLAGS = @CFLAGS@ ++CPPFLAGS_NOOPT = $(CPPFLAGS:C/-O[0-9]*//) ++CXXFLAGS_NOOPT = $(CXXFLAGS:C/-O[0-9]*//) + COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) + LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ +@@ -579,8 +586,15 @@ SOURCES = $(lyx_SOURCES) + all: $(BUILT_SOURCES) config.h + $(MAKE) $(AM_MAKEFLAGS) all-recursive + ++buffer.o: buffer.cc ++buffer.lo: buffer.cc ++lyxfunc.o: lyxfunc.cc ++lyxfunc.lo: lyxfunc.cc ++tex-accent.o: tex-accent.cc ++tex-accent.lo: tex-accent.cc + -+lyxfunc.o: lyxfunc.C -+ $(CXX) $(DEFS) -I. $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) -O -c $< + .SUFFIXES: +-.SUFFIXES: .C .lo .o .obj ++.SUFFIXES: .C .cc .lo .o .obj + + mostlyclean-libtool: + -rm -f *.lo +@@ -752,6 +766,14 @@ distclean-compile: + + distclean-depend: + -rm -rf $(DEPDIR) ++.C.cc: ++ cp -f $< $@ ++ ++.cc.o: ++@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ ++@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++ $(CXXCOMPILE_NOOPT) -c -o $@ `test -f $< || echo '$(srcdir)/'`$< + + .C.o: + @AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@@ -764,6 +786,12 @@ distclean-depend: + @AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ + @AMDEP_TRUE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + $(CXXCOMPILE) -c -o $@ `cygpath -w $<` + -+lyxfunc.lo: lyxfunc.C -+ $(LIBTOOL) --mode=compile $(CXX) $(DEFS) -I. $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) -O -c $< ++.cc.lo: ++@AMDEP_TRUE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ ++@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++ $(LTCXXCOMPILE_NOOPT) -c -o $@ `test -f $< || echo '$(srcdir)/'`$< - mostlyclean-compile: - -rm -f *.$(OBJEXT) core *.core + .C.lo: + @AMDEP_TRUE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ diff --git a/print/cjk-lyx/patches/patch-ad b/print/cjk-lyx/patches/patch-ad new file mode 100644 index 00000000000..07771cbe12d --- /dev/null +++ b/print/cjk-lyx/patches/patch-ad @@ -0,0 +1,41 @@ +$NetBSD: patch-ad,v 1.1 2002/08/16 10:36:26 dmcmahill Exp $ + +--- src/insets/Makefile.in.orig Thu May 23 08:05:22 2002 ++++ src/insets/Makefile.in +@@ -352,10 +352,17 @@ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_IN + LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CXXFLAGS) $(CXXFLAGS) ++CXXCOMPILE_NOOPT = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ ++ $(AM_CPPFLAGS) $(CPPFLAGS_NOOPT) $(AM_CXXFLAGS) $(CXXFLAGS_NOOPT) ++LTCXXCOMPILE_NOOPT = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \ ++ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS_NOOPT) \ ++ $(AM_CXXFLAGS) $(CXXFLAGS_NOOPT) + CXXLD = $(CXX) + CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ + CXXFLAGS = @CXXFLAGS@ ++CPPFLAGS_NOOPT = $(CPPFLAGS:C/-O[1-9]*//) ++CXXFLAGS_NOOPT = $(CXXFLAGS:C/-O[1-9]*//) + CFLAGS = @CFLAGS@ + COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +@@ -369,6 +376,18 @@ DIST_COMMON = ChangeLog Makefile.am Make + SOURCES = $(libinsets_la_SOURCES) + + all: all-am ++ ++insetlatexaccent.o: insetlatexaccent.C ++@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ ++@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++ $(CXXCOMPILE_NOOPT) -c -o $@ `test -f $< || echo '$(srcdir)/'`$< ++ ++insetlatexaccent.lo: insetlatexaccent.C ++@AMDEP_TRUE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ ++@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++ $(LTCXXCOMPILE_NOOPT) -c -o $@ `test -f $< || echo '$(srcdir)/'`$< + + .SUFFIXES: + .SUFFIXES: .C .lo .o .obj diff --git a/print/cjk-lyx/patches/patch-ae b/print/cjk-lyx/patches/patch-ae new file mode 100644 index 00000000000..c70b5a99945 --- /dev/null +++ b/print/cjk-lyx/patches/patch-ae @@ -0,0 +1,26 @@ +$NetBSD: patch-ae,v 1.1 2002/08/16 10:36:26 dmcmahill Exp $ + +--- boost/boost/detail/limits.hpp.orig Wed Aug 29 18:33:34 2001 ++++ boost/boost/detail/limits.hpp +@@ -38,12 +38,21 @@ + #include <cwchar> // for WCHAR_MIN and WCHAR_MAX + #include <boost/config.hpp> + ++#ifdef __NetBSD__ ++#include <machine/endian.h> ++#if BYTE_ORDER == BIG_ENDIAN ++#define BOOST_BIG_ENDIAN ++#else ++#define BOOST_LITTLE_ENDIAN ++#endif ++#else + #if defined(__sparc) || defined(__sparc__) || defined(__powerpc__) || defined(__ppc__) || defined(__hppa) || defined(_MIPSEB) + #define BOOST_BIG_ENDIAN + #elif defined(__i386__) + #define BOOST_LITTLE_ENDIAN + #else + #error The file boost/detail/limits.hpp needs to be set up for your CPU type. ++#endif + #endif + + namespace std { diff --git a/print/cjk-lyx/patches/patch-af b/print/cjk-lyx/patches/patch-af new file mode 100644 index 00000000000..60a8b54d2f8 --- /dev/null +++ b/print/cjk-lyx/patches/patch-af @@ -0,0 +1,68 @@ +$NetBSD: patch-af,v 1.1 2002/08/16 10:36:27 dmcmahill Exp $ + +--- src/frontends/xforms/Makefile.in.orig Sat Aug 10 00:22:18 2002 ++++ src/frontends/xforms/Makefile.in +@@ -656,10 +656,17 @@ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_IN + LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CXXFLAGS) $(CXXFLAGS) ++CXXCOMPILE_NOOPT = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ ++ $(AM_CPPFLAGS) $(CPPFLAGS_NOOPT) $(AM_CXXFLAGS) $(CXXFLAGS_NOOPT) ++LTCXXCOMPILE_NOOPT = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \ ++ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS_NOOPT) \ ++ $(AM_CXXFLAGS) $(CXXFLAGS_NOOPT) + CXXLD = $(CXX) + CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ + CXXFLAGS = @CXXFLAGS@ ++CPPFLAGS_NOOPT = $(CPPFLAGS:C/-O[1-9]*//) ++CXXFLAGS_NOOPT = $(CXXFLAGS:C/-O[1-9]*//) + COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) + LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ +@@ -678,10 +685,15 @@ DIST_COMMON = ChangeLog Makefile.am Make + DIST_SUBDIRS = $(SUBDIRS) + SOURCES = $(libxforms_la_SOURCES) + ++FormForks.o: FormForks.cc ++FormForks.lo: FormForks.cc ++FormPreferences.o: FormPreferences.cc ++FormPreferences.lo: FormPreferences.cc ++ + all: all-recursive + + .SUFFIXES: +-.SUFFIXES: .C .c .lo .o .obj ++.SUFFIXES: .C .c .cc .lo .o .obj + + mostlyclean-libtool: + -rm -f *.lo +@@ -813,6 +825,15 @@ distclean-compile: + distclean-depend: + -rm -rf $(DEPDIR) + ++.C.cc: ++ cp -f $< $@ ++ ++.cc.o: ++@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ ++@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++ $(CXXCOMPILE_NOOPT) -c -o $@ `test -f $< || echo '$(srcdir)/'`$< ++ + .C.o: + @AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ +@@ -824,6 +845,12 @@ distclean-depend: + @AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ + @AMDEP_TRUE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + $(CXXCOMPILE) -c -o $@ `cygpath -w $<` ++ ++.cc.lo: ++@AMDEP_TRUE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ ++@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++ $(LTCXXCOMPILE_NOOPT) -c -o $@ `test -f $< || echo '$(srcdir)/'`$< + + .C.lo: + @AMDEP_TRUE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ |