[player] Add s390x as 64-bit arch

Dan Horák sharkcz at fedoraproject.org
Wed May 4 09:46:06 UTC 2011


commit 5be65a65d60184b3c3af56b3369d1372399e457f
Author: Dan Horák <dan at danny.cz>
Date:   Wed May 4 11:45:54 2011 +0200

    Add s390x as 64-bit arch

 player-3.0.2.s390x.patch |   13 +++++++++++++
 player.spec              |    7 ++++++-
 2 files changed, 19 insertions(+), 1 deletions(-)
---
diff --git a/player-3.0.2.s390x.patch b/player-3.0.2.s390x.patch
new file mode 100644
index 0000000..f23f3e8
--- /dev/null
+++ b/player-3.0.2.s390x.patch
@@ -0,0 +1,13 @@
+diff -up player-3.0.2/cmake/internal/FindOS.cmake.s390x player-3.0.2/cmake/internal/FindOS.cmake
+--- player-3.0.2/cmake/internal/FindOS.cmake.s390x	2011-05-04 11:34:18.000000000 +0200
++++ player-3.0.2/cmake/internal/FindOS.cmake	2011-05-04 11:35:21.000000000 +0200
+@@ -61,6 +61,9 @@ IF (PLAYER_OS_LINUX)
+     ELSEIF (${CMAKE_SYSTEM_PROCESSOR} STREQUAL "ppc64")
+         MESSAGE (STATUS "Linux ppc64 Detected")
+         SET (PLAYER_PROC_64BIT TRUE BOOL INTERNAL)
++    ELSEIF (${CMAKE_SYSTEM_PROCESSOR} STREQUAL "s390x")
++        MESSAGE (STATUS "Linux s390x Detected")
++        SET (PLAYER_PROC_64BIT TRUE BOOL INTERNAL)
+     ENDIF (${CMAKE_SYSTEM_PROCESSOR} STREQUAL "x86_64")
+ ENDIF (PLAYER_OS_LINUX)
+ 
diff --git a/player.spec b/player.spec
index b43d94e..3256481 100644
--- a/player.spec
+++ b/player.spec
@@ -3,7 +3,7 @@
 
 Name:           player
 Version:        3.0.2
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        Cross-platform robot device interface and server
 
 Group:          Applications/System
@@ -19,6 +19,7 @@ Patch1:         %{name}-3.0.2.fixunicapimage.patch
 Patch2:         %{name}-3.0.2.fixlinuxwifi.patch
 Patch3:         %{name}-3.0.2.fixplayercam.patch
 Patch4:         %{name}-3.0.2.enablephidget.patch
+Patch5:         %{name}-3.0.2.s390x.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # Sort order: build tools, feature libs, within alphabetically, group related
@@ -132,6 +133,7 @@ are experimental.
 %patch2 -p0 
 %patch3 -p0
 %patch4 -p0
+%patch5 -p1 -b .s390x
 find . -name '*.c' -exec chmod -x {} \;
 find . -name '*.cc' -exec chmod -x {} \;
 find . -name '*.cpp' -exec chmod -x {} \;
@@ -213,6 +215,9 @@ rm -rf $RPM_BUILD_ROOT
 %{ruby_sitearch}/*.so
 
 %changelog
+* Wed May 04 2011 Dan Horák <dan[at]danny.cz> - 3.0.2-9
+- Add s390x as 64-bit arch
+
 * Sun Apr 10 2011 Rich Mattes <richmattes at gmail.com> - 3.0.2-8
 - Rebuild for boost soname change
 


More information about the scm-commits mailing list