Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 9 Jun 2012 01:50:07 GMT
From:      svn-freebsd-gecko@chruetertee.ch
To:        freebsd-gecko@freebsd.org
Subject:   [SVN-Commit] r742 - in branches/experimental: mail/thunderbird mail/thunderbird-beta mail/thunderbird-beta/files mail/thunderbird-esr mail/thunderbird-esr/files mail/thunderbird/files www/firefox www/firefox-beta www/firefox-beta/files www/firefox-esr www/firefox-esr/files www/firefox-nightly www/firefox-nightly/files www/firefox/files www/libxul/files www/seamonkey www/seamonkey-beta www/seamonkey-beta/files www/seamonkey/files
Message-ID:  <201206090150.q591o7CM060178@trillian.chruetertee.ch>

next in thread | raw e-mail | index | archive | help
Author: jbeich
Date: Sat Jun  9 01:50:07 2012
New Revision: 742

Log:
- restore more powerpc patches
- remove libffi-configure patch in libxul, present in devel/libffi

Deleted:
   branches/experimental/www/libxul/files/patch-js-src-ctypes-libffi-configure
Modified:
   branches/experimental/mail/thunderbird-beta/Makefile
   branches/experimental/mail/thunderbird-beta/files/patch-mozilla-js-src-configure.in
   branches/experimental/mail/thunderbird-beta/files/patch-mozilla-xpcom-reflect-xptcall-src-md-unix-Makefile.in
   branches/experimental/mail/thunderbird-esr/Makefile
   branches/experimental/mail/thunderbird-esr/files/patch-mozilla-js-src-configure.in
   branches/experimental/mail/thunderbird-esr/files/patch-mozilla-xpcom-reflect-xptcall-src-md-unix-Makefile.in
   branches/experimental/mail/thunderbird/Makefile
   branches/experimental/mail/thunderbird/files/patch-mozilla-js-src-configure.in
   branches/experimental/mail/thunderbird/files/patch-mozilla-xpcom-reflect-xptcall-src-md-unix-Makefile.in
   branches/experimental/www/firefox-beta/Makefile
   branches/experimental/www/firefox-beta/files/patch-js-src-configure.in
   branches/experimental/www/firefox-beta/files/patch-xpcom_reflect_xptcall_src_md_unix_Makefile.in
   branches/experimental/www/firefox-esr/Makefile
   branches/experimental/www/firefox-esr/files/patch-js-src-configure.in
   branches/experimental/www/firefox-esr/files/patch-xpcom_reflect_xptcall_src_md_unix_Makefile.in
   branches/experimental/www/firefox-nightly/Makefile
   branches/experimental/www/firefox-nightly/files/patch-xpcom_reflect_xptcall_src_md_unix_Makefile.in
   branches/experimental/www/firefox/Makefile
   branches/experimental/www/firefox/files/patch-js-src-configure.in
   branches/experimental/www/firefox/files/patch-xpcom_reflect_xptcall_src_md_unix_Makefile.in
   branches/experimental/www/libxul/files/patch-js-src-configure.in
   branches/experimental/www/seamonkey-beta/Makefile
   branches/experimental/www/seamonkey-beta/files/patch-mozilla-js-src-configure.in
   branches/experimental/www/seamonkey-beta/files/patch-mozilla-xpcom-reflect-xptcall-src-md-unix-Makefile.in
   branches/experimental/www/seamonkey/Makefile
   branches/experimental/www/seamonkey/files/patch-mozilla-js-src-configure.in
   branches/experimental/www/seamonkey/files/patch-mozilla-xpcom-reflect-xptcall-src-md-unix-Makefile.in

Modified: branches/experimental/mail/thunderbird-beta/Makefile
==============================================================================
--- branches/experimental/mail/thunderbird-beta/Makefile	Sat Jun  9 01:48:03 2012	(r741)
+++ branches/experimental/mail/thunderbird-beta/Makefile	Sat Jun  9 01:50:07 2012	(r742)
@@ -71,6 +71,15 @@
 .endif
 .endif
 
+.if ${ARCH} == powerpc64
+.if ${OSVERSION} < 900033
+BROKEN=		Needs binutils 2.17.50 to build
+.else
+CONFIGURE_ENV+=	UNAME_m="powerpc64"
+CFLAGS+=	-mminimal-toc
+.endif
+.endif
+
 .if ${HAVE_GNOME:Mlibgnomeui}!=""
 USE_GNOME+=	libgnomeui
 MOZ_OPTIONS+=	--enable-gnomeui

Modified: branches/experimental/mail/thunderbird-beta/files/patch-mozilla-js-src-configure.in
==============================================================================
--- branches/experimental/mail/thunderbird-beta/files/patch-mozilla-js-src-configure.in	Sat Jun  9 01:48:03 2012	(r741)
+++ branches/experimental/mail/thunderbird-beta/files/patch-mozilla-js-src-configure.in	Sat Jun  9 01:50:07 2012	(r742)
@@ -35,3 +35,11 @@
  x86_64*-*)
      ENABLE_METHODJIT=1
      ENABLE_MONOIC=1
+@@ -5946,6 +5946,7 @@ _EGREP_PATTERN="${_EGREP_PATTERN}dummy_n
+  * C++ implementations should define these macros only when __STDC_LIMIT_MACROS
+  * is defined before <stdint.h> is included. */
+ #define __STDC_LIMIT_MACROS
++#define __STDC_CONSTANT_MACROS
+ 
+ #endif /* _JS_CONFDEFS_H_ */
+ 

Modified: branches/experimental/mail/thunderbird-beta/files/patch-mozilla-xpcom-reflect-xptcall-src-md-unix-Makefile.in
==============================================================================
--- branches/experimental/mail/thunderbird-beta/files/patch-mozilla-xpcom-reflect-xptcall-src-md-unix-Makefile.in	Sat Jun  9 01:48:03 2012	(r741)
+++ branches/experimental/mail/thunderbird-beta/files/patch-mozilla-xpcom-reflect-xptcall-src-md-unix-Makefile.in	Sat Jun  9 01:50:07 2012	(r742)
@@ -58,6 +58,15 @@
  CPPSRCS		:= xptcinvoke_ppc_linux.cpp xptcstubs_ppc_linux.cpp
  ASFILES		:= xptcinvoke_asm_ppc_linux.s xptcstubs_asm_ppc_linux.s
  AS		:= $(CC) -c -x assembler-with-cpp
+@@ -350,7 +365,7 @@
+ #
+ # Linux/PPC64
+ #
+-ifeq ($(OS_ARCH)$(OS_TEST),Linuxpowerpc64)
++ifneq (,$(filter Linuxpowerpc64 FreeBSDpowerpc64,$(OS_ARCH)$(OS_TEST)))
+ CPPSRCS                := xptcinvoke_ppc64_linux.cpp xptcstubs_ppc64_linux.cpp
+ ASFILES                := xptcinvoke_asm_ppc64_linux.s xptcstubs_asm_ppc64_linux.s
+ AS             := $(CC) -c -x assembler-with-cpp
 @@ -419,6 +434,15 @@
  ASFILES		:= xptcinvoke_asm_sparc_netbsd.s xptcstubs_asm_sparc_netbsd.s
  endif

Modified: branches/experimental/mail/thunderbird-esr/Makefile
==============================================================================
--- branches/experimental/mail/thunderbird-esr/Makefile	Sat Jun  9 01:48:03 2012	(r741)
+++ branches/experimental/mail/thunderbird-esr/Makefile	Sat Jun  9 01:50:07 2012	(r742)
@@ -72,6 +72,15 @@
 .endif
 .endif
 
+.if ${ARCH} == powerpc64
+.if ${OSVERSION} < 900033
+BROKEN=		Needs binutils 2.17.50 to build
+.else
+CONFIGURE_ENV+=	UNAME_m="powerpc64"
+CFLAGS+=	-mminimal-toc
+.endif
+.endif
+
 .if ${HAVE_GNOME:Mlibgnomeui}!=""
 USE_GNOME+=	libgnomeui
 MOZ_OPTIONS+=	--enable-gnomeui

Modified: branches/experimental/mail/thunderbird-esr/files/patch-mozilla-js-src-configure.in
==============================================================================
--- branches/experimental/mail/thunderbird-esr/files/patch-mozilla-js-src-configure.in	Sat Jun  9 01:48:03 2012	(r741)
+++ branches/experimental/mail/thunderbird-esr/files/patch-mozilla-js-src-configure.in	Sat Jun  9 01:50:07 2012	(r742)
@@ -62,3 +62,11 @@
  x86_64*-*)
      AC_DEFINE(AVMPLUS_AMD64)
      AC_DEFINE(AVMPLUS_64BIT)
+@@ -5946,6 +5946,7 @@ _EGREP_PATTERN="${_EGREP_PATTERN}dummy_n
+  * C++ implementations should define these macros only when __STDC_LIMIT_MACROS
+  * is defined before <stdint.h> is included. */
+ #define __STDC_LIMIT_MACROS
++#define __STDC_CONSTANT_MACROS
+ 
+ #endif /* _JS_CONFDEFS_H_ */
+ 

Modified: branches/experimental/mail/thunderbird-esr/files/patch-mozilla-xpcom-reflect-xptcall-src-md-unix-Makefile.in
==============================================================================
--- branches/experimental/mail/thunderbird-esr/files/patch-mozilla-xpcom-reflect-xptcall-src-md-unix-Makefile.in	Sat Jun  9 01:48:03 2012	(r741)
+++ branches/experimental/mail/thunderbird-esr/files/patch-mozilla-xpcom-reflect-xptcall-src-md-unix-Makefile.in	Sat Jun  9 01:50:07 2012	(r742)
@@ -58,6 +58,15 @@
  CPPSRCS		:= xptcinvoke_ppc_linux.cpp xptcstubs_ppc_linux.cpp
  ASFILES		:= xptcinvoke_asm_ppc_linux.s xptcstubs_asm_ppc_linux.s
  AS		:= $(CC) -c -x assembler-with-cpp
+@@ -350,7 +365,7 @@
+ #
+ # Linux/PPC64
+ #
+-ifeq ($(OS_ARCH)$(OS_TEST),Linuxpowerpc64)
++ifneq (,$(filter Linuxpowerpc64 FreeBSDpowerpc64,$(OS_ARCH)$(OS_TEST)))
+ CPPSRCS                := xptcinvoke_ppc64_linux.cpp xptcstubs_ppc64_linux.cpp
+ ASFILES                := xptcinvoke_asm_ppc64_linux.s xptcstubs_asm_ppc64_linux.s
+ AS             := $(CC) -c -x assembler-with-cpp
 @@ -419,6 +434,15 @@
  ASFILES		:= xptcinvoke_asm_sparc_netbsd.s xptcstubs_asm_sparc_netbsd.s
  endif

Modified: branches/experimental/mail/thunderbird/Makefile
==============================================================================
--- branches/experimental/mail/thunderbird/Makefile	Sat Jun  9 01:48:03 2012	(r741)
+++ branches/experimental/mail/thunderbird/Makefile	Sat Jun  9 01:50:07 2012	(r742)
@@ -75,6 +75,15 @@
 .endif
 .endif
 
+.if ${ARCH} == powerpc64
+.if ${OSVERSION} < 900033
+BROKEN=		Needs binutils 2.17.50 to build
+.else
+CONFIGURE_ENV+=	UNAME_m="powerpc64"
+CFLAGS+=	-mminimal-toc
+.endif
+.endif
+
 .if ${HAVE_GNOME:Mlibgnomeui}!=""
 USE_GNOME+=	libgnomeui
 MOZ_OPTIONS+=	--enable-gnomeui

Modified: branches/experimental/mail/thunderbird/files/patch-mozilla-js-src-configure.in
==============================================================================
--- branches/experimental/mail/thunderbird/files/patch-mozilla-js-src-configure.in	Sat Jun  9 01:48:03 2012	(r741)
+++ branches/experimental/mail/thunderbird/files/patch-mozilla-js-src-configure.in	Sat Jun  9 01:50:07 2012	(r742)
@@ -35,3 +35,11 @@
  x86_64*-*)
      ENABLE_METHODJIT=1
      ENABLE_MONOIC=1
+@@ -5946,6 +5946,7 @@ _EGREP_PATTERN="${_EGREP_PATTERN}dummy_n
+  * C++ implementations should define these macros only when __STDC_LIMIT_MACROS
+  * is defined before <stdint.h> is included. */
+ #define __STDC_LIMIT_MACROS
++#define __STDC_CONSTANT_MACROS
+ 
+ #endif /* _JS_CONFDEFS_H_ */
+ 

Modified: branches/experimental/mail/thunderbird/files/patch-mozilla-xpcom-reflect-xptcall-src-md-unix-Makefile.in
==============================================================================
--- branches/experimental/mail/thunderbird/files/patch-mozilla-xpcom-reflect-xptcall-src-md-unix-Makefile.in	Sat Jun  9 01:48:03 2012	(r741)
+++ branches/experimental/mail/thunderbird/files/patch-mozilla-xpcom-reflect-xptcall-src-md-unix-Makefile.in	Sat Jun  9 01:50:07 2012	(r742)
@@ -58,6 +58,15 @@
  CPPSRCS		:= xptcinvoke_ppc_linux.cpp xptcstubs_ppc_linux.cpp
  ASFILES		:= xptcinvoke_asm_ppc_linux.s xptcstubs_asm_ppc_linux.s
  AS		:= $(CC) -c -x assembler-with-cpp
+@@ -350,7 +365,7 @@
+ #
+ # Linux/PPC64
+ #
+-ifeq ($(OS_ARCH)$(OS_TEST),Linuxpowerpc64)
++ifneq (,$(filter Linuxpowerpc64 FreeBSDpowerpc64,$(OS_ARCH)$(OS_TEST)))
+ CPPSRCS                := xptcinvoke_ppc64_linux.cpp xptcstubs_ppc64_linux.cpp
+ ASFILES                := xptcinvoke_asm_ppc64_linux.s xptcstubs_asm_ppc64_linux.s
+ AS             := $(CC) -c -x assembler-with-cpp
 @@ -419,6 +434,15 @@
  ASFILES		:= xptcinvoke_asm_sparc_netbsd.s xptcstubs_asm_sparc_netbsd.s
  endif

Modified: branches/experimental/www/firefox-beta/Makefile
==============================================================================
--- branches/experimental/www/firefox-beta/Makefile	Sat Jun  9 01:48:03 2012	(r741)
+++ branches/experimental/www/firefox-beta/Makefile	Sat Jun  9 01:50:07 2012	(r742)
@@ -62,6 +62,15 @@
 
 WRKSRC:=	${WRKDIR}/mozilla-release
 
+.if ${ARCH} == powerpc64
+.if ${OSVERSION} < 900033
+BROKEN=		Needs binutils 2.17.50 to build
+.else
+CONFIGURE_ENV+=	UNAME_m="powerpc64"
+CFLAGS+=	-mminimal-toc
+.endif
+.endif
+
 .if ${HAVE_GNOME:Mlibgnomeui}!=""
 USE_GNOME+=	libgnomeui
 MOZ_OPTIONS+=	--enable-gnomeui

Modified: branches/experimental/www/firefox-beta/files/patch-js-src-configure.in
==============================================================================
--- branches/experimental/www/firefox-beta/files/patch-js-src-configure.in	Sat Jun  9 01:48:03 2012	(r741)
+++ branches/experimental/www/firefox-beta/files/patch-js-src-configure.in	Sat Jun  9 01:50:07 2012	(r742)
@@ -35,3 +35,11 @@
  x86_64*-*)
      ENABLE_METHODJIT=1
      ENABLE_MONOIC=1
+@@ -5946,6 +5946,7 @@ _EGREP_PATTERN="${_EGREP_PATTERN}dummy_n
+  * C++ implementations should define these macros only when __STDC_LIMIT_MACROS
+  * is defined before <stdint.h> is included. */
+ #define __STDC_LIMIT_MACROS
++#define __STDC_CONSTANT_MACROS
+ 
+ #endif /* _JS_CONFDEFS_H_ */
+ 

Modified: branches/experimental/www/firefox-beta/files/patch-xpcom_reflect_xptcall_src_md_unix_Makefile.in
==============================================================================
--- branches/experimental/www/firefox-beta/files/patch-xpcom_reflect_xptcall_src_md_unix_Makefile.in	Sat Jun  9 01:48:03 2012	(r741)
+++ branches/experimental/www/firefox-beta/files/patch-xpcom_reflect_xptcall_src_md_unix_Makefile.in	Sat Jun  9 01:50:07 2012	(r742)
@@ -58,6 +58,15 @@
  CPPSRCS		:= xptcinvoke_ppc_linux.cpp xptcstubs_ppc_linux.cpp
  ASFILES		:= xptcinvoke_asm_ppc_linux.s xptcstubs_asm_ppc_linux.s
  AS		:= $(CC) -c -x assembler-with-cpp
+@@ -350,7 +365,7 @@
+ #
+ # Linux/PPC64
+ #
+-ifeq ($(OS_ARCH)$(OS_TEST),Linuxpowerpc64)
++ifneq (,$(filter Linuxpowerpc64 FreeBSDpowerpc64,$(OS_ARCH)$(OS_TEST)))
+ CPPSRCS                := xptcinvoke_ppc64_linux.cpp xptcstubs_ppc64_linux.cpp
+ ASFILES                := xptcinvoke_asm_ppc64_linux.s xptcstubs_asm_ppc64_linux.s
+ AS             := $(CC) -c -x assembler-with-cpp
 @@ -419,6 +434,15 @@
  ASFILES		:= xptcinvoke_asm_sparc_netbsd.s xptcstubs_asm_sparc_netbsd.s
  endif

Modified: branches/experimental/www/firefox-esr/Makefile
==============================================================================
--- branches/experimental/www/firefox-esr/Makefile	Sat Jun  9 01:48:03 2012	(r741)
+++ branches/experimental/www/firefox-esr/Makefile	Sat Jun  9 01:50:07 2012	(r742)
@@ -59,6 +59,15 @@
 
 WRKSRC:=	${WRKDIR}/mozilla-esr10
 
+.if ${ARCH} == powerpc64
+.if ${OSVERSION} < 900033
+BROKEN=		Needs binutils 2.17.50 to build
+.else
+CONFIGURE_ENV+=	UNAME_m="powerpc64"
+CFLAGS+=	-mminimal-toc
+.endif
+.endif
+
 .if ${HAVE_GNOME:Mlibgnomeui}!=""
 USE_GNOME+=	libgnomeui
 MOZ_OPTIONS+=	--enable-gnomeui

Modified: branches/experimental/www/firefox-esr/files/patch-js-src-configure.in
==============================================================================
--- branches/experimental/www/firefox-esr/files/patch-js-src-configure.in	Sat Jun  9 01:48:03 2012	(r741)
+++ branches/experimental/www/firefox-esr/files/patch-js-src-configure.in	Sat Jun  9 01:50:07 2012	(r742)
@@ -62,3 +62,11 @@
  x86_64*-*)
      AC_DEFINE(AVMPLUS_AMD64)
      AC_DEFINE(AVMPLUS_64BIT)
+@@ -5946,6 +5946,7 @@ _EGREP_PATTERN="${_EGREP_PATTERN}dummy_n
+  * C++ implementations should define these macros only when __STDC_LIMIT_MACROS
+  * is defined before <stdint.h> is included. */
+ #define __STDC_LIMIT_MACROS
++#define __STDC_CONSTANT_MACROS
+ 
+ #endif /* _JS_CONFDEFS_H_ */
+ 

Modified: branches/experimental/www/firefox-esr/files/patch-xpcom_reflect_xptcall_src_md_unix_Makefile.in
==============================================================================
--- branches/experimental/www/firefox-esr/files/patch-xpcom_reflect_xptcall_src_md_unix_Makefile.in	Sat Jun  9 01:48:03 2012	(r741)
+++ branches/experimental/www/firefox-esr/files/patch-xpcom_reflect_xptcall_src_md_unix_Makefile.in	Sat Jun  9 01:50:07 2012	(r742)
@@ -58,6 +58,15 @@
  CPPSRCS		:= xptcinvoke_ppc_linux.cpp xptcstubs_ppc_linux.cpp
  ASFILES		:= xptcinvoke_asm_ppc_linux.s xptcstubs_asm_ppc_linux.s
  AS		:= $(CC) -c -x assembler-with-cpp
+@@ -350,7 +365,7 @@
+ #
+ # Linux/PPC64
+ #
+-ifeq ($(OS_ARCH)$(OS_TEST),Linuxpowerpc64)
++ifneq (,$(filter Linuxpowerpc64 FreeBSDpowerpc64,$(OS_ARCH)$(OS_TEST)))
+ CPPSRCS                := xptcinvoke_ppc64_linux.cpp xptcstubs_ppc64_linux.cpp
+ ASFILES                := xptcinvoke_asm_ppc64_linux.s xptcstubs_asm_ppc64_linux.s
+ AS             := $(CC) -c -x assembler-with-cpp
 @@ -419,6 +434,15 @@
  ASFILES		:= xptcinvoke_asm_sparc_netbsd.s xptcstubs_asm_sparc_netbsd.s
  endif

Modified: branches/experimental/www/firefox-nightly/Makefile
==============================================================================
--- branches/experimental/www/firefox-nightly/Makefile	Sat Jun  9 01:48:03 2012	(r741)
+++ branches/experimental/www/firefox-nightly/Makefile	Sat Jun  9 01:50:07 2012	(r742)
@@ -68,6 +68,15 @@
 
 WRKSRC:=	${WRKSRC}-central-${HGREV:C/.*://}
 
+.if ${ARCH} == powerpc64
+.if ${OSVERSION} < 900033
+BROKEN=		Needs binutils 2.17.50 to build
+.else
+CONFIGURE_ENV+=	UNAME_m="powerpc64"
+CFLAGS+=	-mminimal-toc
+.endif
+.endif
+
 .if ${HAVE_GNOME:Mlibgnomeui}!=""
 USE_GNOME+=	libgnomeui
 MOZ_OPTIONS+=	--enable-gnomeui

Modified: branches/experimental/www/firefox-nightly/files/patch-xpcom_reflect_xptcall_src_md_unix_Makefile.in
==============================================================================
--- branches/experimental/www/firefox-nightly/files/patch-xpcom_reflect_xptcall_src_md_unix_Makefile.in	Sat Jun  9 01:48:03 2012	(r741)
+++ branches/experimental/www/firefox-nightly/files/patch-xpcom_reflect_xptcall_src_md_unix_Makefile.in	Sat Jun  9 01:50:07 2012	(r742)
@@ -58,6 +58,15 @@
  CPPSRCS		:= xptcinvoke_ppc_linux.cpp xptcstubs_ppc_linux.cpp
  ASFILES		:= xptcinvoke_asm_ppc_linux.s xptcstubs_asm_ppc_linux.s
  AS		:= $(CC) -c -x assembler-with-cpp
+@@ -350,7 +365,7 @@
+ #
+ # Linux/PPC64
+ #
+-ifeq ($(OS_ARCH)$(OS_TEST),Linuxpowerpc64)
++ifneq (,$(filter Linuxpowerpc64 FreeBSDpowerpc64,$(OS_ARCH)$(OS_TEST)))
+ CPPSRCS                := xptcinvoke_ppc64_linux.cpp xptcstubs_ppc64_linux.cpp
+ ASFILES                := xptcinvoke_asm_ppc64_linux.s xptcstubs_asm_ppc64_linux.s
+ AS             := $(CC) -c -x assembler-with-cpp
 @@ -419,6 +434,15 @@
  ASFILES		:= xptcinvoke_asm_sparc_netbsd.s xptcstubs_asm_sparc_netbsd.s
  endif

Modified: branches/experimental/www/firefox/Makefile
==============================================================================
--- branches/experimental/www/firefox/Makefile	Sat Jun  9 01:48:03 2012	(r741)
+++ branches/experimental/www/firefox/Makefile	Sat Jun  9 01:50:07 2012	(r742)
@@ -58,6 +58,15 @@
 
 WRKSRC:=	${WRKDIR}/mozilla-release
 
+.if ${ARCH} == powerpc64
+.if ${OSVERSION} < 900033
+BROKEN=		Needs binutils 2.17.50 to build
+.else
+CONFIGURE_ENV+=	UNAME_m="powerpc64"
+CFLAGS+=	-mminimal-toc
+.endif
+.endif
+
 .if ${HAVE_GNOME:Mlibgnomeui}!=""
 USE_GNOME+=	libgnomeui
 MOZ_OPTIONS+=	--enable-gnomeui

Modified: branches/experimental/www/firefox/files/patch-js-src-configure.in
==============================================================================
--- branches/experimental/www/firefox/files/patch-js-src-configure.in	Sat Jun  9 01:48:03 2012	(r741)
+++ branches/experimental/www/firefox/files/patch-js-src-configure.in	Sat Jun  9 01:50:07 2012	(r742)
@@ -35,3 +35,11 @@
  x86_64*-*)
      ENABLE_METHODJIT=1
      ENABLE_MONOIC=1
+@@ -5946,6 +5946,7 @@ _EGREP_PATTERN="${_EGREP_PATTERN}dummy_n
+  * C++ implementations should define these macros only when __STDC_LIMIT_MACROS
+  * is defined before <stdint.h> is included. */
+ #define __STDC_LIMIT_MACROS
++#define __STDC_CONSTANT_MACROS
+ 
+ #endif /* _JS_CONFDEFS_H_ */
+ 

Modified: branches/experimental/www/firefox/files/patch-xpcom_reflect_xptcall_src_md_unix_Makefile.in
==============================================================================
--- branches/experimental/www/firefox/files/patch-xpcom_reflect_xptcall_src_md_unix_Makefile.in	Sat Jun  9 01:48:03 2012	(r741)
+++ branches/experimental/www/firefox/files/patch-xpcom_reflect_xptcall_src_md_unix_Makefile.in	Sat Jun  9 01:50:07 2012	(r742)
@@ -58,6 +58,15 @@
  CPPSRCS		:= xptcinvoke_ppc_linux.cpp xptcstubs_ppc_linux.cpp
  ASFILES		:= xptcinvoke_asm_ppc_linux.s xptcstubs_asm_ppc_linux.s
  AS		:= $(CC) -c -x assembler-with-cpp
+@@ -350,7 +365,7 @@
+ #
+ # Linux/PPC64
+ #
+-ifeq ($(OS_ARCH)$(OS_TEST),Linuxpowerpc64)
++ifneq (,$(filter Linuxpowerpc64 FreeBSDpowerpc64,$(OS_ARCH)$(OS_TEST)))
+ CPPSRCS                := xptcinvoke_ppc64_linux.cpp xptcstubs_ppc64_linux.cpp
+ ASFILES                := xptcinvoke_asm_ppc64_linux.s xptcstubs_asm_ppc64_linux.s
+ AS             := $(CC) -c -x assembler-with-cpp
 @@ -419,6 +434,15 @@
  ASFILES		:= xptcinvoke_asm_sparc_netbsd.s xptcstubs_asm_sparc_netbsd.s
  endif

Modified: branches/experimental/www/libxul/files/patch-js-src-configure.in
==============================================================================
--- branches/experimental/www/libxul/files/patch-js-src-configure.in	Sat Jun  9 01:48:03 2012	(r741)
+++ branches/experimental/www/libxul/files/patch-js-src-configure.in	Sat Jun  9 01:50:07 2012	(r742)
@@ -62,3 +62,11 @@
  x86_64*-*)
      AC_DEFINE(AVMPLUS_AMD64)
      AC_DEFINE(AVMPLUS_64BIT)
+@@ -5946,6 +5946,7 @@ _EGREP_PATTERN="${_EGREP_PATTERN}dummy_n
+  * C++ implementations should define these macros only when __STDC_LIMIT_MACROS
+  * is defined before <stdint.h> is included. */
+ #define __STDC_LIMIT_MACROS
++#define __STDC_CONSTANT_MACROS
+ 
+ #endif /* _JS_CONFDEFS_H_ */
+ 

Deleted: branches/experimental/www/libxul/files/patch-js-src-ctypes-libffi-configure
==============================================================================
--- branches/experimental/www/libxul/files/patch-js-src-ctypes-libffi-configure	Sat Jun  9 01:50:07 2012	(r741)
+++ /dev/null	00:00:00 1970	(deleted)
@@ -1,12 +0,0 @@
---- js/src/ctypes/libffi/configure.orig	2011-02-27 15:20:13.000000000 +0100
-+++ js/src/ctypes/libffi/configure	2011-02-27 15:20:52.000000000 +0100
-@@ -11280,6 +11280,9 @@
-   powerpc-*-freebsd*)
- 	TARGET=POWERPC_FREEBSD; TARGETDIR=powerpc
- 	;;
-+  powerpc64-*-freebsd*)
-+	TARGET=POWERPC; TARGETDIR=powerpc
-+	;;
-   powerpc*-*-rtems*)
- 	TARGET=POWERPC; TARGETDIR=powerpc
- 	;;

Modified: branches/experimental/www/seamonkey-beta/Makefile
==============================================================================
--- branches/experimental/www/seamonkey-beta/Makefile	Sat Jun  9 01:48:03 2012	(r741)
+++ branches/experimental/www/seamonkey-beta/Makefile	Sat Jun  9 01:50:07 2012	(r742)
@@ -67,6 +67,15 @@
 MOZSRC:=	${WRKDIR}/comm-beta/mozilla
 WRKSRC=		${WRKDIR}/comm-beta
 
+.if ${ARCH} == powerpc64
+.if ${OSVERSION} < 900033
+BROKEN=		Needs binutils 2.17.50 to build
+.else
+CONFIGURE_ENV+=	UNAME_m="powerpc64"
+CFLAGS+=	-mminimal-toc
+.endif
+.endif
+
 .if ${HAVE_GNOME:Mlibgnomeui}!=""
 USE_GNOME+=	libgnomeui
 MOZ_OPTIONS+=	--enable-gnomeui

Modified: branches/experimental/www/seamonkey-beta/files/patch-mozilla-js-src-configure.in
==============================================================================
--- branches/experimental/www/seamonkey-beta/files/patch-mozilla-js-src-configure.in	Sat Jun  9 01:48:03 2012	(r741)
+++ branches/experimental/www/seamonkey-beta/files/patch-mozilla-js-src-configure.in	Sat Jun  9 01:50:07 2012	(r742)
@@ -15,3 +15,11 @@
      ;;
  esac
  
+@@ -5946,6 +5946,7 @@ _EGREP_PATTERN="${_EGREP_PATTERN}dummy_n
+  * C++ implementations should define these macros only when __STDC_LIMIT_MACROS
+  * is defined before <stdint.h> is included. */
+ #define __STDC_LIMIT_MACROS
++#define __STDC_CONSTANT_MACROS
+ 
+ #endif /* _JS_CONFDEFS_H_ */
+ 

Modified: branches/experimental/www/seamonkey-beta/files/patch-mozilla-xpcom-reflect-xptcall-src-md-unix-Makefile.in
==============================================================================
--- branches/experimental/www/seamonkey-beta/files/patch-mozilla-xpcom-reflect-xptcall-src-md-unix-Makefile.in	Sat Jun  9 01:48:03 2012	(r741)
+++ branches/experimental/www/seamonkey-beta/files/patch-mozilla-xpcom-reflect-xptcall-src-md-unix-Makefile.in	Sat Jun  9 01:50:07 2012	(r742)
@@ -58,6 +58,15 @@
  CPPSRCS		:= xptcinvoke_ppc_linux.cpp xptcstubs_ppc_linux.cpp
  ASFILES		:= xptcinvoke_asm_ppc_linux.s xptcstubs_asm_ppc_linux.s
  AS		:= $(CC) -c -x assembler-with-cpp
+@@ -350,7 +365,7 @@
+ #
+ # Linux/PPC64
+ #
+-ifeq ($(OS_ARCH)$(OS_TEST),Linuxpowerpc64)
++ifneq (,$(filter Linuxpowerpc64 FreeBSDpowerpc64,$(OS_ARCH)$(OS_TEST)))
+ CPPSRCS                := xptcinvoke_ppc64_linux.cpp xptcstubs_ppc64_linux.cpp
+ ASFILES                := xptcinvoke_asm_ppc64_linux.s xptcstubs_asm_ppc64_linux.s
+ AS             := $(CC) -c -x assembler-with-cpp
 @@ -419,6 +434,15 @@
  ASFILES		:= xptcinvoke_asm_sparc_netbsd.s xptcstubs_asm_sparc_netbsd.s
  endif

Modified: branches/experimental/www/seamonkey/Makefile
==============================================================================
--- branches/experimental/www/seamonkey/Makefile	Sat Jun  9 01:48:03 2012	(r741)
+++ branches/experimental/www/seamonkey/Makefile	Sat Jun  9 01:50:07 2012	(r742)
@@ -67,6 +67,15 @@
 MOZSRC:=	${WRKDIR}/comm-release/mozilla
 WRKSRC=		${WRKDIR}/comm-release
 
+.if ${ARCH} == powerpc64
+.if ${OSVERSION} < 900033
+BROKEN=		Needs binutils 2.17.50 to build
+.else
+CONFIGURE_ENV+=	UNAME_m="powerpc64"
+CFLAGS+=	-mminimal-toc
+.endif
+.endif
+
 .if ${HAVE_GNOME:Mlibgnomeui}!=""
 USE_GNOME+=	libgnomeui
 MOZ_OPTIONS+=	--enable-gnomeui

Modified: branches/experimental/www/seamonkey/files/patch-mozilla-js-src-configure.in
==============================================================================
--- branches/experimental/www/seamonkey/files/patch-mozilla-js-src-configure.in	Sat Jun  9 01:48:03 2012	(r741)
+++ branches/experimental/www/seamonkey/files/patch-mozilla-js-src-configure.in	Sat Jun  9 01:50:07 2012	(r742)
@@ -15,3 +15,11 @@
      ;;
  esac
  
+@@ -5946,6 +5946,7 @@ _EGREP_PATTERN="${_EGREP_PATTERN}dummy_n
+  * C++ implementations should define these macros only when __STDC_LIMIT_MACROS
+  * is defined before <stdint.h> is included. */
+ #define __STDC_LIMIT_MACROS
++#define __STDC_CONSTANT_MACROS
+ 
+ #endif /* _JS_CONFDEFS_H_ */
+ 

Modified: branches/experimental/www/seamonkey/files/patch-mozilla-xpcom-reflect-xptcall-src-md-unix-Makefile.in
==============================================================================
--- branches/experimental/www/seamonkey/files/patch-mozilla-xpcom-reflect-xptcall-src-md-unix-Makefile.in	Sat Jun  9 01:48:03 2012	(r741)
+++ branches/experimental/www/seamonkey/files/patch-mozilla-xpcom-reflect-xptcall-src-md-unix-Makefile.in	Sat Jun  9 01:50:07 2012	(r742)
@@ -58,6 +58,15 @@
  CPPSRCS		:= xptcinvoke_ppc_linux.cpp xptcstubs_ppc_linux.cpp
  ASFILES		:= xptcinvoke_asm_ppc_linux.s xptcstubs_asm_ppc_linux.s
  AS		:= $(CC) -c -x assembler-with-cpp
+@@ -350,7 +365,7 @@
+ #
+ # Linux/PPC64
+ #
+-ifeq ($(OS_ARCH)$(OS_TEST),Linuxpowerpc64)
++ifneq (,$(filter Linuxpowerpc64 FreeBSDpowerpc64,$(OS_ARCH)$(OS_TEST)))
+ CPPSRCS                := xptcinvoke_ppc64_linux.cpp xptcstubs_ppc64_linux.cpp
+ ASFILES                := xptcinvoke_asm_ppc64_linux.s xptcstubs_asm_ppc64_linux.s
+ AS             := $(CC) -c -x assembler-with-cpp
 @@ -419,6 +434,15 @@
  ASFILES		:= xptcinvoke_asm_sparc_netbsd.s xptcstubs_asm_sparc_netbsd.s
  endif



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201206090150.q591o7CM060178>