Add aarch32 to libarch for arm platform

This commit is contained in:
Than Ngo 2016-09-26 16:15:14 +02:00
parent 5e0ae9df7c
commit 305eda7637
2 changed files with 18 additions and 2 deletions

View File

@ -0,0 +1,12 @@
diff -up cmake-3.6.2/Modules/FindJNI.cmake.than cmake-3.6.2/Modules/FindJNI.cmake
--- cmake-3.6.2/Modules/FindJNI.cmake.than 2016-09-26 16:07:43.486195741 +0200
+++ cmake-3.6.2/Modules/FindJNI.cmake 2016-09-26 16:08:53.239573692 +0200
@@ -53,7 +53,7 @@ macro(java_append_library_directories _v
set(_java_libarch "alpha")
elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^arm")
# Subdir is "arm" for both big-endian (arm) and little-endian (armel).
- set(_java_libarch "arm")
+ set(_java_libarch "arm" "aarch32")
elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^mips")
# mips* machines are bi-endian mostly so processor does not tell
# endianess of the underlying system.

View File

@ -43,7 +43,7 @@
Name: %{orig_name}%{?name_suffix}
Version: %{major_version}.%{minor_version}.2
Release: 2%{?dist}
Release: 3%{?dist}
Summary: Cross-platform make system
# most sources are BSD
@ -66,7 +66,8 @@ Source4: %{name}.prov
Patch2: %{name}-findruby.patch
# replace release flag -O3 with -O2 for fedora
Patch3: %{name}-fedora-flag_release.patch
# add extra aarch32 to libarch for arm platform
Patch4: %{name}-libarch-arm-findjni.patch
# Patch for renaming on EPEL
%if 0%{?name_suffix:1}
Patch1000: %{name}-rename.patch
@ -392,6 +393,9 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
%changelog
* Mon Sep 26 2016 Than Ngo <than@redhat.com> - 3.6.2-3
- Add aarch32 to libarch for arm platform
* Mon Sep 12 2016 Orion Poplawski <orion@cora.nwra.com> - 3.6.2-2
- Provide the major version cmakeX name