summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortron <tron@pkgsrc.org>2012-06-17 00:22:10 +0000
committertron <tron@pkgsrc.org>2012-06-17 00:22:10 +0000
commit3853c6e038a2627155da77504c2df5a2fe801eb4 (patch)
treecb50dcec3cdfbf9c3289889ccb6e3ca9a873bb98
parentaa7aea09971b7dc2eb005f4e386b490bbd6d34a3 (diff)
downloadpkgsrc-3853c6e038a2627155da77504c2df5a2fe801eb4.tar.gz
Add a hack to work around a compiler bug under Mac OS X Lion.
-rw-r--r--games/scummvm/hacks.mk27
1 files changed, 9 insertions, 18 deletions
diff --git a/games/scummvm/hacks.mk b/games/scummvm/hacks.mk
index 608adb04151..15acd6e7584 100644
--- a/games/scummvm/hacks.mk
+++ b/games/scummvm/hacks.mk
@@ -1,21 +1,12 @@
-# $NetBSD: hacks.mk,v 1.1 2009/09/13 16:12:18 tron Exp $
+# $NetBSD: hacks.mk,v 1.2 2012/06/17 00:22:10 tron Exp $
-.if !defined(SCUMMVM_HACKS_MK)
-SCUMMVM_HACKS_MK= defined
+### [Sun 17 Jun 2012 00:21:30 UTC : tron]
+### G++ 4.2.1 (Based on Apple Inc. build 5658) as shipped with
+### Mac OS X Lion crashes with a segmentation fault while compiling
+### "engines/queen/journal.cpp". Disabling the optimizer prevents
+### the crash.
-.include "../../mk/bsd.fast.prefs.mk"
-
-# scummvm used an API that no longer exists under Mac OS X Snow Leopard.
-# Work around that by using the Leopard SDK which is part of Xcode tools.
-
-XCODE_LEOPARD_SDK= /Developer/SDKs/MacOSX10.5.sdk
-
-.if !empty(MACHINE_PLATFORM:MDarwin-??.*-*) && \
- exists(/Developer/SDKs/MacOSX10.5.sdk)
-PKG_HACKS+= scummvm-snow-leopard
-
-CFLAGS+= -mmacosx-version-min=10.5 -isysroot ${XCODE_LEOPARD_SDK}
-LDFLAGS+= -mmacosx-version-min=10.5 -Wl,-syslibroot,${XCODE_LEOPARD_SDK}
+.if !empty(MACHINE_PLATFORM:MDarwin-11.*-i386)
+PKG_HACKS+= macosx-lion-compiler-hang
+BUILDLINK_TRANSFORM+= rm:-O2
.endif
-
-.endif # SCUMMVM_HACKS_MK