Sun May 13 17:51:11 2012 UTC ()
Use MOZILLA_DIR so that this also works for www/seamonkey.


(bsiegert)
diff -r1.4 -r1.5 pkgsrc/devel/xulrunner/hacks.mk

cvs diff -r1.4 -r1.5 pkgsrc/devel/xulrunner/Attic/hacks.mk (expand / switch to unified diff)

--- pkgsrc/devel/xulrunner/Attic/hacks.mk 2012/05/13 14:47:10 1.4
+++ pkgsrc/devel/xulrunner/Attic/hacks.mk 2012/05/13 17:51:10 1.5
@@ -1,24 +1,24 @@ @@ -1,24 +1,24 @@
1# $NetBSD: hacks.mk,v 1.4 2012/05/13 14:47:10 bsiegert Exp $ 1# $NetBSD: hacks.mk,v 1.5 2012/05/13 17:51:10 bsiegert Exp $
2 2
3.if !defined(XULRUNNER_HACKS_MK) 3.if !defined(XULRUNNER_HACKS_MK)
4XULRUNNER_HACKS_MK= defined 4XULRUNNER_HACKS_MK= defined
5 5
6.include "../../mk/bsd.fast.prefs.mk" 6.include "../../mk/bsd.fast.prefs.mk"
7.include "../../mk/compiler.mk" 7.include "../../mk/compiler.mk"
8 8
9# PR pkg/44912: gcc generates unaligned SSE2 references 9# PR pkg/44912: gcc generates unaligned SSE2 references
10.if !empty(PKGSRC_COMPILER:Mgcc) && !empty(CC_VERSION:Mgcc-4.[0-3]*) && (!empty(MACHINE_PLATFORM:M*-*-i386) || !empty(MACHINE_PLATFORM:M*-*-x86_64)) 10.if !empty(PKGSRC_COMPILER:Mgcc) && !empty(CC_VERSION:Mgcc-4.[0-3]*) && (!empty(MACHINE_PLATFORM:M*-*-i386) || !empty(MACHINE_PLATFORM:M*-*-x86_64))
11PKG_HACKS+= optimization 11PKG_HACKS+= optimization
12BUILDLINK_TRANSFORM+= rm:-march=[-_A-Za-z0-9]* 12BUILDLINK_TRANSFORM+= rm:-march=[-_A-Za-z0-9]*
13SUBST_CLASSES+= opt-hack 13SUBST_CLASSES+= opt-hack
14SUBST_STAGE.opt-hack= post-patch 14SUBST_STAGE.opt-hack= post-patch
15SUBST_MESSAGE.opt-hack= Working around optimizer bug. 15SUBST_MESSAGE.opt-hack= Working around optimizer bug.
16SUBST_FILES.opt-hack= gfx/skia/Makefile.in 16SUBST_FILES.opt-hack= ${MOZILLA_DIR}gfx/skia/Makefile.in
17SUBST_SED.opt-hack= -e '/SkBlitRow_opts_SSE2/s/-msse2/-msse2 -O0/' 17SUBST_SED.opt-hack= -e '/SkBlitRow_opts_SSE2/s/-msse2/-msse2 -O0/'
18.endif 18.endif
19 19
20.if !empty(PKGSRC_COMPILER:Mclang) 20.if !empty(PKGSRC_COMPILER:Mclang)
21CXXFLAGS+= -Wno-return-type-c-linkage 21CXXFLAGS+= -Wno-return-type-c-linkage
22.endif 22.endif
23 23
24.endif # XULRUNNER_HACKS_MK 24.endif # XULRUNNER_HACKS_MK