From e9dadb94d7e017a6727637b0fb240ba7b0968ef448b23a42e45d8e0558762496 Mon Sep 17 00:00:00 2001 From: Wolfgang Rosenauer Date: Tue, 3 May 2016 20:02:49 +0000 Subject: [PATCH] Accepting request 393478 from home:michel_mno:branches:mozilla:Factory 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 --- MozillaFirefox.changes | 5 +++++ MozillaFirefox.spec | 2 ++ mozilla_add_branch64.patch | 26 ++++++++++++++++++++++++++ 3 files changed, 33 insertions(+) create mode 100644 mozilla_add_branch64.patch diff --git a/MozillaFirefox.changes b/MozillaFirefox.changes index 253dd59..b6769ce 100644 --- a/MozillaFirefox.changes +++ b/MozillaFirefox.changes @@ -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 diff --git a/MozillaFirefox.spec b/MozillaFirefox.spec index 7714dbd..165d357 100644 --- a/MozillaFirefox.spec +++ b/MozillaFirefox.spec @@ -173,6 +173,7 @@ Patch14: mozilla-check_return.patch Patch101: firefox-kde.patch Patch102: firefox-no-default-ualocale.patch Patch103: firefox-branded-icons.patch +Patch104: mozilla_add_branch64.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires(post): coreutils 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 %patch102 -p1 %patch103 -p1 +%patch104 -p1 %build # no need to add build time to binaries diff --git a/mozilla_add_branch64.patch b/mozilla_add_branch64.patch new file mode 100644 index 0000000..c15e4fb --- /dev/null +++ b/mozilla_add_branch64.patch @@ -0,0 +1,26 @@ +From: Michel Normand +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 +--- + 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 void branchPrivatePtr(Condition, T, S, Label*) { MOZ_CRASH(); } + template void decBranchPtr(Condition, T, S, Label*) { MOZ_CRASH(); } + template void branchTest64(Condition, T, T, S, Label*) { MOZ_CRASH(); } ++ template void branch64(Condition, T, S, Label*) { MOZ_CRASH(); } ++ template void branch64(Condition, T, T, S, Label*) { MOZ_CRASH(); } + template void mov(T, S) { MOZ_CRASH(); } + template void movq(T, S) { MOZ_CRASH(); } + template void movePtr(T, S) { MOZ_CRASH(); }