[SVN-Commit] r171 - in trunk/www/libxul: . files

[svn-freebsd-gecko at chruetertee.ch]

Author: beat
Date: Tue Nov 24 20:02:58 2009
New Revision: 171

Log:
- Sync with ports:
  Fix build for ia64, powerpc & sparc64.

Submitted by:	marcel@ (thanks!)

Added:
   trunk/www/libxul/files/patch-xpcom-reflect-xptcall-src-xptcprivate.h
Modified:
   trunk/www/libxul/Makefile
   trunk/www/libxul/files/patch-security_coreconf_FreeBSD.mk

Modified: trunk/www/libxul/Makefile
==============================================================================
--- trunk/www/libxul/Makefile	Tue Nov 24 19:58:40 2009	(r170)
+++ trunk/www/libxul/Makefile	Tue Nov 24 20:02:58 2009	(r171)
@@ -2,7 +2,8 @@
 # Date created:		2006-02-20
 # Whom:			Michael Johnson <ahze at FreeBSD.org>
 #
-# $FreeBSD$
+# $FreeBSD: ports/www/libxul/Makefile,v 1.13 2009/11/02 11:02:56 miwi Exp $
+#   $MCom: ports/www/libxul/Makefile,v 1.25 2009/04/07 17:47:01 marcus Exp $
 #
 
 PORTNAME=	libxul

Modified: trunk/www/libxul/files/patch-security_coreconf_FreeBSD.mk
==============================================================================
--- trunk/www/libxul/files/patch-security_coreconf_FreeBSD.mk	Tue Nov 24 19:58:40 2009	(r170)
+++ trunk/www/libxul/files/patch-security_coreconf_FreeBSD.mk	Tue Nov 24 20:02:58 2009	(r171)
@@ -1,6 +1,6 @@
---- security/coreconf/FreeBSD.mk.orig	Wed Mar 26 20:17:25 2003
-+++ security/coreconf/FreeBSD.mk	Thu Jul  8 12:56:24 2004
-@@ -35,16 +35,18 @@
+--- security/coreconf/FreeBSD.mk.orig	2009-11-22 11:51:31.000000000 -0800
++++ security/coreconf/FreeBSD.mk	2009-11-22 11:51:44.000000000 -0800
+@@ -37,16 +37,32 @@
  
  include $(CORE_DEPTH)/coreconf/UNIX.mk
  
@@ -13,16 +13,30 @@
  ifeq ($(OS_TEST),alpha)
  CPU_ARCH		= alpha
  else
++ifeq ($(OS_TEST),powerpc)
++CPU_ARCH		= powerpc
++else
++ifeq ($(OS_TEST),sparc64)
++CPU_ARCH		= sparc64
++USE_64			= 1
++else
++ifeq ($(OS_TEST),ia64)
++CPU_ARCH		= ia64
++USE_64			= 1
++else
 +ifeq ($(OS_TEST),amd64)
 +CPU_ARCH		= amd64
 +else
  CPU_ARCH		= x86
  endif
 +endif
++endif
++endif
++endif
  
  OS_CFLAGS		= $(DSO_CFLAGS) -ansi -Wall -DFREEBSD -DHAVE_STRERROR -DHAVE_BSD_FLOCK
  
-@@ -71,7 +73,11 @@
+@@ -73,7 +89,11 @@
  DLL_SUFFIX		= so.1.0
  endif
  
@@ -33,5 +47,5 @@
 +MKSHLIB			= $(CC) -Wl,-Bsymbolic $(DSO_LDOPTS) -o $@
 +endif
  ifdef MAPFILE
- # Add LD options to restrict exported symbols to those in the map file
+ 	MKSHLIB += -Wl,--version-script,$(MAPFILE)
  endif

Added: trunk/www/libxul/files/patch-xpcom-reflect-xptcall-src-xptcprivate.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ trunk/www/libxul/files/patch-xpcom-reflect-xptcall-src-xptcprivate.h	Tue Nov 24 20:02:58 2009	(r171)
@@ -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);