[js] - Add Patch8: ppc64le.patch (bz#1096135) to fix compilation on ppc64le arch.

Pavel Alexeev hubbitus at fedoraproject.org
Wed May 14 15:51:35 UTC 2014


commit ea5b1f5af59d55ead0fbf2e1b511db6e08f14ea5
Author: Hubbitus <pahan at hubbitus.info>
Date:   Wed May 14 19:51:11 2014 +0400

    - Add Patch8: ppc64le.patch (bz#1096135) to fix compilation on ppc64le arch.

 js.spec       |   18 +++++++++++++-----
 ppc64le.patch |   50 ++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 63 insertions(+), 5 deletions(-)
---
diff --git a/js.spec b/js.spec
index d780d8a..8de832c 100644
--- a/js.spec
+++ b/js.spec
@@ -4,7 +4,7 @@ Summary:		JavaScript interpreter and libraries
 Name:		js
 Epoch:		1
 Version:		1.8.5
-Release:		16%{?hgdate:.hg%{hgdate}}%{?dist}
+Release:		17%{?hgdate:.hg%{hgdate}}%{?dist}
 License:		GPLv2+ or LGPLv2+ or MPLv1.1
 Group:		Development/Languages
 URL:			http://www.mozilla.org/js/
@@ -15,8 +15,10 @@ Patch2:		js185-destdir.patch
 Patch3:		js-1.8.5-537701.patch
 Patch4:		js185-arm-nosoftfp.patch
 Patch5:		js185-libedit.patch
-Patch6:         0001-Make-js-config.h-multiarch-compatible.patch
-Patch7:         aarch64.patch
+Patch6:		0001-Make-js-config.h-multiarch-compatible.patch
+Patch7:		aarch64.patch
+# bz#1096135
+Patch8:		ppc64le.patch
 Provides:		libjs = %{version}-%{release}
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root
 Buildrequires:	nspr-devel >= 4.7
@@ -58,6 +60,8 @@ you will need to install %{name}-devel.
 %patch5 -p1 -b .libedit
 %patch6 -p1 -b .multiarch
 %patch7 -p1 -b .aarch64
+%patch8 -p1 -b .ppc64le
+
 cd js
 
 # Rm parts with spurios licenses, binaries
@@ -139,7 +143,11 @@ rm -rf %{buildroot}
 %{_includedir}/js
 
 %changelog
-* Thu Mar 26 2014 Marcin Juszkiewicz <mjuszkiewicz at redhat.com> - 1:1.8.5-16
+* Wed May 14 2014 Pavel Alexeev <Pahan at Hubbitus.info> - 1:1.8.5-17
+- Fix bogus dates in changelog.
+- Add Patch8: ppc64le.patch (bz#1096135) to fix compilation on ppc64le arch.
+
+* Wed Mar 26 2014 Marcin Juszkiewicz <mjuszkiewicz at redhat.com> - 1:1.8.5-16
 - Add patch for AArch64.
 
 * Mon Mar 17 2014 Colin Walters <walters at redhat.com> - 1:1.8.5-15
@@ -290,7 +298,7 @@ rm -rf %{buildroot}
 * Tue Apr 19 2005 Ville Skyttä <ville.skytta at iki.fi> - 1.5-0.rc6a.6
 - Link shared lib with libperl.
 
-* Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net>
+* Thu Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net>
 - rebuilt
 
 * Mon Feb 14 2005 David Woodhouse <dwmw2 at infradead.org> - 1.5-0.rc6a.4
diff --git a/ppc64le.patch b/ppc64le.patch
new file mode 100644
index 0000000..129997e
--- /dev/null
+++ b/ppc64le.patch
@@ -0,0 +1,50 @@
+diff -Naur js-1.8.5.orig/js/src/assembler/wtf/Platform.h js-1.8.5/js/src/assembler/wtf/Platform.h
+--- js-1.8.5.orig/js/src/assembler/wtf/Platform.h
++++ js-1.8.5/js/src/assembler/wtf/Platform.h
+@@ -129,16 +129,22 @@
+    || defined(__POWERPC__) \
+    || defined(_M_PPC)      \
+    || defined(__PPC)
++#if !defined(__ppc64__) && !defined(__PPC64__)
+ #define WTF_CPU_PPC 1
++#endif
++#if !defined(__LITTLE_ENDIAN__)
+ #define WTF_CPU_BIG_ENDIAN 1
+ #endif
++#endif
+ 
+ /* CPU(PPC64) - PowerPC 64-bit */
+ #if   defined(__ppc64__) \
+    || defined(__PPC64__)
+ #define WTF_CPU_PPC64 1
++#if !defined(__LITTLE_ENDIAN__)
+ #define WTF_CPU_BIG_ENDIAN 1
+ #endif
++#endif
+ 
+ /* CPU(SH4) - SuperH SH-4 */
+ #if defined(__SH4__)
+diff -Naur js-1.8.5.orig/js/src/configure.in js-1.8.5/js/src/configure.in
+--- js-1.8.5.orig/js/src/configure.in
++++ js-1.8.5/js/src/configure.in
+@@ -1498,7 +1498,7 @@
+     CPU_ARCH=x86
+     ;;
+ 
+-powerpc64 | ppc64)
++powerpc64 | ppc64 | powerpc64le | ppc64le)
+     CPU_ARCH=ppc64
+     ;;
+ 
+diff -Naur js-1.8.5/js/src/Makefile.in.ori js-1.8.5/js/src/Makefile.in
+--- js-1.8.5/js/src/Makefile.in.ori
++++ js-1.8.5/js/src/Makefile.in
+@@ -382,7 +382,7 @@ CPPSRCS += 	checks.cc \
+ # END enclude sources for V8 dtoa
+ #############################################
+ 
+-ifeq (,$(filter-out aarch64 powerpc powerpc64 sparc sparc64 s390 s390x,$(TARGET_CPU)))
++ifeq (,$(filter-out aarch64 powerpc powerpc64 powerpc64le sparc sparc64 s390 s390x,$(TARGET_CPU)))
+ 
+ VPATH +=	$(srcdir)/assembler \
+ 		$(srcdir)/assembler/wtf \


More information about the scm-commits mailing list