Add missing nanojit conditionals to PLIST. Should fix PR pkg/45282.

2 files changed, 29 insertions, 23 deletions

diff --git a/mail/thunderbird/PLIST b/mail/thunderbird/PLIST
index 91250d96a4b..b76f082a668 100644
--- a/mail/thunderbird/PLIST
+++ b/mail/thunderbird/PLIST
@@ -1,16 +1,16 @@
-@comment $NetBSD: PLIST,v 1.33 2011/08/19 14:39:09 tnn Exp $
+@comment $NetBSD: PLIST,v 1.34 2011/08/23 18:04:17 tnn Exp $
 bin/thunderbird
-include/thunderbird/Allocator.h
-include/thunderbird/Assembler.h
+${PLIST.jit}include/thunderbird/Allocator.h
+${PLIST.jit}include/thunderbird/Assembler.h
 include/thunderbird/AtkSocketAccessible.h
 include/thunderbird/BasicLayers.h
 include/thunderbird/CheckedInt.h
-include/thunderbird/CodeAlloc.h
-include/thunderbird/Containers.h
+${PLIST.jit}include/thunderbird/CodeAlloc.h
+${PLIST.jit}include/thunderbird/Containers.h
 include/thunderbird/CustomQS_Canvas2D.h
 include/thunderbird/CustomQS_WebGL.h
 include/thunderbird/EGLUtils.h
-include/thunderbird/Fragmento.h
+${PLIST.jit}include/thunderbird/Fragmento.h
 include/thunderbird/FrameLayerBuilder.h
 include/thunderbird/FramePropertyTable.h
 include/thunderbird/GLContext.h
@@ -25,27 +25,27 @@ include/thunderbird/IPC/nsGUIEventIPC.h
 include/thunderbird/ImageErrors.h
 include/thunderbird/ImageLayers.h
 include/thunderbird/ImageLogging.h
-include/thunderbird/LIR.h
-include/thunderbird/LIRopcode.tbl
+${PLIST.jit}include/thunderbird/LIR.h
+${PLIST.jit}include/thunderbird/LIRopcode.tbl
 include/thunderbird/LayerManagerOGL.h
 include/thunderbird/LayerManagerOGLProgram.h
 include/thunderbird/Layers.h
 include/thunderbird/MailNewsTypes.h
 include/thunderbird/MailNewsTypes2.h
 include/thunderbird/NSReg.h
-include/thunderbird/Native.h
-include/thunderbird/NativeCommon.h
-include/thunderbird/NativeX64.h
+${PLIST.jit}include/thunderbird/Native.h
+${PLIST.jit}include/thunderbird/NativeCommon.h
+${PLIST.jit}include/thunderbird/Native${NANOJIT_ARCH}.h
 include/thunderbird/PCOMContentPermissionRequestChild.h
 include/thunderbird/PPrefTuple.h
 include/thunderbird/PrefTuple.h
 include/thunderbird/ReadbackLayer.h
-include/thunderbird/RegAlloc.h
+${PLIST.jit}include/thunderbird/RegAlloc.h
 include/thunderbird/TabMessageUtils.h
-include/thunderbird/VMPI.h
+${PLIST.jit}include/thunderbird/VMPI.h
 include/thunderbird/VerReg.h
 include/thunderbird/VideoUtils.h
-include/thunderbird/Writer.h
+${PLIST.jit}include/thunderbird/Writer.h
 include/thunderbird/XPCIDispatch.h
 include/thunderbird/a11yGeneric.h
 include/thunderbird/amIInstallTrigger.h
@@ -53,7 +53,7 @@ include/thunderbird/amIWebInstallListener.h
 include/thunderbird/amIWebInstaller.h
 include/thunderbird/angle/ResourceLimits.h
 include/thunderbird/angle/ShaderLang.h
-include/thunderbird/avmplus.h
+${PLIST.jit}include/thunderbird/avmplus.h
 include/thunderbird/base64.h
 include/thunderbird/blapit.h
 include/thunderbird/cairo/cairo-deprecated.h
@@ -175,7 +175,7 @@ include/thunderbird/jsautocfg.h
 include/thunderbird/jsautokw.h
 include/thunderbird/jsbit.h
 include/thunderbird/jsbool.h
-include/thunderbird/jsbuiltins.h
+${PLIST.jit}include/thunderbird/jsbuiltins.h
 include/thunderbird/jscell.h
 include/thunderbird/jsclist.h
 include/thunderbird/jsclone.h
@@ -509,13 +509,13 @@ include/thunderbird/mozilla/throw_gcc.h
 include/thunderbird/mozilla/unused.h
 include/thunderbird/mozpngconf.h
 include/thunderbird/msgCore.h
-include/thunderbird/nanojit.h
+${PLIST.jit}include/thunderbird/nanojit.h
 include/thunderbird/necko-config.h
 include/thunderbird/nestegg/nestegg-stdint.h
 include/thunderbird/nestegg/nestegg.h
 include/thunderbird/netCore.h
-include/thunderbird/njconfig.h
-include/thunderbird/njcpudetect.h
+${PLIST.jit}include/thunderbird/njconfig.h
+${PLIST.jit}include/thunderbird/njcpudetect.h
 include/thunderbird/npapi.h
 include/thunderbird/npfunctions.h
 include/thunderbird/npruntime.h
diff --git a/mail/thunderbird/options.mk b/mail/thunderbird/options.mk
index 782e81d8343..204e6f75410 100644
--- a/mail/thunderbird/options.mk
+++ b/mail/thunderbird/options.mk
@@ -1,10 +1,10 @@
-# $NetBSD: options.mk,v 1.7 2011/08/19 14:39:09 tnn Exp $
+# $NetBSD: options.mk,v 1.8 2011/08/23 18:04:17 tnn Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.thunderbird
 PKG_SUPPORTED_OPTIONS=	debug mozilla-jemalloc gnome official-mozilla-branding mozilla-lightning mozilla-enigmail
 PKG_SUGGESTED_OPTIONS=	mozilla-lightning
 
-PLIST_VARS+=		branding nobranding debug gnome
+PLIST_VARS+=		branding nobranding debug gnome jit
 
 .if ${OPSYS} == "Linux" || ${OPSYS} == "SunOS"
 PKG_SUGGESTED_OPTIONS+=	mozilla-jemalloc
@@ -14,6 +14,10 @@ PKG_SUGGESTED_OPTIONS+=	mozilla-jemalloc
 	!empty(MACHINE_ARCH:Marm) || !empty(MACHINE_ARCH:Mx86_64)
 PKG_SUPPORTED_OPTIONS+=	mozilla-jit
 PKG_SUGGESTED_OPTIONS+=	mozilla-jit
+NANOJIT_ARCH.i386=	i386
+NANOJIT_ARCH.arm=	ARM
+NANOJIT_ARCH.sparc=	Sparc
+NANOJIT_ARCH.x86_64=	X64
 .endif
 
 .include "../../mk/bsd.options.mk"
@@ -41,9 +45,11 @@ CONFIGURE_ARGS+=	--disable-debug
 .endif
 
 .if !empty(PKG_OPTIONS:Mmozilla-jit)
-CONFIGURE_ARGS+=	--enable-jit
+PLIST.jit=		yes
+PLIST_SUBST+=		NANOJIT_ARCH=${NANOJIT_ARCH.${MACHINE_ARCH}}
+CONFIGURE_ARGS+=	--enable-tracejit
 .else
-CONFIGURE_ARGS+=	--disable-jit
+CONFIGURE_ARGS+=	--disable-tracejit
 .endif
 
 .if !empty(PKG_OPTIONS:Mmozilla-lightning)