Date: Sun, 22 Nov 2009 12:48:51 -0800 From: Marcel Moolenaar <xcllnt@mac.com> To: gecko@freebsd.org Subject: Fwd: [PATCH] fix www/libxul for ia64, powerpc & sparc64 Message-ID: <B566A734-7FE8-4E11-8ED7-BEC2500A014C@mac.com> References: <0B0DEA65-60F6-4968-88F3-35DC71CD4B1F@mac.com>
next in thread | previous in thread | raw e-mail | index | archive | help
--Boundary_(ID_iAEMAa1uS0KwEp3C3s/OJg) Content-type: text/plain; charset=us-ascii Content-transfer-encoding: 7BIT Sorry -- I forgot to check the MAINTAINER line and simply looked at who committed to Makefile most recently. I just sent this to Martin: Begin forwarded message: > From: Marcel Moolenaar <xcllnt@mac.com> > Date: November 22, 2009 12:40:55 PM PST > To: Martin Wilke <miwi@freebsd.org> > Subject: [PATCH] fix www/libxul for ia64, powerpc & sparc64 > > Martin, > > Attached a patch that fixes ia64 builds. As a side-effect of copying > the required fixes from other ports (www/firefox3 & security/nss), it > also fixes powerpc & sparc64. > > Ok for me to commit? > > BTW: The patch-file is out of date. The attached diff fixes 1 instance, > but there's another one. OS_CFLAGS now contains -no-switch, but the > patch still shows the OS_CFLAGS without it. The patch still applies, > so I expect it applies with a fuzz factor. I didn't want to fix that, > because it really needs testing on i386/amd64 then... > > -- > Marcel Moolenaar > xcllnt@mac.com > > --Boundary_(ID_iAEMAa1uS0KwEp3C3s/OJg) Content-type: application/octet-stream; name=libxul.diff Content-transfer-encoding: 7bit Content-disposition: attachment; filename=libxul.diff Index: files/patch-security_coreconf_FreeBSD.mk =================================================================== RCS file: /home/ncvs/ports/www/libxul/files/patch-security_coreconf_FreeBSD.mk,v retrieving revision 1.1 diff -u -r1.1 patch-security_coreconf_FreeBSD.mk --- files/patch-security_coreconf_FreeBSD.mk 10 Apr 2009 05:56:28 -0000 1.1 +++ files/patch-security_coreconf_FreeBSD.mk 22 Nov 2009 20:24:51 -0000 @@ -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 Index: files/patch-xpcom-reflect-xptcall-src-xptcprivate.h =================================================================== RCS file: files/patch-xpcom-reflect-xptcall-src-xptcprivate.h diff -N files/patch-xpcom-reflect-xptcall-src-xptcprivate.h --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/patch-xpcom-reflect-xptcall-src-xptcprivate.h 20 Nov 2009 07:10:41 -0000 @@ -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); --Boundary_(ID_iAEMAa1uS0KwEp3C3s/OJg) Content-type: text/plain; charset=us-ascii Content-transfer-encoding: 7BIT > > -- Marcel Moolenaar xcllnt@mac.com --Boundary_(ID_iAEMAa1uS0KwEp3C3s/OJg)--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?B566A734-7FE8-4E11-8ED7-BEC2500A014C>