- drop the patch Java detection on ppc64le which causes the wrong detection on ppc64le,

it fixes the build failure on ppc64le
This commit is contained in:
Than Ngo 2016-07-01 12:32:27 +02:00
parent 024bf23c11
commit 0e6bc68747
2 changed files with 5 additions and 16 deletions

View File

@ -1,12 +0,0 @@
diff -up hadoop-common-9e2ef43a240fb0f603d8c384e501daec11524510/hadoop-common-project/hadoop-common/src/JNIFlags.cmake.ppc hadoop-common-9e2ef43a240fb0f603d8c384e501daec11524510/hadoop-common-project/hadoop-common/src/JNIFlags.cmake
--- hadoop-common-9e2ef43a240fb0f603d8c384e501daec11524510/hadoop-common-project/hadoop-common/src/JNIFlags.cmake.ppc 2014-06-30 09:04:57.000000000 +0200
+++ hadoop-common-9e2ef43a240fb0f603d8c384e501daec11524510/hadoop-common-project/hadoop-common/src/JNIFlags.cmake 2014-10-10 10:37:39.000000000 +0200
@@ -78,6 +78,8 @@ IF("${CMAKE_SYSTEM}" MATCHES "Linux")
SET(_java_libarch "amd64")
ELSEIF (CMAKE_SYSTEM_PROCESSOR MATCHES "^arm")
SET(_java_libarch "arm")
+ ELSEIF (CMAKE_SYSTEM_PROCESSOR MATCHES "^(powerpc|ppc)64le")
+ SET(_java_libarch "ppc64")
ELSE()
SET(_java_libarch ${CMAKE_SYSTEM_PROCESSOR})
ENDIF()

View File

@ -23,7 +23,7 @@
Name: hadoop
Version: 2.4.1
Release: 20%{?dist}
Release: 21%{?dist}
Summary: A software platform for processing vast amounts of data
# The BSD license file is missing
# https://issues.apache.org/jira/browse/HADOOP-9849
@ -65,8 +65,6 @@ Patch8: %{name}-netty-3-Final.patch
Patch9: %{name}-tools.jar.patch
# Workaround for bz1012059
Patch10: %{name}-build.patch
# Fix Java detection on ppc64le
Patch11: %{name}-2.4.1-cmake-java-ppc64le.patch
# Build with hard-float on ARMv7
Patch12: %{name}-armhfp.patch
@ -465,7 +463,6 @@ This package contains files needed to run Apache Hadoop YARN in secure mode.
%endif
%patch9 -p1
%patch10 -p1
%patch11 -p1
%patch12 -p1
%patch13 -p1
%patch14 -p1
@ -1125,6 +1122,10 @@ fi
%attr(6050,root,yarn) %{_bindir}/container-executor
%changelog
* Fri Jul 01 2016 Than Ngo <than@redhat.com> - 2.4.1-21
- drop the patch Java detection on ppc64le which
causes the wrong detection on ppc64le
* Thu Jun 23 2016 Christopher Tubbs <ctubbsii@fedoraproject.org> - 2.4.1-20
- Fix broken symlink (bz#1308662) and bad Requires(pre) (bz#1319092)