[globus-core/el5] Add support for ppc64le (patch from ubuntu)

Mattias Ellert ellert at fedoraproject.org
Mon Jan 20 16:37:17 UTC 2014


commit 35bd6a6091d577979bc2fb9cc9a5860efdf6fe2a
Author: Mattias Ellert <mattias.ellert at fysast.uu.se>
Date:   Mon Jan 20 17:36:23 2014 +0100

    Add support for ppc64le (patch from ubuntu)

 globus-core-ppc64le.patch |   58 +++++++++++++++++++++++++++++++++++++++++++++
 globus-core.spec          |    7 ++++-
 2 files changed, 64 insertions(+), 1 deletions(-)
---
diff --git a/globus-core-ppc64le.patch b/globus-core-ppc64le.patch
new file mode 100644
index 0000000..00ccb4a
--- /dev/null
+++ b/globus-core-ppc64le.patch
@@ -0,0 +1,58 @@
+Description: Treat ppc64le as a 64-bit architecture
+Author: Colin Watson <cjwatson at ubuntu.com>
+Forwarded: no
+Last-Update: 2013-12-26
+
+Index: b/aclocal/globus_initializers.m4
+===================================================================
+--- a/aclocal/globus_initializers.m4
++++ b/aclocal/globus_initializers.m4
+@@ -13,7 +13,7 @@
+ 
+         libdir_choice="
+ case \`uname -m\` in
+-    aarch64|ppc64|s390x|sparc64|x86_64)
++    aarch64|ppc64|ppc64le|s390x|sparc64|x86_64)
+         libdir=\"$libdir64\"
+         ;;
+     *)
+@@ -22,7 +22,7 @@
+ esac
+ "
+         perl_libdir_choice="
+-    if (\`uname -m\` =~ /^(aarch64|ppc64|s390x|sparc64|x86_64)\$/) {
++    if (\`uname -m\` =~ /^(aarch64|ppc64|ppc64le|s390x|sparc64|x86_64)\$/) {
+         \$libdir = \"$libdir64\";
+     } else {
+         \$libdir = \"$libdir32\";
+@@ -35,7 +35,7 @@
+ 
+         libdir_choice="
+ case \`uname -m\` in
+-    aarch64|ppc64|s390x|sparc64|x86_64)
++    aarch64|ppc64|ppc64le|s390x|sparc64|x86_64)
+         libdir=\"$libdir64\"
+         ;;
+     *)
+@@ -44,7 +44,7 @@
+ esac
+ "
+         perl_libdir_choice="
+-    if (\`uname -m\` =~ /^(aarch64|ppc64|s390x|sparc64|x86_64)\$/) {
++    if (\`uname -m\` =~ /^(aarch64|ppc64|ppc64le|s390x|sparc64|x86_64)\$/) {
+         \$libdir = \"$libdir64\";
+     } else {
+         \$libdir = \"$libdir32\";
+Index: b/config/accompiler.m4
+===================================================================
+--- a/config/accompiler.m4
++++ b/config/accompiler.m4
+@@ -370,7 +370,7 @@
+         fi
+         CC="$lac_cv_CC"
+         ;;
+-    *powerpc64-*linux* )
++    *powerpc64-*linux*|*powerpc64le-*linux* )
+         if test "$GLOBUS_CC" = "mpicc"; then
+             AC_PATH_PROGS(lac_cv_CC,  $CC  mpicc)
+             AC_PATH_PROGS(lac_cv_CXX, $CXX mpicxx mpic++ mpiCC)
diff --git a/globus-core.spec b/globus-core.spec
index 0e89792..36dffe7 100644
--- a/globus-core.spec
+++ b/globus-core.spec
@@ -15,7 +15,7 @@
 Name:		globus-core
 %global _name %(tr - _ <<< %{name})
 Version:	8.16
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Globus Toolkit - Globus Core
 
 Group:		Development/Tools
@@ -26,6 +26,7 @@ Source:		http://www.globus.org/ftppub/gt5/5.2/5.2.5/packages/src/%{_name}-%{vers
 Source8:	GLOBUS-CCOMMONLIB
 Patch0:		%{name}-spec-creator.patch
 Patch1:		%{name}-new-docdir.patch
+Patch2:		%{name}-ppc64le.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires:	pkgconfig
@@ -48,6 +49,7 @@ Globus Core
 %if %{?fedora}%{!?fedora:0} >= 20 || %{?rhel}%{!?rhel:0} >= 7
 %patch1 -p1
 %endif
+%patch2 -p1
 
 sed 's/5.2.0/5.2.5/' -i scripts/globus-spec-creator
 sed 's/ -L$libdir//' -i config/accompiler.m4
@@ -129,6 +131,9 @@ rm -rf %{buildroot}
 %doc %{_pkgdocdir}/README
 
 %changelog
+* Sun Jan 19 2014 Mattias Ellert <mattias.ellert at fysast.uu.se> - 8.16-2
+- Add support for ppc64le (patch from ubuntu)
+
 * Wed Nov 06 2013 Mattias Ellert <mattias.ellert at fysast.uu.se> - 8.16-1
 - Update to Globus Toolkit 5.2.5
 - Drop patches implemented upstream


More information about the scm-commits mailing list