From a80b73eb045cc1d80ce667fd369f154660eff22f Mon Sep 17 00:00:00 2001
From: CentOS Buildsys <bugs@centos.org>
Date: Mar 18 2014 17:18:13 +0000
Subject: import mozjs17-17.0.0-10.el7.src.rpm


---

diff --git a/SOURCES/0001-Move-JS_BYTES_PER_WORD-out-of-config.h.patch b/SOURCES/0001-Move-JS_BYTES_PER_WORD-out-of-config.h.patch
new file mode 100644
index 0000000..e7c8a83
--- /dev/null
+++ b/SOURCES/0001-Move-JS_BYTES_PER_WORD-out-of-config.h.patch
@@ -0,0 +1,72 @@
+From 5b2bfe99c7ef70ea75731c88b43d9036be11d236 Mon Sep 17 00:00:00 2001
+From: Colin Walters <walters@verbum.org>
+Date: Tue, 18 Mar 2014 11:46:05 -0400
+Subject: [PATCH] Move JS_BYTES_PER_WORD out of config.h
+
+Instead define it in terms of the already extant GNU C extension
+__SIZEOF_POINTER__.  This avoids multiarch conflicts when 32 and 64
+bit packages of js are co-installed.
+---
+ js/src/configure.in   |  9 ---------
+ js/src/js-config.h.in |  1 -
+ js/src/jstypes.h      | 12 ++++++++++++
+ 3 files changed, 12 insertions(+), 10 deletions(-)
+
+diff --git a/js/src/configure.in b/js/src/configure.in
+index 19fd704..0673aca 100644
+--- a/js/src/configure.in
++++ b/js/src/configure.in
+@@ -2349,15 +2349,6 @@ else
+   AC_MSG_RESULT(no)
+ fi
+ 
+-MOZ_SIZE_OF_TYPE(JS_BYTES_PER_WORD, void*, 4 8)
+-if test "$moz_cv_size_of_JS_BYTES_PER_WORD" -eq "4"; then
+-  AC_DEFINE(JS_BITS_PER_WORD_LOG2, 5)
+-elif test "$moz_cv_size_of_JS_BYTES_PER_WORD" -eq "8"; then
+-  AC_DEFINE(JS_BITS_PER_WORD_LOG2, 6)
+-else
+-  AC_MSG_ERROR([Unexpected JS_BYTES_PER_WORD])
+-fi
+-
+ MOZ_ALIGN_OF_TYPE(JS_ALIGN_OF_POINTER, void*, 2 4 8 16)
+ MOZ_SIZE_OF_TYPE(JS_BYTES_PER_DOUBLE, double, 6 8 10 12 14)
+ 
+diff --git a/js/src/js-config.h.in b/js/src/js-config.h.in
+index 6889e00..4775420 100644
+--- a/js/src/js-config.h.in
++++ b/js/src/js-config.h.in
+@@ -56,7 +56,6 @@
+ #undef JS_INT32_TYPE
+ #undef JS_INT64_TYPE
+ #undef JS_INTPTR_TYPE
+-#undef JS_BYTES_PER_WORD
+ 
+ /* Some mozilla code uses JS-friend APIs that depend on JS_METHODJIT being
+    correct. */
+diff --git a/js/src/jstypes.h b/js/src/jstypes.h
+index d0cf183..3e7928f 100644
+--- a/js/src/jstypes.h
++++ b/js/src/jstypes.h
+@@ -24,6 +24,18 @@
+ #include "mozilla/Util.h"
+ 
+ #include "js-config.h"
++#ifndef JS_BYTES_PER_WORD
++#define JS_BYTES_PER_WORD __SIZEOF_POINTER__
++#endif
++#ifndef JS_BITS_PER_WORD_LOG2
++#if JS_BYTES_PER_WORD == 8
++#define JS_BITS_PER_WORD_LOG2 6
++#elif JS_BYTES_PER_WORD == 4
++#define JS_BITS_PER_WORD_LOG2 5
++#else
++#error Unhandled JS_BYTES_PER_WORD
++#endif 
++#endif
+ 
+ /***********************************************************************
+ ** MACROS:      JS_EXTERN_API
+-- 
+1.8.3.1
+
diff --git a/SPECS/mozjs17.spec b/SPECS/mozjs17.spec
index 0534057..bce1522 100644
--- a/SPECS/mozjs17.spec
+++ b/SPECS/mozjs17.spec
@@ -1,7 +1,7 @@
 Summary:	JavaScript interpreter and libraries
 Name:		mozjs17
 Version:	17.0.0
-Release:	7%{?dist}
+Release:	10%{?dist}
 License:	GPLv2+ or LGPLv2+ or MPLv1.1
 Group:		Development/Languages
 URL:		http://www.mozilla.org/js/
@@ -16,6 +16,7 @@ Patch0:		js17-build-fixes.patch
 # makes mozjs to match js from xul 21
 Patch1:		js17-jsval.patch
 Patch2:         mozbug746112-no-decommit-on-large-pages.patch
+Patch3:         0001-Move-JS_BYTES_PER_WORD-out-of-config.h.patch
 
 %description
 JavaScript is the Netscape-developed object scripting language used in millions
@@ -43,6 +44,7 @@ rm js/src/ctypes/libffi -rf
 %patch2 -p1
 chmod a+x configure
 (cd js/src && autoconf-2.13)
+%patch3 -p1
 
 %build
 %configure --disable-static --with-system-nspr --enable-threadsafe --enable-readline
@@ -83,6 +85,16 @@ rm -f %{buildroot}%{_bindir}/js17-config
 %{_includedir}/js-17.0
 
 %changelog
+* Tue Mar 18 2014 Colin Walters <walters@redhat.com> - 17.0.0-10
+- Add patch to fix multilib conflict with -devel packages
+- Resolves: #1076420
+
+* Fri Jan 24 2014 Daniel Mach <dmach@redhat.com> - 17.0.0-9
+- Mass rebuild 2014-01-24
+
+* Fri Dec 27 2013 Daniel Mach <dmach@redhat.com> - 17.0.0-8
+- Mass rebuild 2013-12-27
+
 * Mon Jun 17 2013 Dennis Gilmore <dennis@ausil.us> 17.0.0-7
 - disable failing find_vanilla_new_calls test