rpm/MozillaFirefox
SHA256
1
0
Fork 0
forked from pool/MozillaFirefox
Code Pull Requests Activity

Accepting request 393478 from home:michel_mno:branches:mozilla:Factory

Browse Source 
new mozilla_add_branch64.patch to avoid PowerPC build failure.
to complete previous request that failed on staging:F

OBS-URL: https://build.opensuse.org/request/show/393478
OBS-URL: https://build.opensuse.org/package/show/mozilla:Factory/MozillaFirefox?expand=0&rev=507
This commit is contained in:
Wolfgang Rosenauer 2016-05-03 20:02:49 +00:00 committed by Git OBS Bridge
parent 3b138f7f73
commit e9dadb94d7
3 changed files with 33 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
MozillaFirefox.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Tue May 3 15:47:18 UTC 2016 - normand@linux.vnet.ibm.com
- new mozilla_add_branch64.patch to avoid PowerPC build failure.
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Apr 27 08:39:28 UTC 2016 - badshah400@gmail.com Wed Apr 27 08:39:28 UTC 2016 - badshah400@gmail.com

2
MozillaFirefox.spec
View File

@ -173,6 +173,7 @@ Patch14: mozilla-check_return.patch
Patch101: firefox-kde.patch Patch101: firefox-kde.patch
Patch102: firefox-no-default-ualocale.patch Patch102: firefox-no-default-ualocale.patch
Patch103: firefox-branded-icons.patch Patch103: firefox-branded-icons.patch
Patch104: mozilla_add_branch64.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
Requires(post): coreutils shared-mime-info desktop-file-utils Requires(post): coreutils shared-mime-info desktop-file-utils
Requires(postun): shared-mime-info desktop-file-utils Requires(postun): shared-mime-info desktop-file-utils
@ -287,6 +288,7 @@ cd $RPM_BUILD_DIR/mozilla
%patch101 -p1 %patch101 -p1
%patch102 -p1 %patch102 -p1
%patch103 -p1 %patch103 -p1
%patch104 -p1
%build %build
# no need to add build time to binaries # no need to add build time to binaries

26
mozilla_add_branch64.patch Normal file
View File

@ -0,0 +1,26 @@
From: Michel Normand <normand@linux.vnet.ibm.com>
Subject: mozilla add branch64
Date: Tue, 03 May 2016 17:42:54 +0200
mozilla add branch64 in MacroAssembler-none.h
already upstream as tracked by
https://www.mail-archive.com/freebsd-gecko@freebsd.org/msg05462.html
Signed-off-by: Michel Normand <normand@linux.vnet.ibm.com>
---
js/src/jit/none/MacroAssembler-none.h | 2 ++
1 file changed, 2 insertions(+)
Index: mozilla/js/src/jit/none/MacroAssembler-none.h
===================================================================
--- mozilla.orig/js/src/jit/none/MacroAssembler-none.h
+++ mozilla/js/src/jit/none/MacroAssembler-none.h
@@ -255,6 +255,8 @@ class MacroAssemblerNone : public Assemb
template <typename T, typename S> void branchPrivatePtr(Condition, T, S, Label*) { MOZ_CRASH(); }
template <typename T, typename S> void decBranchPtr(Condition, T, S, Label*) { MOZ_CRASH(); }
template <typename T, typename S> void branchTest64(Condition, T, T, S, Label*) { MOZ_CRASH(); }
+ template <typename T, typename S> void branch64(Condition, T, S, Label*) { MOZ_CRASH(); }
+ template <typename T, typename S> void branch64(Condition, T, T, S, Label*) { MOZ_CRASH(); }
template <typename T, typename S> void mov(T, S) { MOZ_CRASH(); }
template <typename T, typename S> void movq(T, S) { MOZ_CRASH(); }
template <typename T, typename S> void movePtr(T, S) { MOZ_CRASH(); }