From 1b99c7a5b733ef2c7502f63f61bb3a4b3ef27d75060c41c30677d907329610e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Klaus=20K=C3=A4mpf?= Date: Tue, 18 Feb 2014 04:33:36 +0000 Subject: [PATCH] Accepting request 222652 from home:k0da:ppc - Add ppc64le to FindJNI - added patches: * cmake-jni-ppc64le.patch OBS-URL: https://build.opensuse.org/request/show/222652 OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/cmake?expand=0&rev=139 --- cmake-jni-ppc64le.patch | 13 +++++++++++++ cmake.changes | 7 +++++++ cmake.spec | 3 +++ 3 files changed, 23 insertions(+) create mode 100644 cmake-jni-ppc64le.patch diff --git a/cmake-jni-ppc64le.patch b/cmake-jni-ppc64le.patch new file mode 100644 index 0000000..90f110e --- /dev/null +++ b/cmake-jni-ppc64le.patch @@ -0,0 +1,13 @@ +Index: cmake-2.8.12.1/Modules/FindJNI.cmake +=================================================================== +--- cmake-2.8.12.1.orig/Modules/FindJNI.cmake ++++ cmake-2.8.12.1/Modules/FindJNI.cmake +@@ -45,6 +45,8 @@ macro(java_append_library_directories _v + # mips* machines are bi-endian mostly so processor does not tell + # 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") + elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^(powerpc|ppc)64") + set(_java_libarch "ppc64") + elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^(powerpc|ppc)") diff --git a/cmake.changes b/cmake.changes index f16d6a5..d3a48c1 100644 --- a/cmake.changes +++ b/cmake.changes @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Tue Feb 18 00:30:04 UTC 2014 - dvaleev@suse.com + +- Add ppc64le to FindJNI + +- added patches: + * cmake-jni-ppc64le.patch +------------------------------------------------------------------- Tue Jan 28 19:46:59 UTC 2014 - hrvoje.senjan@gmail.com - Update to 2.8.12.2 diff --git a/cmake.spec b/cmake.spec index 6644f38..ea731d3 100644 --- a/cmake.spec +++ b/cmake.spec @@ -26,6 +26,8 @@ Source2: opensuse_rules.cmake Patch2: cmake-fix-ruby-test.patch # PATCH-FIX-UPSTREAM fix-check-for-freetype251.patch -- http://www.cmake.org/Bug/view.php?id=13959, http://www.cmake.org/Bug/view.php?id=14601 Patch3: fix-check-for-freetype251.patch +# PATCH-FIX-UPSTREAM cmake-jni-ppc64le.patch -- https://github.com/Kitware/CMake/pull/90 +Patch4: cmake-jni-ppc64le.patch Summary: Cross-platform, open-source make system License: BSD-3-Clause Group: Development/Tools/Building @@ -56,6 +58,7 @@ CMake is a cross-platform, open-source make system %setup -q -n %{name}-%{version} %patch2 %patch3 -p1 +%patch4 -p1 %build export CXXFLAGS="$RPM_OPT_FLAGS"