Date: Wed, 11 Nov 2009 17:23:26 GMT From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org Subject: [SVN-Commit] r161 - branches/experimental/www/firefox3-devel/files Message-ID: <200911111723.nABHNQPC074069@trillian.chruetertee.ch>
next in thread | raw e-mail | index | archive | help
Author: beat Date: Wed Nov 11 17:23:25 2009 New Revision: 161 Log: - Fix build on ia64 (untested) Based on: Patches by marcel@ for firefox35 Added: branches/experimental/www/firefox3-devel/files/patch-xpcom-reflect-xptcall-src-xptcprivate.h Modified: branches/experimental/www/firefox3-devel/files/patch-content-xslt-public-txDouble.h branches/experimental/www/firefox3-devel/files/patch-security-coreconf-FreeBSD.mk Modified: branches/experimental/www/firefox3-devel/files/patch-content-xslt-public-txDouble.h ============================================================================== --- branches/experimental/www/firefox3-devel/files/patch-content-xslt-public-txDouble.h Wed Nov 11 17:09:53 2009 (r160) +++ branches/experimental/www/firefox3-devel/files/patch-content-xslt-public-txDouble.h Wed Nov 11 17:23:25 2009 (r161) @@ -5,7 +5,7 @@ #ifdef __FreeBSD__ #include <ieeefp.h> -#ifdef __alpha__ -+#if defined (__alpha__) || defined (__powerpc__) || defined(__sparc__) ++#if !defined(__amd64__) && !defined(__i386__) 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; Modified: branches/experimental/www/firefox3-devel/files/patch-security-coreconf-FreeBSD.mk ============================================================================== --- branches/experimental/www/firefox3-devel/files/patch-security-coreconf-FreeBSD.mk Wed Nov 11 17:09:53 2009 (r160) +++ branches/experimental/www/firefox3-devel/files/patch-security-coreconf-FreeBSD.mk Wed Nov 11 17:23:25 2009 (r161) @@ -1,11 +1,14 @@ ---- security/coreconf/FreeBSD.mk.orig 2009-07-30 17:30:28.000000000 +0200 -+++ security/coreconf/FreeBSD.mk 2009-08-17 22:29:03.510890513 +0200 -@@ -45,8 +45,20 @@ +--- security/coreconf/FreeBSD.mk.orig 2009-11-09 01:34:19.000000000 +0100 ++++ security/coreconf/FreeBSD.mk 2009-11-11 18:15:55.000000000 +0100 +@@ -45,8 +45,24 @@ ifeq ($(OS_TEST),alpha) CPU_ARCH = alpha else +ifeq ($(OS_TEST),amd64) +CPU_ARCH = amd64 ++else ++ifeq ($(OS_TEST),ia64) ++CPU_ARCH = ia64 +else +ifeq ($(OS_TEST),powerpc) +CPU_ARCH = powerpc @@ -18,10 +21,11 @@ +endif +endif +endif ++endif OS_CFLAGS = $(DSO_CFLAGS) -ansi -Wall -Wno-switch -DFREEBSD -DHAVE_STRERROR -DHAVE_BSD_FLOCK -@@ -73,7 +85,7 @@ +@@ -73,7 +89,7 @@ DLL_SUFFIX = so.1.0 endif @@ -30,9 +34,9 @@ ifdef MAPFILE MKSHLIB += -Wl,--version-script,$(MAPFILE) endif -@@ -82,4 +94,4 @@ +@@ -82,4 +98,4 @@ G++INCLUDES = -I/usr/include/g++ -INCLUDES += -I/usr/X11R6/include -+#INCLUDES += -I/usr/X11R6/include ++#INCLUDES += -I/usr/local/include Added: branches/experimental/www/firefox3-devel/files/patch-xpcom-reflect-xptcall-src-xptcprivate.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/www/firefox3-devel/files/patch-xpcom-reflect-xptcall-src-xptcprivate.h Wed Nov 11 17:23:25 2009 (r161) @@ -0,0 +1,20 @@ +--- xpcom/reflect/xptcall/src/xptcprivate.h.orig 2009-11-09 21:43:49.000000000 -0800 ++++ xpcom/reflect/xptcall/src/xptcprivate.h 2009-11-09 21:44:05.000000000 -0800 +@@ -45,7 +45,7 @@ + + class xptiInterfaceEntry; + +-#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__)) ++#if !defined(__ia64) + #define STUB_ENTRY(n) NS_IMETHOD Stub##n() = 0; + #else + #define STUB_ENTRY(n) NS_IMETHOD Stub##n(PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64) = 0; +@@ -62,7 +62,7 @@ + #undef STUB_ENTRY + #undef SENTINEL_ENTRY + +-#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__)) ++#if !defined(__ia64) + #define STUB_ENTRY(n) NS_IMETHOD Stub##n(); + #else + #define STUB_ENTRY(n) NS_IMETHOD Stub##n(PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200911111723.nABHNQPC074069>