From b6693a93a63cbf39e6756c1d39afd5c46251b8da Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Nov 19 2015 15:50:57 +0000 Subject: import cmake-2.8.11-5.el7 --- diff --git a/SOURCES/cmake-FindJNI.patch b/SOURCES/cmake-FindJNI.patch new file mode 100644 index 0000000..f0caed0 --- /dev/null +++ b/SOURCES/cmake-FindJNI.patch @@ -0,0 +1,12 @@ +diff -Nrup a/Modules/FindJNI.cmake b/Modules/FindJNI.cmake +--- a/Modules/FindJNI.cmake 2013-05-15 13:38:12.000000000 -0400 ++++ b/Modules/FindJNI.cmake 2014-08-20 11:12:51.011021582 -0400 +@@ -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 "ppc64" "ppc64le") + elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^(powerpc|ppc)64") + set(_java_libarch "ppc64") + elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^(powerpc|ppc)") diff --git a/SPECS/cmake.spec b/SPECS/cmake.spec index 6568361..db15c74 100644 --- a/SPECS/cmake.spec +++ b/SPECS/cmake.spec @@ -13,7 +13,7 @@ Name: cmake Version: 2.8.11 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Cross-platform make system Group: Development/Tools @@ -47,6 +47,8 @@ Patch5: cmake-2.8.11-rc4-lua-5.2.patch Patch6: cmake-strict_aliasing.patch # Desktop icon filenames should be without extension Patch7: cmake-desktop_icon.patch +# FindJNI: Add ppc64le architecture +Patch8: cmake-FindJNI.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gcc-gfortran @@ -103,6 +105,7 @@ The %{name}-gui package contains the Qt based GUI for CMake. %patch5 -p1 %patch6 -p1 %patch7 -p1 +%patch8 -p1 %build @@ -199,6 +202,9 @@ update-mime-database %{_datadir}/mime &> /dev/null || : %changelog +* Wed Aug 20 2014 Patsy Franklin - 2.8.11-5 +- Add support for ppc64le to FindJNI.cmake. + * Fri Jan 24 2014 Daniel Mach - 2.8.11-4 - Mass rebuild 2014-01-24