Date: Tue, 18 Aug 2009 19:38:07 GMT From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org Subject: [SVN-Commit] r88 - branches/experimental/www/firefox3 branches/experimental/www/firefox3/files branches/experimental/www/firefox35 branches/experimental/www/firefox35/files trunk/www/firefox3 trunk/www/firefox3/files trunk/www/firefox35 trunk/www/firefox35/files Message-ID: <200908181938.n7IJc7Jr090035@trillian.chruetertee.ch>
next in thread | raw e-mail | index | archive | help
Author: beat
Date: Tue Aug 18 19:38:06 2009
New Revision: 88
Log:
- Fix build on sparc64
Submitted by: Andreas Tobler <andreast-list AT fgznet.ch>
Added:
branches/experimental/www/firefox35/files/patch-js-src-configure
trunk/www/firefox35/files/patch-js-src-configure
Modified:
branches/experimental/www/firefox3/Makefile
branches/experimental/www/firefox3/files/patch-security-coreconf-FreeBSD.mk
branches/experimental/www/firefox35/Makefile
branches/experimental/www/firefox35/files/patch-content-xslt-public-txDouble.h
branches/experimental/www/firefox35/files/patch-security-coreconf-FreeBSD.mk
trunk/www/firefox3/Makefile
trunk/www/firefox3/files/patch-security-coreconf-FreeBSD.mk
trunk/www/firefox35/Makefile
trunk/www/firefox35/files/patch-content-xslt-public-txDouble.h
trunk/www/firefox35/files/patch-security-coreconf-FreeBSD.mk
Modified: branches/experimental/www/firefox3/Makefile
==============================================================================
--- branches/experimental/www/firefox3/Makefile Tue Aug 18 17:32:55 2009 (r87)
+++ branches/experimental/www/firefox3/Makefile Tue Aug 18 19:38:06 2009 (r88)
@@ -2,7 +2,7 @@
# Date created: 2002/10/21
# Whom: Alan Eldridge <alane@FreeBSD.org>
#
-# $FreeBSD: ports/www/firefox3/Makefile,v 1.24 2009/08/04 23:12:19 miwi Exp $
+# $FreeBSD: ports/www/firefox3/Makefile,v 1.25 2009/08/17 02:06:26 linimon Exp $
# $MCom: ports-stable/www/firefox3/Makefile,v 1.20 2008/12/31 01:52:03 mezz Exp $
#
@@ -59,6 +59,10 @@
.include <bsd.port.pre.mk>
+.if ${ARCH} == "sparc64"
+BROKEN= Does not compile on sparc64: invokes i386 assembler
+.endif
+
GECKO_PTHREAD_LIBS!=${CC} -dumpspecs | ${GREP} -m 1 '%{\!pg: %{pthread:' | ${SED} -e 's|^.*%{\!pg: %{pthread:|| ; s|}.*$$||' || ${TRUE}
.if ${HAVE_GNOME:Mlibgnomeui}!=""
Modified: branches/experimental/www/firefox3/files/patch-security-coreconf-FreeBSD.mk
==============================================================================
--- branches/experimental/www/firefox3/files/patch-security-coreconf-FreeBSD.mk Tue Aug 18 17:32:55 2009 (r87)
+++ branches/experimental/www/firefox3/files/patch-security-coreconf-FreeBSD.mk Tue Aug 18 19:38:06 2009 (r88)
@@ -1,6 +1,6 @@
--- security/coreconf/FreeBSD.mk.orig 2009-07-30 17:30:28.000000000 +0200
-+++ security/coreconf/FreeBSD.mk 2009-08-10 22:22:56.000000000 +0200
-@@ -45,8 +45,16 @@
++++ security/coreconf/FreeBSD.mk 2009-08-17 22:29:03.510890513 +0200
+@@ -45,8 +45,20 @@
ifeq ($(OS_TEST),alpha)
CPU_ARCH = alpha
else
@@ -10,14 +10,18 @@
+ifeq ($(OS_TEST),powerpc)
+CPU_ARCH = powerpc
+else
++ifeq ($(OS_TEST),sparc64)
++CPU_ARCH = sparc64
++else
CPU_ARCH = x86
endif
+endif
+endif
++endif
OS_CFLAGS = $(DSO_CFLAGS) -ansi -Wall -Wno-switch -DFREEBSD -DHAVE_STRERROR -DHAVE_BSD_FLOCK
-@@ -73,7 +81,7 @@
+@@ -73,7 +85,7 @@
DLL_SUFFIX = so.1.0
endif
@@ -26,7 +30,7 @@
ifdef MAPFILE
MKSHLIB += -Wl,--version-script,$(MAPFILE)
endif
-@@ -82,4 +90,4 @@
+@@ -82,4 +94,4 @@
G++INCLUDES = -I/usr/include/g++
Modified: branches/experimental/www/firefox35/Makefile
==============================================================================
--- branches/experimental/www/firefox35/Makefile Tue Aug 18 17:32:55 2009 (r87)
+++ branches/experimental/www/firefox35/Makefile Tue Aug 18 19:38:06 2009 (r88)
@@ -59,10 +59,6 @@
.include <bsd.port.pre.mk>
-.if ${ARCH} == "sparc64"
-BROKEN= Does not compile on sparc64
-.endif
-
.if ${OSVERSION} < 700000
LIB_DEPENDS+= pulse.0:${PORTSDIR}/audio/pulseaudio
EXTRA_PATCHES= ${FILESDIR}/releng6_pulseaudio
Modified: branches/experimental/www/firefox35/files/patch-content-xslt-public-txDouble.h
==============================================================================
--- branches/experimental/www/firefox35/files/patch-content-xslt-public-txDouble.h Tue Aug 18 17:32:55 2009 (r87)
+++ branches/experimental/www/firefox35/files/patch-content-xslt-public-txDouble.h Tue Aug 18 19:38:06 2009 (r88)
@@ -5,7 +5,7 @@
#ifdef __FreeBSD__
#include <ieeefp.h>
-#ifdef __alpha__
-+#if defined (__alpha__) || defined (__powerpc__)
++#if defined (__alpha__) || defined (__powerpc__) || defined(__sparc__)
static fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP;
#else
static fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP|FP_X_DNML;
Added: branches/experimental/www/firefox35/files/patch-js-src-configure
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/www/firefox35/files/patch-js-src-configure Tue Aug 18 19:38:06 2009 (r88)
@@ -0,0 +1,13 @@
+--- js/src/configure.orig 2009-06-23 23:44:34.000000000 +0200
++++ js/src/configure 2009-06-23 23:44:46.000000000 +0200
+@@ -6916,10 +6916,6 @@
+ ENABLE_JIT=1
+ NANOJIT_ARCH=ARM
+ ;;
+-sparc*-*)
+- ENABLE_JIT=1
+- NANOJIT_ARCH=Sparc
+- ;;
+ esac
+
+ # Check whether --enable-jit or --disable-jit was given.
Modified: branches/experimental/www/firefox35/files/patch-security-coreconf-FreeBSD.mk
==============================================================================
--- branches/experimental/www/firefox35/files/patch-security-coreconf-FreeBSD.mk Tue Aug 18 17:32:55 2009 (r87)
+++ branches/experimental/www/firefox35/files/patch-security-coreconf-FreeBSD.mk Tue Aug 18 19:38:06 2009 (r88)
@@ -1,6 +1,6 @@
--- security/coreconf/FreeBSD.mk.orig 2009-07-30 17:30:28.000000000 +0200
-+++ security/coreconf/FreeBSD.mk 2009-08-10 22:22:56.000000000 +0200
-@@ -45,8 +45,16 @@
++++ security/coreconf/FreeBSD.mk 2009-08-17 22:29:03.510890513 +0200
+@@ -45,8 +45,20 @@
ifeq ($(OS_TEST),alpha)
CPU_ARCH = alpha
else
@@ -10,14 +10,18 @@
+ifeq ($(OS_TEST),powerpc)
+CPU_ARCH = powerpc
+else
++ifeq ($(OS_TEST),sparc64)
++CPU_ARCH = sparc64
++else
CPU_ARCH = x86
endif
+endif
+endif
++endif
OS_CFLAGS = $(DSO_CFLAGS) -ansi -Wall -Wno-switch -DFREEBSD -DHAVE_STRERROR -DHAVE_BSD_FLOCK
-@@ -73,7 +81,7 @@
+@@ -73,7 +85,7 @@
DLL_SUFFIX = so.1.0
endif
@@ -26,7 +30,7 @@
ifdef MAPFILE
MKSHLIB += -Wl,--version-script,$(MAPFILE)
endif
-@@ -82,4 +90,4 @@
+@@ -82,4 +94,4 @@
G++INCLUDES = -I/usr/include/g++
Modified: trunk/www/firefox3/Makefile
==============================================================================
--- trunk/www/firefox3/Makefile Tue Aug 18 17:32:55 2009 (r87)
+++ trunk/www/firefox3/Makefile Tue Aug 18 19:38:06 2009 (r88)
@@ -2,7 +2,7 @@
# Date created: 2002/10/21
# Whom: Alan Eldridge <alane@FreeBSD.org>
#
-# $FreeBSD: ports/www/firefox3/Makefile,v 1.24 2009/08/04 23:12:19 miwi Exp $
+# $FreeBSD: ports/www/firefox3/Makefile,v 1.25 2009/08/17 02:06:26 linimon Exp $
# $MCom: ports-stable/www/firefox3/Makefile,v 1.20 2008/12/31 01:52:03 mezz Exp $
#
@@ -59,6 +59,10 @@
.include <bsd.port.pre.mk>
+.if ${ARCH} == "sparc64"
+BROKEN= Does not compile on sparc64: invokes i386 assembler
+.endif
+
GECKO_PTHREAD_LIBS!=${CC} -dumpspecs | ${GREP} -m 1 '%{\!pg: %{pthread:' | ${SED} -e 's|^.*%{\!pg: %{pthread:|| ; s|}.*$$||' || ${TRUE}
.if ${HAVE_GNOME:Mlibgnomeui}!=""
Modified: trunk/www/firefox3/files/patch-security-coreconf-FreeBSD.mk
==============================================================================
--- trunk/www/firefox3/files/patch-security-coreconf-FreeBSD.mk Tue Aug 18 17:32:55 2009 (r87)
+++ trunk/www/firefox3/files/patch-security-coreconf-FreeBSD.mk Tue Aug 18 19:38:06 2009 (r88)
@@ -1,6 +1,6 @@
--- security/coreconf/FreeBSD.mk.orig 2009-07-30 17:30:28.000000000 +0200
-+++ security/coreconf/FreeBSD.mk 2009-08-10 22:22:56.000000000 +0200
-@@ -45,8 +45,16 @@
++++ security/coreconf/FreeBSD.mk 2009-08-17 22:29:03.510890513 +0200
+@@ -45,8 +45,20 @@
ifeq ($(OS_TEST),alpha)
CPU_ARCH = alpha
else
@@ -10,14 +10,18 @@
+ifeq ($(OS_TEST),powerpc)
+CPU_ARCH = powerpc
+else
++ifeq ($(OS_TEST),sparc64)
++CPU_ARCH = sparc64
++else
CPU_ARCH = x86
endif
+endif
+endif
++endif
OS_CFLAGS = $(DSO_CFLAGS) -ansi -Wall -Wno-switch -DFREEBSD -DHAVE_STRERROR -DHAVE_BSD_FLOCK
-@@ -73,7 +81,7 @@
+@@ -73,7 +85,7 @@
DLL_SUFFIX = so.1.0
endif
@@ -26,7 +30,7 @@
ifdef MAPFILE
MKSHLIB += -Wl,--version-script,$(MAPFILE)
endif
-@@ -82,4 +90,4 @@
+@@ -82,4 +94,4 @@
G++INCLUDES = -I/usr/include/g++
Modified: trunk/www/firefox35/Makefile
==============================================================================
--- trunk/www/firefox35/Makefile Tue Aug 18 17:32:55 2009 (r87)
+++ trunk/www/firefox35/Makefile Tue Aug 18 19:38:06 2009 (r88)
@@ -59,10 +59,6 @@
.include <bsd.port.pre.mk>
-.if ${ARCH} == "sparc64"
-BROKEN= Does not compile on sparc64
-.endif
-
.if ${OSVERSION} < 700000
LIB_DEPENDS+= pulse.0:${PORTSDIR}/audio/pulseaudio
EXTRA_PATCHES= ${FILESDIR}/releng6_pulseaudio
Modified: trunk/www/firefox35/files/patch-content-xslt-public-txDouble.h
==============================================================================
--- trunk/www/firefox35/files/patch-content-xslt-public-txDouble.h Tue Aug 18 17:32:55 2009 (r87)
+++ trunk/www/firefox35/files/patch-content-xslt-public-txDouble.h Tue Aug 18 19:38:06 2009 (r88)
@@ -5,7 +5,7 @@
#ifdef __FreeBSD__
#include <ieeefp.h>
-#ifdef __alpha__
-+#if defined (__alpha__) || defined (__powerpc__)
++#if defined (__alpha__) || defined (__powerpc__) || defined(__sparc__)
static fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP;
#else
static fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP|FP_X_DNML;
Added: trunk/www/firefox35/files/patch-js-src-configure
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/www/firefox35/files/patch-js-src-configure Tue Aug 18 19:38:06 2009 (r88)
@@ -0,0 +1,13 @@
+--- js/src/configure.orig 2009-06-23 23:44:34.000000000 +0200
++++ js/src/configure 2009-06-23 23:44:46.000000000 +0200
+@@ -6916,10 +6916,6 @@
+ ENABLE_JIT=1
+ NANOJIT_ARCH=ARM
+ ;;
+-sparc*-*)
+- ENABLE_JIT=1
+- NANOJIT_ARCH=Sparc
+- ;;
+ esac
+
+ # Check whether --enable-jit or --disable-jit was given.
Modified: trunk/www/firefox35/files/patch-security-coreconf-FreeBSD.mk
==============================================================================
--- trunk/www/firefox35/files/patch-security-coreconf-FreeBSD.mk Tue Aug 18 17:32:55 2009 (r87)
+++ trunk/www/firefox35/files/patch-security-coreconf-FreeBSD.mk Tue Aug 18 19:38:06 2009 (r88)
@@ -1,6 +1,6 @@
--- security/coreconf/FreeBSD.mk.orig 2009-07-30 17:30:28.000000000 +0200
-+++ security/coreconf/FreeBSD.mk 2009-08-10 22:22:56.000000000 +0200
-@@ -45,8 +45,16 @@
++++ security/coreconf/FreeBSD.mk 2009-08-17 22:29:03.510890513 +0200
+@@ -45,8 +45,20 @@
ifeq ($(OS_TEST),alpha)
CPU_ARCH = alpha
else
@@ -10,14 +10,18 @@
+ifeq ($(OS_TEST),powerpc)
+CPU_ARCH = powerpc
+else
++ifeq ($(OS_TEST),sparc64)
++CPU_ARCH = sparc64
++else
CPU_ARCH = x86
endif
+endif
+endif
++endif
OS_CFLAGS = $(DSO_CFLAGS) -ansi -Wall -Wno-switch -DFREEBSD -DHAVE_STRERROR -DHAVE_BSD_FLOCK
-@@ -73,7 +81,7 @@
+@@ -73,7 +85,7 @@
DLL_SUFFIX = so.1.0
endif
@@ -26,7 +30,7 @@
ifdef MAPFILE
MKSHLIB += -Wl,--version-script,$(MAPFILE)
endif
-@@ -82,4 +90,4 @@
+@@ -82,4 +94,4 @@
G++INCLUDES = -I/usr/include/g++
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200908181938.n7IJc7Jr090035>