- fix OOM during build on s390x and ppc64le (#1149295)
- fix Java detection on ppc64le
This commit is contained in:
parent
a4b2c36922
commit
4bc40d5bf9
|
@ -0,0 +1,12 @@
|
||||||
|
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()
|
13
hadoop.spec
13
hadoop.spec
|
@ -23,7 +23,7 @@
|
||||||
|
|
||||||
Name: hadoop
|
Name: hadoop
|
||||||
Version: 2.4.1
|
Version: 2.4.1
|
||||||
Release: 4%{?dist}
|
Release: 5%{?dist}
|
||||||
Summary: A software platform for processing vast amounts of data
|
Summary: A software platform for processing vast amounts of data
|
||||||
# The BSD license file is missing
|
# The BSD license file is missing
|
||||||
# https://issues.apache.org/jira/browse/HADOOP-9849
|
# https://issues.apache.org/jira/browse/HADOOP-9849
|
||||||
|
@ -65,6 +65,8 @@ Patch8: %{name}-netty-3.6.6-Final.patch
|
||||||
Patch9: %{name}-tools.jar.patch
|
Patch9: %{name}-tools.jar.patch
|
||||||
# Workaround for bz1012059
|
# Workaround for bz1012059
|
||||||
Patch10: %{name}-build.patch
|
Patch10: %{name}-build.patch
|
||||||
|
# Fix Java detection on ppc64le
|
||||||
|
Patch11: %{name}-2.4.1-cmake-java-ppc64le.patch
|
||||||
# The native bits don't compile on ARM
|
# The native bits don't compile on ARM
|
||||||
ExcludeArch: %{arm}
|
ExcludeArch: %{arm}
|
||||||
|
|
||||||
|
@ -480,6 +482,7 @@ This package contains files needed to run Apache Hadoop YARN in secure mode.
|
||||||
%endif
|
%endif
|
||||||
%patch9 -p1
|
%patch9 -p1
|
||||||
%patch10 -p1
|
%patch10 -p1
|
||||||
|
%patch11 -p1
|
||||||
|
|
||||||
%if 0%{?fedora} < 21
|
%if 0%{?fedora} < 21
|
||||||
# The hadoop test suite needs classes from the zookeeper test suite.
|
# The hadoop test suite needs classes from the zookeeper test suite.
|
||||||
|
@ -602,6 +605,10 @@ opts="-j"
|
||||||
opts="-j"
|
opts="-j"
|
||||||
%endif
|
%endif
|
||||||
%endif
|
%endif
|
||||||
|
# increase JVM memory limits to avoid OOM during build
|
||||||
|
%ifarch s390x ppc64le
|
||||||
|
export MAVEN_OPTS="-Xms2048M -Xmx4096M"
|
||||||
|
%endif
|
||||||
%mvn_build $opts -- -Drequire.snappy=true -Dcontainer-executor.conf.dir=%{_sysconfdir}/%{name} -Pdist,native -DskipTests -DskipTest -DskipIT
|
%mvn_build $opts -- -Drequire.snappy=true -Dcontainer-executor.conf.dir=%{_sysconfdir}/%{name} -Pdist,native -DskipTests -DskipTest -DskipIT
|
||||||
|
|
||||||
# This takes a long time to run, so comment out for now
|
# This takes a long time to run, so comment out for now
|
||||||
|
@ -1117,6 +1124,10 @@ fi
|
||||||
%attr(6050,root,yarn) %{_bindir}/container-executor
|
%attr(6050,root,yarn) %{_bindir}/container-executor
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Fri Oct 10 2014 Dan Horák <dan[at]danny.cz> - 2.4.1-5
|
||||||
|
- fix OOM during build on s390x and ppc64le (#1149295)
|
||||||
|
- fix Java detection on ppc64le
|
||||||
|
|
||||||
* Wed Oct 8 2014 Robert Rati <rrati@redhat> - 2.4.1-4
|
* Wed Oct 8 2014 Robert Rati <rrati@redhat> - 2.4.1-4
|
||||||
- Exclude asm3 as a runtime dependency
|
- Exclude asm3 as a runtime dependency
|
||||||
- Removed explict dependency on yarn from the mapreduce package
|
- Removed explict dependency on yarn from the mapreduce package
|
||||||
|
|
Loading…
Reference in New Issue