Sat Aug 15 05:03:30 2009 UTC ()
Fixes PLIST for arm and sparc with jit option.


(obache)
diff -r1.10 -r1.11 pkgsrc/devel/xulrunner/PLIST
diff -r1.2 -r1.3 pkgsrc/devel/xulrunner/options.mk
cvs diff -r1.10 -r1.11 pkgsrc/devel/xulrunner/Attic/PLIST (expand / switch to unified diff)

--- pkgsrc/devel/xulrunner/Attic/PLIST 2009/08/10 13:13:42 1.10
+++ pkgsrc/devel/xulrunner/Attic/PLIST 2009/08/15 05:03:30 1.11
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.10 2009/08/10 13:13:42 tnn Exp $ 1@comment $NetBSD: PLIST,v 1.11 2009/08/15 05:03:30 obache Exp $
2bin/xulrunner 2bin/xulrunner
3include/xulrunner/stable/base64.h 3include/xulrunner/stable/base64.h
4include/xulrunner/stable/blapit.h 4include/xulrunner/stable/blapit.h
5include/xulrunner/stable/cert.h 5include/xulrunner/stable/cert.h
6include/xulrunner/stable/certdb.h 6include/xulrunner/stable/certdb.h
7include/xulrunner/stable/certt.h 7include/xulrunner/stable/certt.h
8include/xulrunner/stable/ciferfam.h 8include/xulrunner/stable/ciferfam.h
9include/xulrunner/stable/cmmf.h 9include/xulrunner/stable/cmmf.h
10include/xulrunner/stable/cmmft.h 10include/xulrunner/stable/cmmft.h
11include/xulrunner/stable/cms.h 11include/xulrunner/stable/cms.h
12include/xulrunner/stable/cmsreclist.h 12include/xulrunner/stable/cmsreclist.h
13include/xulrunner/stable/cmst.h 13include/xulrunner/stable/cmst.h
14include/xulrunner/stable/crmf.h 14include/xulrunner/stable/crmf.h
@@ -450,27 +450,27 @@ include/xulrunner/stable/secpkcs7.h @@ -450,27 +450,27 @@ include/xulrunner/stable/secpkcs7.h
450include/xulrunner/stable/secport.h 450include/xulrunner/stable/secport.h
451include/xulrunner/stable/shsign.h 451include/xulrunner/stable/shsign.h
452include/xulrunner/stable/smime.h 452include/xulrunner/stable/smime.h
453include/xulrunner/stable/ssl.h 453include/xulrunner/stable/ssl.h
454include/xulrunner/stable/sslerr.h 454include/xulrunner/stable/sslerr.h
455include/xulrunner/stable/sslproto.h 455include/xulrunner/stable/sslproto.h
456include/xulrunner/stable/sslt.h 456include/xulrunner/stable/sslt.h
457include/xulrunner/stable/utilrename.h 457include/xulrunner/stable/utilrename.h
458include/xulrunner/stable/xpcom-config.h 458include/xulrunner/stable/xpcom-config.h
459${PLIST.jit}include/xulrunner/unstable/Assembler.h 459${PLIST.jit}include/xulrunner/unstable/Assembler.h
460${PLIST.jit}include/xulrunner/unstable/Fragmento.h 460${PLIST.jit}include/xulrunner/unstable/Fragmento.h
461${PLIST.jit}include/xulrunner/unstable/LIR.h 461${PLIST.jit}include/xulrunner/unstable/LIR.h
462${PLIST.jit}include/xulrunner/unstable/Native.h 462${PLIST.jit}include/xulrunner/unstable/Native.h
463${PLIST.jit}include/xulrunner/unstable/Native${MACHINE_ARCH}.h 463${PLIST.jit}include/xulrunner/unstable/Native${NANOJIT_ARCH}.h
464include/xulrunner/unstable/ProxyJNI.h 464include/xulrunner/unstable/ProxyJNI.h
465${PLIST.jit}include/xulrunner/unstable/RegAlloc.h 465${PLIST.jit}include/xulrunner/unstable/RegAlloc.h
466${PLIST.jit}include/xulrunner/unstable/TraceTreeDrawer.h 466${PLIST.jit}include/xulrunner/unstable/TraceTreeDrawer.h
467include/xulrunner/unstable/XPCIDispatch.h 467include/xulrunner/unstable/XPCIDispatch.h
468${PLIST.jit}include/xulrunner/unstable/avmplus.h 468${PLIST.jit}include/xulrunner/unstable/avmplus.h
469include/xulrunner/unstable/base64.h 469include/xulrunner/unstable/base64.h
470include/xulrunner/unstable/blapit.h 470include/xulrunner/unstable/blapit.h
471include/xulrunner/unstable/bool.h 471include/xulrunner/unstable/bool.h
472include/xulrunner/unstable/cert.h 472include/xulrunner/unstable/cert.h
473include/xulrunner/unstable/certdb.h 473include/xulrunner/unstable/certdb.h
474include/xulrunner/unstable/certt.h 474include/xulrunner/unstable/certt.h
475include/xulrunner/unstable/ciferfam.h 475include/xulrunner/unstable/ciferfam.h
476include/xulrunner/unstable/cmmf.h 476include/xulrunner/unstable/cmmf.h
cvs diff -r1.2 -r1.3 pkgsrc/devel/xulrunner/Attic/options.mk (expand / switch to unified diff)

--- pkgsrc/devel/xulrunner/Attic/options.mk 2009/08/09 21:05:02 1.2
+++ pkgsrc/devel/xulrunner/Attic/options.mk 2009/08/15 05:03:30 1.3
@@ -1,37 +1,41 @@ @@ -1,37 +1,41 @@
1# $NetBSD: options.mk,v 1.2 2009/08/09 21:05:02 tnn Exp $ 1# $NetBSD: options.mk,v 1.3 2009/08/15 05:03:30 obache Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.xulrunner 3PKG_OPTIONS_VAR= PKG_OPTIONS.xulrunner
4PKG_SUPPORTED_OPTIONS= debug mozilla-jemalloc 4PKG_SUPPORTED_OPTIONS= debug mozilla-jemalloc
5 5
6PLIST_VARS+= jit 6PLIST_VARS+= jit
7 7
8.if ${OPSYS} == "Linux" || ${OPSYS} == "SunOS" 8.if ${OPSYS} == "Linux" || ${OPSYS} == "SunOS"
9PKG_SUGGESTED_OPTIONS+= mozilla-jemalloc 9PKG_SUGGESTED_OPTIONS+= mozilla-jemalloc
10.endif 10.endif
11 11
12.if !empty(MACHINE_ARCH:Mi386) || !empty(MACHINE_ARCH:Msparc) || \ 12.if !empty(MACHINE_ARCH:Mi386) || !empty(MACHINE_ARCH:Msparc) || \
13 !empty(MACHINE_ARCH:Marm) 13 !empty(MACHINE_ARCH:Marm)
14PKG_SUPPORTED_OPTIONS+= mozilla-jit 14PKG_SUPPORTED_OPTIONS+= mozilla-jit
15PKG_SUGGESTED_OPTIONS+= mozilla-jit 15PKG_SUGGESTED_OPTIONS+= mozilla-jit
 16NANOJIT_ARCH.i386= i386
 17NANOJIT_ARCH.arm= ARM
 18NANOJIT_ARCH.sparc= Sparc
16.endif 19.endif
17 20
18.include "../../mk/bsd.options.mk" 21.include "../../mk/bsd.options.mk"
19 22
20.if !empty(PKG_OPTIONS:Mmozilla-jemalloc) 23.if !empty(PKG_OPTIONS:Mmozilla-jemalloc)
21CONFIGURE_ARGS+= --enable-jemalloc 24CONFIGURE_ARGS+= --enable-jemalloc
22.else 25.else
23CONFIGURE_ARGS+= --disable-jemalloc 26CONFIGURE_ARGS+= --disable-jemalloc
24.endif 27.endif
25 28
26.if !empty(PKG_OPTIONS:Mdebug) 29.if !empty(PKG_OPTIONS:Mdebug)
27CONFIGURE_ARGS+= --enable-debug 30CONFIGURE_ARGS+= --enable-debug
28.else 31.else
29CONFIGURE_ARGS+= --disable-debug 32CONFIGURE_ARGS+= --disable-debug
30.endif 33.endif
31 34
32.if !empty(PKG_OPTIONS:Mmozilla-jit) 35.if !empty(PKG_OPTIONS:Mmozilla-jit)
33PLIST.jit= yes 36PLIST.jit= yes
 37PLIST_SUBST+= NANOJIT_ARCH=${NANOJIT_ARCH.${MACHINE_ARCH}}
34CONFIGURE_ARGS+= --enable-jit 38CONFIGURE_ARGS+= --enable-jit
35.else 39.else
36CONFIGURE_ARGS+= --disable-jit 40CONFIGURE_ARGS+= --disable-jit
37.endif 41.endif