head	1.2;
access;
symbols;
locks; strict;
comment	@# @;


1.2
date	2012.11.20.23.18.40;	author svnexp;	state dead;
branches;
next	1.1;

1.1
date	2012.08.30.14.54.17;	author flo;	state Exp;
branches;
next	;


desc
@@


1.2
log
@## SVN ##
## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/ 307606
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ## r307606 | flo | 2012-11-20 23:01:15 +0000 (Tue, 20 Nov 2012) | 14 lines
## SVN ##
## SVN ## - Update firefox and thunderbird to 17.0
## SVN ## - Update seamonkey to 2.14
## SVN ## - Update ESR ports and libxul to 10.0.11
## SVN ## - support more h264 codecs when using GSTREAMER with YouTube
## SVN ## - Unbreak firefox-esr, thunderbird-esr and libxul on head >= 1000024 [1]
## SVN ## - Buildsystem is not python 3 aware, use python up to 2.7 [2]
## SVN ##
## SVN ## PR:		ports/173679 [1]
## SVN ## Submitted by:	swills [1], demon [2]
## SVN ## In collaboration with:	Jan Beich <jbeich@@tormail.org>
## SVN ## Security:	d23119df-335d-11e2-b64c-c8600054b392
## SVN ## Approved by:	portmgr (beat)
## SVN ## Feature safe:	yes
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ##
@
text
@diff --git js/src/Makefile.in js/src/Makefile.in
index 8eb385f..01bd8e3 100644
--- js/src/Makefile.in
+++ js/src/Makefile.in
@@@@ -323,6 +323,7 @@@@ endif
 
 ifneq (,$(filter arm% sparc %86 x86_64 mips%,$(TARGET_CPU)))
 ENABLE_YARR_JIT = 1
+DEFINES += -DENABLE_YARR_JIT=1
 
 VPATH += 	$(srcdir)/assembler/assembler \
 		$(srcdir)/methodjit \
diff --git js/src/assembler/wtf/Platform.h js/src/assembler/wtf/Platform.h
index 6570f2d..0c84896 100644
--- js/src/assembler/wtf/Platform.h
+++ js/src/assembler/wtf/Platform.h
@@@@ -1102,9 +1102,7 @@@@
 #if WTF_PLATFORM_CHROMIUM
 #define ENABLE_YARR_JIT 0
 
-#elif ENABLE_JIT && !defined(ENABLE_YARR_JIT)
-#define ENABLE_YARR_JIT 1
-
+#elif ENABLE_YARR_JIT
 /* Setting this flag compares JIT results with interpreter results. */
 #define ENABLE_YARR_JIT_DEBUG 0
 #endif
diff --git js/src/configure.in js/src/configure.in
index c142eb7..34f98b9 100644
--- js/src/configure.in
+++ js/src/configure.in
@@@@ -3347,7 +3347,10 @@@@ MOZ_ARG_ENABLE_STRING(debug,
                            (using compiler flags DBG)],
 [ if test "$enableval" != "no"; then
     MOZ_DEBUG=1
-    ENABLE_METHODJIT_SPEW=1
+    if test "$ENABLE_METHODJIT"; then
+         # needs MethodJIT or YarrJIT
+         ENABLE_METHODJIT_SPEW=1
+    fi
     if test -n "$enableval" -a "$enableval" != "yes"; then
         MOZ_DEBUG_FLAGS=`echo $enableval | sed -e 's|\\\ | |g'`
         _MOZ_DEBUG_FLAGS_SET=1
@


1.1
log
@SVN rev 303378 on 2012-08-30 14:54:17Z by flo

- update firefox and thunderbird to 15.0
- update firefox-esr, thunderbird-esr, linux-thunderbird and linux-firefox to 10.0.7
- update seamonkey and linux-seamonkey to 2.12
- update nss to 3.13.6
- update bsdipc code (posix_spawn, SysV shared memory)
- rename patches to easily track those not (yet) submitted upstream
- reduce package size, except for www/libxul[1]
- restore default objdir to what it was in 13.0
- fix mail/enigmail after thunderbird build changes
- don't accidentally pick up headers from installed ports[3]
- add support for PREFIX != LOCALBASE to Makefile.webplugins [4]
- document vulnerabilities in vuln.xml
- *miscellaneous cleanups and fixups*

Obtained from:	OpenBSD ports[1]
PR:		ports/159831, ports/160933, ports/170467[3], ports/170236 [4]
Submitted by:	avilla [4]
In collaboration with:	Jan Beich <jbeich@@tormail.net> Who did most of the hard
			work.
@
text
@@

