[libccp4] Fix endianness settings on aarch64, ppc64le
Yaakov Selkowitz
yselkowitz at fedoraproject.org
Tue Jul 29 00:16:24 UTC 2014
commit 168e9ba9361ef56a643515f043854b1e662aec34
Author: Yaakov Selkowitz <yselkowitz at users.sourceforge.net>
Date: Mon Jul 28 19:13:20 2014 -0500
Fix endianness settings on aarch64, ppc64le
libccp4-ccp4_sysdep.patch | 44 +++++++++++---------------------------------
libccp4.spec | 5 ++++-
2 files changed, 15 insertions(+), 34 deletions(-)
---
diff --git a/libccp4-ccp4_sysdep.patch b/libccp4-ccp4_sysdep.patch
index def294e..dd4e528 100644
--- a/libccp4-ccp4_sysdep.patch
+++ b/libccp4-ccp4_sysdep.patch
@@ -1,45 +1,23 @@
---- ccp4/ccp4_sysdep.h_orig 2013-08-07 21:40:55.745456413 -0700
-+++ ccp4/ccp4_sysdep.h 2013-08-07 21:45:48.556447944 -0700
-@@ -253,7 +253,17 @@
+--- ccp4/ccp4_sysdep.h.orig
++++ ccp4/ccp4_sysdep.h
+@@ -253,7 +253,10 @@
# define NATIVEFT DFNTF_LEIEEE
#endif
-#if defined (powerpc) || defined (__ppc__) || defined __PPC
-+#if defined(__ARMEL__)
++#if (defined(__powerpc64__) && defined(__LITTLE_ENDIAN__)) || defined(__ARMEL__) || defined(__AARCH64EL__)
+# define NATIVEIT DFNTI_IBO
+# define NATIVEFT DFNTF_LEIEEE
-+#endif
-+
-+#if defined (powerpc) || defined (__powerpc__) || defined (__ppc__) || defined __PPC
-+# define NATIVEIT DFNTI_MBO
-+# define NATIVEFT DFNTF_BEIEEE
-+#endif
-+
-+#if defined (__s390__) || defined (__s390x__)
++#elif defined (powerpc) || defined(__powerpc__) || defined (__ppc__) || defined __PPC || defined (__ARMEB__) || defined(__AARCH64EB__)
# define NATIVEIT DFNTI_MBO
# define NATIVEFT DFNTF_BEIEEE
#endif
-@@ -276,6 +286,23 @@
- # define NATIVEFT DFNTF_BEIEEE
+@@ -271,7 +274,7 @@
+ # define NATIVEIT DFNTI_IBO
#endif
-+#if defined (__hppa__)
-+# define NATIVEIT DFNTI_MBO
-+# define NATIVEFT DFNTF_BEIEEE
-+#endif
-+
-+#if defined(__ARM__) || defined(__arm__)
-+#if defined(__ARMEB__)
-+# define NATIVEIT DFNTI_MBO
-+# define NATIVEFT DFNTF_BEIEEE
-+#endif
-+
-+#if defined(__ARMEL__)
-+# define NATIVEIT DFNTI_IBO
-+# define NATIVEFT DFNTF_LEIEEE
-+#endif
-+#endif
-+
- #ifndef NATIVEFT
- # error "Can't determine machine number format"
+-#if defined(MIPSEB) || defined(__hpux) || defined(_AIX) || defined(m68k) || defined(mc68000) || defined(sparc) || defined (__sparc__) || defined(__s390__)
++#if defined(MIPSEB) || defined(__hpux) || defined(_AIX) || defined(m68k) || defined(mc68000) || defined(sparc) || defined (__sparc__) || defined(__s390__) || defined(__s390x__) || defined(__hppa__)
+ # define NATIVEIT DFNTI_MBO
+ # define NATIVEFT DFNTF_BEIEEE
#endif
diff --git a/libccp4.spec b/libccp4.spec
index 356f515..5d4737b 100644
--- a/libccp4.spec
+++ b/libccp4.spec
@@ -1,7 +1,7 @@
Summary: Library providing specific CCP4 functionality
Name: libccp4
Version: 6.3.1
-Release: 5%{?dist}
+Release: 6%{?dist}
License: LGPLv3
Group: System Environment/Libraries
URL: ftp://ftp.ccp4.ac.uk/opensource/
@@ -101,6 +101,9 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
%{_libdir}/pkgconfig/%{name}f.pc
%changelog
+* Mon Jul 28 2014 Yaakov Selkowitz <yselkowi at redhat.com> - 6.3.1-6
+- Fix endianness settings on aarch64, ppc64le
+
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 6.3.1-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
More information about the scm-commits
mailing list