Tue Oct 22 14:27:24 2013 UTC ()
Disable optimisation on OSX, as a workaround for QTBUG-5986.


(jperkin)
diff -r1.1 -r1.2 pkgsrc/x11/qt4-tools/hacks.mk
cvs diff -r1.1 -r1.2 pkgsrc/x11/qt4-tools/hacks.mk (expand / switch to unified diff)

--- pkgsrc/x11/qt4-tools/hacks.mk 2012/09/25 08:07:31 1.1
+++ pkgsrc/x11/qt4-tools/hacks.mk 2013/10/22 14:27:24 1.2
@@ -1,17 +1,22 @@ @@ -1,17 +1,22 @@
1# $NetBSD: hacks.mk,v 1.1 2012/09/25 08:07:31 apb Exp $ 1# $NetBSD: hacks.mk,v 1.2 2013/10/22 14:27:24 jperkin Exp $
2 2
3### [Sat Sep 22 11:21:06 UTC 2012 : apb] 3### [Sat Sep 22 11:21:06 UTC 2012 : apb]
4### g++-4.5.3 and 4.5.4 on NetBSD/i386 fails with an internal compiler error 4### g++-4.5.3 and 4.5.4 on NetBSD/i386 fails with an internal compiler error
5### when building gui/painting/qdrawhelper_mmx.cpp. 5### when building gui/painting/qdrawhelper_mmx.cpp.
6### Building with -O1 instead of -O2 seems to work around the problem. 6### Building with -O1 instead of -O2 seems to work around the problem.
7.if ${OPSYS} == "NetBSD" && ${MACHINE_ARCH} == "i386" 7.if ${OPSYS} == "NetBSD" && ${MACHINE_ARCH} == "i386"
8. include "../../mk/compiler.mk" 8. include "../../mk/compiler.mk"
9. if !empty(CC_VERSION:Mgcc-4.5.*) 9. if !empty(CC_VERSION:Mgcc-4.5.*)
10PKG_HACKS+= pr46978 10PKG_HACKS+= pr46978
11SUBST_CLASSES+= pr46978 11SUBST_CLASSES+= pr46978
12SUBST_STAGE.pr46978= post-configure 12SUBST_STAGE.pr46978= post-configure
13SUBST_MESSAGE.pr46978= Working around optimizer bug (NetBSD PR 46978) 13SUBST_MESSAGE.pr46978= Working around optimizer bug (NetBSD PR 46978)
14SUBST_FILES.pr46978= src/gui/Makefile 14SUBST_FILES.pr46978= src/gui/Makefile
15SUBST_SED.pr46978= -e '/^CXXFLAGS/s/-O2/-O1/' 15SUBST_SED.pr46978= -e '/^CXXFLAGS/s/-O2/-O1/'
16. endif 16. endif
17.endif 17.endif
 18
 19# QTBUG-5986
 20.if ${OPSYS} == "Darwin"
 21BUILDLINK_TRANSFORM+= rm:-O[23]
 22.endif