rpms/xulrunner/devel firefox-1.5-ppc64.patch, 1.1, 1.2 mozilla-firefox-head.ppc64.patch, 1.1, 1.2 xulrunner.spec, 1.17, 1.18
David Woodhouse (dwmw2)
fedora-extras-commits at redhat.com
Thu Sep 20 18:02:41 UTC 2007
- Previous message (by thread): rpms/nss_compat_ossl/devel .cvsignore, 1.2, 1.3 nss_compat_ossl.spec, 1.3, 1.4 sources, 1.2, 1.3
- Next message (by thread): rpms/mercurial/EL-4 mercurial-0.9.4.tar.gz, NONE, 1.1 mercurial-install-contrib.patch, NONE, 1.1 mercurial.spec, 1.13, 1.14 sources, 1.9, 1.10
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: dwmw2
Update of /cvs/pkgs/rpms/xulrunner/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12292
Modified Files:
firefox-1.5-ppc64.patch mozilla-firefox-head.ppc64.patch
xulrunner.spec
Log Message:
fix ppc/ppc64 build
firefox-1.5-ppc64.patch:
Index: firefox-1.5-ppc64.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xulrunner/devel/firefox-1.5-ppc64.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- firefox-1.5-ppc64.patch 31 Aug 2007 04:34:18 -0000 1.1
+++ firefox-1.5-ppc64.patch 20 Sep 2007 18:02:04 -0000 1.2
@@ -4,11 +4,17 @@
unchanged:
--- mozilla.orig/xpcom/reflect/xptcall/src/md/unix/Makefile.in 2006-11-21 17:09:28.000000000 +0000
+++ mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in 2006-11-20 10:13:38.000000000 +0000
-@@ -267,6 +267,11 @@
+@@ -268,11 +268,16 @@ endif
+ #
+ # Linux/PPC
+ #
+-ifeq ($(OS_ARCH)$(OS_TEST),Linuxppc)
++ifeq ($(OS_ARCH)$(OS_TEST),Linuxpowerpc)
+ CPPSRCS := xptcinvoke_ppc_linux.cpp xptcstubs_ppc_linux.cpp
ASFILES := xptcinvoke_asm_ppc_linux.s xptcstubs_asm_ppc_linux.s
AS := $(CC) -c -x assembler-with-cpp
endif
-+ifeq ($(OS_ARCH)$(OS_TEST),Linuxppc64)
++ifeq ($(OS_ARCH)$(OS_TEST),Linuxpowerpc64)
+CPPSRCS := xptcinvoke_ppc64_linux.cpp xptcstubs_ppc64_linux.cpp
+ASFILES := xptcinvoke_asm_ppc64_linux.s xptcstubs_asm_ppc64_linux.s
+AS := $(CC) -c -x assembler-with-cpp
mozilla-firefox-head.ppc64.patch:
Index: mozilla-firefox-head.ppc64.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xulrunner/devel/mozilla-firefox-head.ppc64.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mozilla-firefox-head.ppc64.patch 20 Sep 2007 11:04:21 -0000 1.1
+++ mozilla-firefox-head.ppc64.patch 20 Sep 2007 18:02:04 -0000 1.2
@@ -5,22 +5,24 @@
diff -u -B -u -p -r1.92 Makefile.in
--- xpcom/reflect/xptcall/src/md/unix/Makefile.in 14 Dec 2006 19:13:43 -0000 1.92
+++ xpcom/reflect/xptcall/src/md/unix/Makefile.in 29 Jan 2007 17:49:54 -0000
-@@ -275,6 +275,15 @@ AS := $(CC) -c -x assembler-with-cpp
+@@ -268,11 +268,16 @@ endif
+ #
+ # Linux/PPC
+ #
+-ifeq ($(OS_ARCH)$(OS_TEST),Linuxppc)
++ifeq ($(OS_ARCH)$(OS_TEST),Linuxpowerpc)
+ CPPSRCS := xptcinvoke_ppc_linux.cpp xptcstubs_ppc_linux.cpp
+ ASFILES := xptcinvoke_asm_ppc_linux.s xptcstubs_asm_ppc_linux.s
+ AS := $(CC) -c -x assembler-with-cpp
endif
++ifeq ($(OS_ARCH)$(OS_TEST),Linuxpowerpc64)
++CPPSRCS := xptcinvoke_ppc64_linux.cpp xptcstubs_ppc64_linux.cpp
++ASFILES := xptcinvoke_asm_ppc64_linux.s xptcstubs_asm_ppc64_linux.s
++AS := $(CC) -c -x assembler-with-cpp
++endif
#
-+# Linux/PPC64
-+#
-+ifeq ($(OS_ARCH)$(OS_TEST),Linuxppc64)
-+CPPSRCS := xptcinvoke_ppc64_linux.cpp xptcstubs_ppc64_linux.cpp
-+ASFILES := xptcinvoke_asm_ppc64_linux.s xptcstubs_asm_ppc64_linux.s
-+AS := $(CC) -c -x assembler-with-cpp
-+endif
-+
-+#
# NetBSD/PPC
- #
- ifneq (,$(filter NetBSDmacppc NetBSDbebox NetBSDofppc NetBSDprep NetBSDamigappc,$(OS_ARCH)$(OS_TEST)))
Index: xpcom/reflect/xptcall/src/md/unix/xptcinvoke_ppc_netbsd.cpp
===================================================================
RCS file: /cvsroot/mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_ppc_netbsd.cpp,v
@@ -93,21 +95,21 @@
+
+
+#
-+# NS_InvokeByIndex(nsISupports* that, PRUint32 methodIndex,
++# NS_InvokeByIndex_P(nsISupports* that, PRUint32 methodIndex,
+# PRUint32 paramCount, nsXPTCVariant* params)
+#
+
+ .section ".toc","aw"
+ .section ".text"
+ .align 2
-+ .globl NS_InvokeByIndex
++ .globl NS_InvokeByIndex_P
+ .section ".opd","aw"
+ .align 3
-+NS_InvokeByIndex:
-+ .quad .NS_InvokeByIndex,.TOC. at tocbase
++NS_InvokeByIndex_P:
++ .quad .NS_InvokeByIndex_P,.TOC. at tocbase
+ .previous
-+ .type NS_InvokeByIndex, at function
-+.NS_InvokeByIndex:
++ .type NS_InvokeByIndex_P, at function
++.NS_InvokeByIndex_P:
+ mflr 0
+ std 0,16(r1)
+
@@ -200,7 +202,7 @@
+ mtlr 0
+ blr
+
-+ .size NS_InvokeByIndex,.-.NS_InvokeByIndex
++ .size NS_InvokeByIndex_P,.-.NS_InvokeByIndex_P
+
+ # Magic indicating no need for an executable stack
+ .section .note.GNU-stack, "", @progbits ; .previous
@@ -250,9 +252,9 @@
+
+// Platform specific code to invoke XPCOM methods on native objects
+
-+// The purpose of NS_InvokeByIndex() is to map a platform
++// The purpose of NS_InvokeByIndex_P() is to map a platform
+// independent call to the platform ABI. To do that,
-+// NS_InvokeByIndex() has to determine the method to call via vtable
++// NS_InvokeByIndex_P() has to determine the method to call via vtable
+// access. The parameters for the method are read from the
+// nsXPTCVariant* and prepared for the native ABI.
+
@@ -335,7 +337,7 @@
+}
+
+EXPORT_XPCOM_API(nsresult)
-+NS_InvokeByIndex(nsISupports* that, PRUint32 methodIndex,
++NS_InvokeByIndex_P(nsISupports* that, PRUint32 methodIndex,
+ PRUint32 paramCount, nsXPTCVariant* params);
+
--- /dev/null 2000-10-22 01:01:00.000000000 +0000
Index: xulrunner.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xulrunner/devel/xulrunner.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- xulrunner.spec 20 Sep 2007 11:04:21 -0000 1.17
+++ xulrunner.spec 20 Sep 2007 18:02:04 -0000 1.18
@@ -12,7 +12,7 @@
Summary: XUL Runtime for Gecko Applications
Name: xulrunner
Version: 1.9
-Release: 0.alpha7.3%{?dist}
+Release: 0.alpha7.4%{?dist}
URL: http://www.mozilla.org/projects/xulrunner/
License: MPL/LGPL
Group: Applications/Internet
@@ -340,6 +340,9 @@
#---------------------------------------------------------------------
%changelog
+* Thu Sep 20 2007 David Woodhouse <dwmw2 at infradead.org> 1.9-0.alpha7.4
+- build fixes for ppc/ppc64
+
* Tue Sep 20 2007 Martin Stransky <stransky at redhat.com> 1.9-0.alpha7.3
- removed conflicts with the current gecko-based apps
- added updated ppc64 patch
- Previous message (by thread): rpms/nss_compat_ossl/devel .cvsignore, 1.2, 1.3 nss_compat_ossl.spec, 1.3, 1.4 sources, 1.2, 1.3
- Next message (by thread): rpms/mercurial/EL-4 mercurial-0.9.4.tar.gz, NONE, 1.1 mercurial-install-contrib.patch, NONE, 1.1 mercurial.spec, 1.13, 1.14 sources, 1.9, 1.10
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list