testing/cmake
SHA256
3
0
Fork 0
forked from pool/cmake
Code Pull Requests Activity

Accepting request 239140 from home:k0da:ppc

Browse Source 
- Change java libarch to ppc64 for ppc64le, and keep ppc64le for
  backward compatibility (make-ppc64le-jni.patch)

OBS-URL: https://build.opensuse.org/request/show/239140
OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/cmake?expand=0&rev=159
This commit is contained in:
Tomáš Chvátal 2014-07-01 11:10:57 +00:00 committed by Git OBS Bridge
parent 4e44d67515
commit 98b0c1cb66
3 changed files with 37 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
cmake-ppc64le-jni.patch Normal file
View File

@ -0,0 +1,28 @@
From 18ac6713e8657cca8fc791bcd581a47a7be6ebce Mon Sep 17 00:00:00 2001
From: Dinar Valeev <dvaleev@suse.com>
Date: Mon, 30 Jun 2014 18:29:20 +0200
Subject: [PATCH] FindJNI: search for ppc64 on ppc64le as well
IcedTea 2.5 have changed libarch for ppc64le to ppc64. Adjust FindJNI
to look for both for backward compatibility.
Signed-off-by: Dinar Valeev <dvaleev@suse.com>
---
Modules/FindJNI.cmake | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Modules/FindJNI.cmake b/Modules/FindJNI.cmake
index 6a496af..3dcb0d0 100644
--- a/Modules/FindJNI.cmake
+++ b/Modules/FindJNI.cmake
@@ -55,7 +55,7 @@ macro(java_append_library_directories _var)
# endianess of the underlying system.
set(_java_libarch "${CMAKE_SYSTEM_PROCESSOR}" "mips" "mipsel" "mipseb")
elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^(powerpc|ppc)64le")
- set(_java_libarch "ppc64le")
+ set(_java_libarch "ppc64" "ppc64le")
elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^(powerpc|ppc)64")
set(_java_libarch "ppc64" "ppc")
elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^(powerpc|ppc)")
--
1.9.3

6
cmake.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Tue Jul 1 10:52:47 UTC 2014 - dvaleev@suse.com
- Change java libarch to ppc64 for ppc64le, and keep ppc64le for
backward compatibility (make-ppc64le-jni.patch)
-------------------------------------------------------------------
Sat Jun 21 10:40:48 UTC 2014 - tchvatal@suse.com

3
cmake.spec
View File

@ -27,6 +27,8 @@ Source0: http://www.cmake.org/files/v3.0/%{name}-%{version}.tar.gz
Source1: cmake.macros
Source2: opensuse_rules.cmake
Patch2: cmake-fix-ruby-test.patch
#PATCH-FIX-UPSTREAM dvaleev@suse.com https://github.com/Kitware/CMake/pull/111.patch
Patch3: cmake-ppc64le-jni.patch
BuildRequires: fdupes
BuildRequires: gcc-c++
BuildRequires: libexpat-devel
@ -45,6 +47,7 @@ CMake is a cross-platform, open-source build system
%prep
%setup -q
%patch2 -p1
%patch3 -p1
%build
export CXXFLAGS="%{optflags}"