Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 11 Nov 2009 17:09:53 GMT
From:      svn-freebsd-gecko@chruetertee.ch
To:        freebsd-gecko@freebsd.org
Subject:   [SVN-Commit] r160 - in trunk/www/firefox3: . files
Message-ID:  <200911111709.nABH9rCb028839@trillian.chruetertee.ch>

next in thread | raw e-mail | index | archive | help
Author: beat
Date: Wed Nov 11 17:09:53 2009
New Revision: 160

Log:
- Fix build for ia64 (Forgotten in last commit)

Submitted by:	marcel@

Added:
   trunk/www/firefox3/files/patch-xpcom-reflect-xptcall-src-xptcprivate.h
Modified:
   trunk/www/firefox3/Makefile
   trunk/www/firefox3/files/patch-security-coreconf-FreeBSD.mk

Modified: trunk/www/firefox3/Makefile
==============================================================================
--- trunk/www/firefox3/Makefile	Wed Nov 11 17:07:43 2009	(r159)
+++ trunk/www/firefox3/Makefile	Wed Nov 11 17:09:53 2009	(r160)
@@ -2,7 +2,7 @@
 # Date created:			2002/10/21
 # Whom:				Alan Eldridge <alane@FreeBSD.org>
 #
-# $FreeBSD: ports/www/firefox3/Makefile,v 1.26 2009/08/19 01:58:37 beat Exp $
+# $FreeBSD: ports/www/firefox3/Makefile,v 1.28 2009/10/28 15:35:40 beat Exp $
 #   $MCom: ports-stable/www/firefox3/Makefile,v 1.20 2008/12/31 01:52:03 mezz Exp $
 #
 

Modified: trunk/www/firefox3/files/patch-security-coreconf-FreeBSD.mk
==============================================================================
--- trunk/www/firefox3/files/patch-security-coreconf-FreeBSD.mk	Wed Nov 11 17:07:43 2009	(r159)
+++ trunk/www/firefox3/files/patch-security-coreconf-FreeBSD.mk	Wed Nov 11 17:09:53 2009	(r160)
@@ -1,12 +1,15 @@
---- 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	2008-07-12 07:28:59.000000000 -0700
++++ security/coreconf/FreeBSD.mk	2009-11-09 22:42:09.000000000 -0800
+@@ -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
 +else
@@ -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: trunk/www/firefox3/files/patch-xpcom-reflect-xptcall-src-xptcprivate.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ trunk/www/firefox3/files/patch-xpcom-reflect-xptcall-src-xptcprivate.h	Wed Nov 11 17:09:53 2009	(r160)
@@ -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?200911111709.nABH9rCb028839>