on alpha, turn off optimization on the 33 files which tickle compiler bug(s).

This now builds on alpha with gcc-2.95.3.

3 files changed, 72 insertions, 13 deletions

diff --git a/x11/qt2-libs/Makefile b/x11/qt2-libs/Makefile
index 84f80f8c794..6321876a4b8 100644
--- a/x11/qt2-libs/Makefile
+++ b/x11/qt2-libs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2002/08/25 18:40:42 jlam Exp $
+# $NetBSD: Makefile,v 1.19 2003/02/05 23:13:10 dmcmahill Exp $
 
 PKGNAME=	qt2-libs-${QTVERSION}
 PKGREVISION=	2
@@ -13,6 +13,7 @@ CONFIGURE_ARGS+=	-L${LOCALBASE}/lib -L${X11BASE}/lib
 
 CONFIGURE_ENV+=		QTDIR="${WRKSRC}"
 MAKE_ENV+=		QTDIR="${WRKSRC}"
+MAKE_ENV+=		MACHINE_ARCH=${MACHINE_ARCH}
 
 ALL_TARGET=		sub-src
 
diff --git a/x11/qt2-libs/distinfo b/x11/qt2-libs/distinfo
index b01bfc7ebc8..23495bea24a 100644
--- a/x11/qt2-libs/distinfo
+++ b/x11/qt2-libs/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.8 2002/10/25 10:56:05 bouyer Exp $
+$NetBSD: distinfo,v 1.9 2003/02/05 23:13:10 dmcmahill Exp $
 
 SHA1 (qt-x11-2.3.1.tar.gz) = f1403700fe80fbfb125ec84731d0dfe9c576c823
 Size (qt-x11-2.3.1.tar.gz) = 8967271 bytes
@@ -6,7 +6,7 @@ SHA1 (patch-aa) = 10f4cea8c2719c3c70becff88022e910778c4538
 SHA1 (patch-ab) = cada94d79878a49e24211ab7d17c097bbf5a9794
 SHA1 (patch-ac) = 0d94197bd40994b0c658e466d3ebb81fabfbf30c
 SHA1 (patch-ad) = 26482d22e1d016ef514a43a69a5d58b19f03193c
-SHA1 (patch-ae) = 3ca7c34f608458950e5036f4a0b9ca0c53f83343
+SHA1 (patch-ae) = 56173e086c95b8f4ad6c557c09bc7b18a2de3ef3
 SHA1 (patch-af) = ea8b1c3f7a099a5492301281476ea831134ad97b
 SHA1 (patch-ag) = 85a6376bc780c7aad88879c70fb86542f7e738ae
 SHA1 (patch-ah) = aed767e01998aa5093e3932f6ab1032d0a35b9bb
diff --git a/x11/qt2-libs/patches/patch-ae b/x11/qt2-libs/patches/patch-ae
index b73fa9212f3..1cefd6e1c9c 100644
--- a/x11/qt2-libs/patches/patch-ae
+++ b/x11/qt2-libs/patches/patch-ae
@@ -1,7 +1,7 @@
-$NetBSD: patch-ae,v 1.8 2001/06/17 19:10:39 drochner Exp $
+$NetBSD: patch-ae,v 1.9 2003/02/05 23:13:10 dmcmahill Exp $
 
---- src/Makefile.in.orig	Wed Jun 13 10:57:02 2001
-+++ src/Makefile.in	Fri Jun 15 20:28:15 2001
+--- src/Makefile.in.orig	Wed Jun 13 04:57:02 2001
++++ src/Makefile.in
 @@ -2,7 +2,7 @@
  
  ####### Compiler, tools and options
@@ -11,8 +11,13 @@ $NetBSD: patch-ae,v 1.8 2001/06/17 19:10:39 drochner Exp $
  CXXFLAGS=	$(SYSCONF_CXXFLAGS_OPENGL) $(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS_X11) $(SYSCONF_CXXFLAGS) $(SYSCONF_CXXFLAGS_LIB) $(QT_CXXFLAGS_OPT)
  CC	=	$(SYSCONF_CC) $(QT_C_MT)
  CFLAGS	=	$(SYSCONF_CFLAGS) $(SYSCONF_CFLAGS_LIB) $(QT_CFLAGS_OPT)
-@@ -14,7 +14,7 @@
+@@ -12,9 +12,12 @@ LIBS	=	$(SUBLIBS) $(SYSCONF_LIBS_OPENGL)
+ MOC	=	$(SYSCONF_MOC)
+ UIC	=	$(SYSCONF_UIC)
  
++CFLAGS_NOOPT   = $(CFLAGS:-O%=)
++CXXFLAGS_NOOPT = $(CXXFLAGS:-O%=)
++
  ####### Target
  
 -DESTDIR = ../lib/
@@ -20,7 +25,13 @@ $NetBSD: patch-ae,v 1.8 2001/06/17 19:10:39 drochner Exp $
  VER_MAJ = 2
  VER_MIN = 3
  VER_PATCH = 1
-@@ -378,19 +378,7 @@
+@@ -372,25 +375,18 @@ OBJECTS_opengl = opengl/qgl.o \
+ 		opengl/qgl_x11.o \
+ 		opengl/moc_qgl.o
+ 
+-
+ ####### Implicit rules
+ 
  .SUFFIXES: .cpp .cxx .cc .C .c
  
  .cpp.o:
@@ -28,20 +39,23 @@ $NetBSD: patch-ae,v 1.8 2001/06/17 19:10:39 drochner Exp $
 -
 -.cxx.o:
 -	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
--
--.cc.o:
++	@cd `dirname $@` && $(CXX) -c $(CXXFLAGS) `basename $<`
+ 
+ .cc.o:
 -	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
 -
 -.C.o:
 -	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
--
++	@cd `dirname $@` && $(CXX) -c $(CXXFLAGS_NOOPT) `basename $<`
+ 
 -.c.o:
 -	$(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
-+	@cd `dirname $@` && $(CXX) -c $(CXXFLAGS) `basename $<`
++.cpp.cc:
++	cp -f $< $@
  
  ####### Build rules
  
-@@ -398,7 +386,7 @@
+@@ -398,7 +394,7 @@ OBJECTS_opengl = opengl/qgl.o \
  all: $(DESTDIR)$(SYSCONF_LINK_TARGET)
  
  $(DESTDIR)$(SYSCONF_LINK_TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS)
@@ -50,3 +64,47 @@ $NetBSD: patch-ae,v 1.8 2001/06/17 19:10:39 drochner Exp $
  
  moc: $(SRCMOC)
  
+@@ -13114,4 +13110,43 @@ opengl/qgl_x11.o: opengl/qgl_x11.cpp \
+ 		tools/qgdict.h \
+ 		kernel/qtranslator.h \
+ 		tools/qintdict.h
++
++# problem files  -- compile with no optimization
++ifeq (${MACHINE_ARCH},alpha)
++
++kernel/moc_qnetworkprotocol.o: kernel/moc_qnetworkprotocol.cc
++kernel/moc_qurloperator.o: kernel/moc_qurloperator.cc
++kernel/moc_qwidget.o: kernel/moc_qwidget.cc
++widgets/moc_qbutton.o: widgets/moc_qbutton.cc
++widgets/moc_qcombobox.o: widgets/moc_qcombobox.cc
++widgets/moc_qdial.o: widgets/moc_qdial.cc
++widgets/moc_qframe.o: widgets/moc_qframe.cc
++widgets/moc_qgroupbox.o: widgets/moc_qgroupbox.cc
++widgets/moc_qheader.o: widgets/moc_qheader.cc
++widgets/moc_qlabel.o: widgets/moc_qlabel.cc
++widgets/moc_qlcdnumber.o: widgets/moc_qlcdnumber.cc
++widgets/moc_qlineedit.o: widgets/moc_qlineedit.cc
++widgets/moc_qlistbox.o: widgets/moc_qlistbox.cc
++widgets/moc_qlistview.o: widgets/moc_qlistview.cc
++widgets/moc_qmainwindow.o: widgets/moc_qmainwindow.cc
++widgets/moc_qmultilineedit.o: widgets/moc_qmultilineedit.cc
++widgets/moc_qprogressbar.o: widgets/moc_qprogressbar.cc
++widgets/moc_qpushbutton.o: widgets/moc_qpushbutton.cc
++widgets/moc_qscrollbar.o: widgets/moc_qscrollbar.cc
++widgets/moc_qscrollview.o: widgets/moc_qscrollview.cc
++widgets/moc_qslider.o: widgets/moc_qslider.cc
++widgets/moc_qspinbox.o: widgets/moc_qspinbox.cc
++widgets/moc_qtabwidget.o: widgets/moc_qtabwidget.cc
++widgets/moc_qtextview.o: widgets/moc_qtextview.cc
++widgets/moc_qtoolbar.o: widgets/moc_qtoolbar.cc
++widgets/moc_qtoolbutton.o: widgets/moc_qtoolbutton.cc
++widgets/moc_qaction.o: widgets/moc_qaction.cc
++dialogs/moc_qfiledialog.o: dialogs/moc_qfiledialog.cc
++dialogs/moc_qmessagebox.o: dialogs/moc_qmessagebox.cc
++dialogs/moc_qprogressdialog.o: dialogs/moc_qprogressdialog.cc
++dialogs/moc_qprintdialog.o: dialogs/moc_qprintdialog.cc
++iconview/moc_qiconview.o: iconview/moc_qiconview.cc
++table/moc_qtable.o: table/moc_qtable.cc
++
++endif
+