From 9f76ff0a0e73e19f52241c9eb801835fbc606d2d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20Hor=C3=A1k?= Date: Mon, 15 Sep 2014 17:32:54 +0200 Subject: [PATCH] - fix FindJNI for ppc64le (#1141782) --- cmake-java-ppc64le.patch | 26 ++++++++++++++++++++++++++ cmake.spec | 8 +++++++- 2 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 cmake-java-ppc64le.patch diff --git a/cmake-java-ppc64le.patch b/cmake-java-ppc64le.patch new file mode 100644 index 0000000..9f00e04 --- /dev/null +++ b/cmake-java-ppc64le.patch @@ -0,0 +1,26 @@ +From 18ac6713e8657cca8fc791bcd581a47a7be6ebce Mon Sep 17 00:00:00 2001 +From: Dinar Valeev +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 +--- + 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)") diff --git a/cmake.spec b/cmake.spec index f40a5e5..55368f2 100644 --- a/cmake.spec +++ b/cmake.spec @@ -13,7 +13,7 @@ Name: cmake Version: 3.0.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Cross-platform make system Group: Development/Tools @@ -59,6 +59,8 @@ Patch9: cmake-FindPythonLibs2.patch Patch10: cmake-FindwxWidgets.patch # Upstream fix to UsewxWidgets for CFLAGS handling Patch11: cmake-UsewxWidgets.patch +# https://bugzilla.redhat.com/show_bug.cgi?id=1141782#c2 +Patch12: cmake-java-ppc64le.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -130,6 +132,7 @@ The %{name}-gui package contains the Qt based GUI for CMake. %patch9 -p1 %patch10 -p1 %patch11 -p1 +%patch12 -p1 %build @@ -251,6 +254,9 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || : %changelog +* Mon Sep 15 2014 Dan HorĂ¡k - 3.0.2-2 +- fix FindJNI for ppc64le (#1141782) + * Sun Sep 14 2014 Orion Poplawski - 3.0.2-1 - Update to 3.0.2