[xulrunner] Fix build on 64-bit big endian platforms (mozbz#618485)
Dan Horák
sharkcz at fedoraproject.org
Mon Sep 2 13:27:17 UTC 2013
commit bcd0b40902c0b482c693e1b492a6491ba662c419
Author: Dan Horák <dan at danny.cz>
Date: Mon Sep 2 11:32:05 2013 +0200
Fix build on 64-bit big endian platforms (mozbz#618485)
mozilla-618485.patch | 30 ++++++++++++++++++++++++++++++
xulrunner.spec | 7 ++++++-
2 files changed, 36 insertions(+), 1 deletions(-)
---
diff --git a/mozilla-618485.patch b/mozilla-618485.patch
new file mode 100644
index 0000000..df08387
--- /dev/null
+++ b/mozilla-618485.patch
@@ -0,0 +1,30 @@
+
+# HG changeset patch
+# User Landry Breuil <landry at openbsd.org>
+# Date 1370688550 -7200
+# Node ID 82fab5c8a6d5a94c6a0f32a942976595b6e722a2
+# Parent 308462ba17bae57b9571fe397e0480b1c3217d01
+Bug 618485: Finally remove uintptr_t word payload union member on 64BE, it grows jsval_layout size and is unused. r=luke
+
+diff --git a/js/public/Value.h b/js/public/Value.h
+--- a/js/public/Value.h
++++ b/js/public/Value.h
+@@ -316,17 +316,16 @@ typedef union jsval_layout
+ uint64_t payload47 : 47;
+ } debugView;
+ struct {
+ uint32_t padding;
+ union {
+ int32_t i32;
+ uint32_t u32;
+ JSWhyMagic why;
+- uintptr_t word;
+ } payload;
+ } s;
+ double asDouble;
+ void *asPtr;
+ size_t asWord;
+ uintptr_t asUIntPtr;
+ } JSVAL_ALIGNMENT jsval_layout;
+ # endif /* JS_BITS_PER_WORD */
+
diff --git a/xulrunner.spec b/xulrunner.spec
index 95503a0..1ea990c 100644
--- a/xulrunner.spec
+++ b/xulrunner.spec
@@ -78,7 +78,7 @@
Summary: XUL Runtime for Gecko Applications
Name: xulrunner
Version: 23.0.1
-Release: 3%{?pre_tag}%{?dist}
+Release: 4%{?pre_tag}%{?dist}
URL: http://developer.mozilla.org/En/XULRunner
License: MPLv1.1 or GPLv2+ or LGPLv2+
Group: Applications/Internet
@@ -105,6 +105,7 @@ Patch24: rhbz-966424.patch
# Upstream patches
Patch106: mozilla-831688.patch
+Patch107: mozilla-618485.patch
# ---------------------------------------------------
@@ -246,6 +247,7 @@ cd %{tarballdir}
%patch24 -p1 -b .966424
%patch106 -p1 -b .831688
+%patch107 -p1 -b .618485
%{__rm} -f .mozconfig
%{__cp} %{SOURCE10} .mozconfig
@@ -527,6 +529,9 @@ fi
#---------------------------------------------------------------------
%changelog
+* Mon Sep 2 2013 Dan Horák <dan[at]danny.cz> - 23.0.1-4
+- Fix build on 64-bit big endian platforms (mozbz#618485)
+
* Sat Aug 31 2013 Karsten Hopp <karsten at redhat.com> 23.0.1-3
- update rhbz-911314.patch (PPC* only)
More information about the scm-commits
mailing list