- fix FindJNI for ppc64le (#1141782)
This commit is contained in:
parent
57c38184f6
commit
9f76ff0a0e
26
cmake-java-ppc64le.patch
Normal file
26
cmake-java-ppc64le.patch
Normal file
@ -0,0 +1,26 @@
|
|||||||
|
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)")
|
@ -13,7 +13,7 @@
|
|||||||
|
|
||||||
Name: cmake
|
Name: cmake
|
||||||
Version: 3.0.2
|
Version: 3.0.2
|
||||||
Release: 1%{?dist}
|
Release: 2%{?dist}
|
||||||
Summary: Cross-platform make system
|
Summary: Cross-platform make system
|
||||||
|
|
||||||
Group: Development/Tools
|
Group: Development/Tools
|
||||||
@ -59,6 +59,8 @@ Patch9: cmake-FindPythonLibs2.patch
|
|||||||
Patch10: cmake-FindwxWidgets.patch
|
Patch10: cmake-FindwxWidgets.patch
|
||||||
# Upstream fix to UsewxWidgets for CFLAGS handling
|
# Upstream fix to UsewxWidgets for CFLAGS handling
|
||||||
Patch11: cmake-UsewxWidgets.patch
|
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)
|
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
|
%patch9 -p1
|
||||||
%patch10 -p1
|
%patch10 -p1
|
||||||
%patch11 -p1
|
%patch11 -p1
|
||||||
|
%patch12 -p1
|
||||||
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
@ -251,6 +254,9 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Mon Sep 15 2014 Dan Horák <dan[at]danny.cz> - 3.0.2-2
|
||||||
|
- fix FindJNI for ppc64le (#1141782)
|
||||||
|
|
||||||
* Sun Sep 14 2014 Orion Poplawski <orion@cora.nwra.com> - 3.0.2-1
|
* Sun Sep 14 2014 Orion Poplawski <orion@cora.nwra.com> - 3.0.2-1
|
||||||
- Update to 3.0.2
|
- Update to 3.0.2
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user