Fix build on riscv64
(cherry picked from commit 536b3177bd9eb34eeb07f9b923fa707f5797b3bb)
This commit is contained in:
Dingli Zhang
openeuler-sync-bot
parent
7944f9015a
commit
1db6ed0535
14
02-Upgrade-os-maven-plugin-to-1.7.1.patch
Normal file
14
02-Upgrade-os-maven-plugin-to-1.7.1.patch
Normal file
@ -0,0 +1,14 @@
|
||||
diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml
|
||||
index 0b2f6f17..c402535f 100644
|
||||
--- a/hadoop-project/pom.xml
|
||||
+++ b/hadoop-project/pom.xml
|
||||
@@ -151,7 +151,7 @@
|
||||
|
||||
<protobuf-compile.version>3.5.1</protobuf-compile.version>
|
||||
<grpc.version>1.10.0</grpc.version>
|
||||
- <os-maven-plugin.version>1.7.0</os-maven-plugin.version>
|
||||
+ <os-maven-plugin.version>1.7.1</os-maven-plugin.version>
|
||||
|
||||
<!-- define the Java language version used by the compiler -->
|
||||
<javac.version>1.8</javac.version>
|
||||
|
||||
23
03-Fix-build-on-riscv.patch
Normal file
23
03-Fix-build-on-riscv.patch
Normal file
@ -0,0 +1,23 @@
|
||||
diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-nativetask/src/main/native/src/lib/primitives.h b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-nativetask/src/main/native/src/lib/primitives.h
|
||||
index 000c4b91..70e94487 100644
|
||||
--- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-nativetask/src/main/native/src/lib/primitives.h
|
||||
+++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-nativetask/src/main/native/src/lib/primitives.h
|
||||
@@ -99,7 +99,7 @@ inline void simple_memcpy(void * dest, const void * src, size_t len) {
|
||||
inline uint32_t bswap(uint32_t val) {
|
||||
#ifdef __aarch64__
|
||||
__asm__("rev %w[dst], %w[src]" : [dst]"=r"(val) : [src]"r"(val));
|
||||
-#elif defined(__ppc64__)||(__PPC64__)||(__powerpc64__)
|
||||
+#elif defined(__ppc64__)||(__PPC64__)||(__powerpc64__)||(__riscv)
|
||||
return __builtin_bswap32(val);
|
||||
#else
|
||||
__asm__("bswap %0" : "=r" (val) : "0" (val));
|
||||
@@ -110,7 +110,7 @@ inline uint32_t bswap(uint32_t val) {
|
||||
inline uint64_t bswap64(uint64_t val) {
|
||||
#ifdef __aarch64__
|
||||
__asm__("rev %[dst], %[src]" : [dst]"=r"(val) : [src]"r"(val));
|
||||
-#elif defined(__ppc64__)||(__PPC64__)||(__powerpc64__)
|
||||
+#elif defined(__ppc64__)||(__PPC64__)||(__powerpc64__)||(__riscv)
|
||||
return __builtin_bswap64(val);
|
||||
#else
|
||||
#ifdef __X64
|
||||
|
||||
61
hadoop.spec
61
hadoop.spec
@ -11,7 +11,7 @@
|
||||
%define _binaries_in_noarch_packages_terminate_build 0
|
||||
Name: hadoop
|
||||
Version: 3.3.6
|
||||
Release: 2
|
||||
Release: 3
|
||||
Summary: A software platform for processing vast amounts of data
|
||||
# The BSD license file is missing
|
||||
# https://issues.apache.org/jira/browse/HADOOP-9849
|
||||
@ -34,9 +34,12 @@ Source13: %{name}-yarn-site.xml
|
||||
Source14: yarn-v1.22.5.tar.gz
|
||||
Source15: node-12.22.1-linux-x64.tar.gz
|
||||
Source16: node-v12.22.1-linux-arm64.tar.gz
|
||||
Source17: settings.xml
|
||||
Source17: protoc-3.7.1-linux-riscv64.exe
|
||||
Source18: protoc-gen-grpc-java-1.26.0-linux-riscv_64.exe
|
||||
|
||||
Patch0: 01-lock-triple-beam-version-to-1.3.0.patch
|
||||
Patch1: 02-Upgrade-os-maven-plugin-to-1.7.1.patch
|
||||
Patch2: 03-Fix-build-on-riscv.patch
|
||||
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
|
||||
BuildRequires: java-1.8.0-openjdk-devel maven hostname maven-local tomcat cmake snappy openssl-devel
|
||||
@ -255,27 +258,30 @@ This package contains files needed to run Apache Hadoop YARN in secure mode.
|
||||
|
||||
%prep
|
||||
%autosetup -p1 -n %{name}-%{version}-src
|
||||
cp %{SOURCE17} ./
|
||||
sed -i "s,@HOME@,${HOME},g" settings.xml
|
||||
mvn install:install-file -DgroupId=org.fusesource.leveldbjni -DartifactId=leveldbjni-all -Dversion=1.8 -Dpackaging=jar -Dfile=/usr/lib/java/leveldbjni-all.jar -s settings.xml
|
||||
mvn install:install-file -DgroupId=org.fusesource.leveldbjni -DartifactId=leveldbjni -Dversion=1.8 -Dpackaging=jar -Dfile=/usr/lib/java/leveldbjni/leveldbjni.jar -s settings.xml
|
||||
mvn install:install-file -DgroupId=org.iq80.leveldb -DartifactId=leveldb-api -Dversion=0.7 -Dpackaging=jar -Dfile=/usr/share/java/leveldb-java/leveldb-api.jar -s settings.xml
|
||||
mvn install:install-file -DgroupId=org.iq80.leveldb -DartifactId=leveldb-benchmark -Dversion=0.7 -Dpackaging=jar -Dfile=/usr/share/java/leveldb-java/leveldb-benchmark.jar -s settings.xml
|
||||
mvn install:install-file -DgroupId=org.iq80.leveldb -DartifactId=leveldb -Dversion=0.7 -Dpackaging=jar -Dfile=/usr/share/java/leveldb-java/leveldb.jar -s settings.xml
|
||||
mvn install:install-file -DgroupId=orn.fusesource.hawtjni -DartifactId=hawtjni-runtime -Dversion=1.16 -Dpackaging=jar -Dfile=/usr/lib/java/hawtjni/hawtjni-runtime.jar -s settings.xml
|
||||
%ifarch riscv64
|
||||
mvn install:install-file -DgroupId=com.google.protobuf -DartifactId=protoc -Dversion=2.5.0 -Dclassifier=linux-riscv64 -Dpackaging=exe -Dfile=/usr/bin/protoc
|
||||
mvn install:install-file -DgroupId=com.google.protobuf -DartifactId=protoc -Dversion=3.7.1 -Dclassifier=linux-riscv64 -Dpackaging=exe -Dfile=%{SOURCE17}
|
||||
mvn install:install-file -DgroupId=io.grpc -DartifactId=protoc-gen-grpc-java -Dversion=1.26.0 -Dclassifier=linux-riscv64 -Dpackaging=exe -Dfile=%{SOURCE18}
|
||||
%endif
|
||||
mvn install:install-file -DgroupId=org.fusesource.leveldbjni -DartifactId=leveldbjni-all -Dversion=1.8 -Dpackaging=jar -Dfile=/usr/lib/java/leveldbjni-all.jar
|
||||
mvn install:install-file -DgroupId=org.fusesource.leveldbjni -DartifactId=leveldbjni -Dversion=1.8 -Dpackaging=jar -Dfile=/usr/lib/java/leveldbjni/leveldbjni.jar
|
||||
mvn install:install-file -DgroupId=org.iq80.leveldb -DartifactId=leveldb-api -Dversion=0.7 -Dpackaging=jar -Dfile=/usr/share/java/leveldb-java/leveldb-api.jar
|
||||
mvn install:install-file -DgroupId=org.iq80.leveldb -DartifactId=leveldb-benchmark -Dversion=0.7 -Dpackaging=jar -Dfile=/usr/share/java/leveldb-java/leveldb-benchmark.jar
|
||||
mvn install:install-file -DgroupId=org.iq80.leveldb -DartifactId=leveldb -Dversion=0.7 -Dpackaging=jar -Dfile=/usr/share/java/leveldb-java/leveldb.jar
|
||||
mvn install:install-file -DgroupId=orn.fusesource.hawtjni -DartifactId=hawtjni-runtime -Dversion=1.16 -Dpackaging=jar -Dfile=/usr/lib/java/hawtjni/hawtjni-runtime.jar
|
||||
|
||||
mkdir -p ${HOME}/repository/com/github/eirslett/node/12.22.1/
|
||||
cp %{SOURCE15} ${HOME}/repository/com/github/eirslett/node/12.22.1/
|
||||
cp %{SOURCE16} ${HOME}/repository/com/github/eirslett/node/12.22.1/
|
||||
mv ${HOME}/repository/com/github/eirslett/node/12.22.1/node-v12.22.1-linux-arm64.tar.gz ${HOME}/repository/com/github/eirslett/node/12.22.1/node-12.22.1-linux-arm64.tar.gz
|
||||
mkdir -p ${HOME}/repository/com/github/eirslett/yarn/1.22.5/
|
||||
cp %{SOURCE14} ${HOME}/repository/com/github/eirslett/yarn/1.22.5/
|
||||
mv ${HOME}/repository/com/github/eirslett/yarn/1.22.5/yarn-v1.22.5.tar.gz ${HOME}/repository/com/github/eirslett/yarn/1.22.5/yarn-1.22.5.tar.gz
|
||||
tar -xzvf ${HOME}/repository/com/github/eirslett/yarn/1.22.5/yarn-1.22.5.tar.gz -C ${HOME}/repository/com/github/eirslett/yarn/1.22.5/
|
||||
mkdir -p ${HOME}/.m2/repository/com/github/eirslett/node/12.22.1/
|
||||
cp %{SOURCE15} ${HOME}/.m2/repository/com/github/eirslett/node/12.22.1/
|
||||
cp %{SOURCE16} ${HOME}/.m2/repository/com/github/eirslett/node/12.22.1/
|
||||
mv ${HOME}/.m2/repository/com/github/eirslett/node/12.22.1/node-v12.22.1-linux-arm64.tar.gz ${HOME}/.m2/repository/com/github/eirslett/node/12.22.1/node-12.22.1-linux-arm64.tar.gz
|
||||
mkdir -p ${HOME}/.m2/repository/com/github/eirslett/yarn/1.22.5/
|
||||
cp %{SOURCE14} ${HOME}/.m2/repository/com/github/eirslett/yarn/1.22.5/
|
||||
mv ${HOME}/.m2/repository/com/github/eirslett/yarn/1.22.5/yarn-v1.22.5.tar.gz ${HOME}/.m2/repository/com/github/eirslett/yarn/1.22.5/yarn-1.22.5.tar.gz
|
||||
tar -xzvf ${HOME}/.m2/repository/com/github/eirslett/yarn/1.22.5/yarn-1.22.5.tar.gz -C ${HOME}/.m2/repository/com/github/eirslett/yarn/1.22.5/
|
||||
npm config set registry https://repo.huaweicloud.com/repository/npm/
|
||||
npm cache clean -f
|
||||
${HOME}/repository/com/github/eirslett/yarn/1.22.5/yarn-v1.22.5/bin/yarn config set registry https://repo.huaweicloud.com/repository/npm/ -g
|
||||
${HOME}/repository/com/github/eirslett/yarn/1.22.5/yarn-v1.22.5/bin/yarn config set ignore-engines true
|
||||
${HOME}/.m2/repository/com/github/eirslett/yarn/1.22.5/yarn-v1.22.5/bin/yarn config set registry https://repo.huaweicloud.com/repository/npm/ -g
|
||||
${HOME}/.m2/repository/com/github/eirslett/yarn/1.22.5/yarn-v1.22.5/bin/yarn config set ignore-engines true
|
||||
|
||||
%pom_add_dep org.iq80.leveldb:leveldb-api:0.7 hadoop-hdfs-project/hadoop-hdfs
|
||||
%pom_add_dep org.iq80.leveldb:leveldb-api:0.7 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-web-proxy
|
||||
@ -289,6 +295,9 @@ ${HOME}/repository/com/github/eirslett/yarn/1.22.5/yarn-v1.22.5/bin/yarn config
|
||||
%pom_disable_module hadoop-azure hadoop-tools
|
||||
%pom_disable_module hadoop-yarn-server-timelineservice-hbase-tests hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/pom.xml
|
||||
|
||||
%ifarch riscv64
|
||||
%pom_disable_module hadoop-yarn-applications-catalog-webapp hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/pom.xml
|
||||
%endif
|
||||
|
||||
# War files we don't want
|
||||
%mvn_package :%{name}-auth-examples __noinstall
|
||||
@ -325,7 +334,12 @@ ${HOME}/repository/com/github/eirslett/yarn/1.22.5/yarn-v1.22.5/bin/yarn config
|
||||
%mvn_file :%{name}-common::tests: %{name}/%{name}-common
|
||||
|
||||
%build
|
||||
mvn clean -Dsnappy.lib=/usr/lib64 -Dbundle.snappy -Dcontainer-executor.conf.dir=%{_sysconfdir}/%{name} -Pdist,native -DskipTests -DskipIT -Dmaven.javadoc.skip=true package -s settings.xml
|
||||
%ifarch riscv64
|
||||
export MAVEN_OPTS="-Xms2048M -Xmx8000M"
|
||||
function keepalive() { while true; do date; sleep 3600; done }
|
||||
keepalive &
|
||||
%endif
|
||||
mvn clean -Dsnappy.lib=/usr/lib64 -Dbundle.snappy -Dcontainer-executor.conf.dir=%{_sysconfdir}/%{name} -Pdist,native -DskipTests -DskipIT -Dmaven.javadoc.skip=true package
|
||||
|
||||
%install
|
||||
# Copy all jar files except those generated by the build
|
||||
@ -1145,6 +1159,11 @@ fi
|
||||
%config(noreplace) %{_sysconfdir}/%{name}/container-executor.cfg
|
||||
|
||||
%changelog
|
||||
* Sun May 12 2024 Dingli Zhang <dingli@iscas.ac.cn> - 3.3.6-3
|
||||
- Fix build on riscv64
|
||||
- Upgrade os-maven-plugin to 1.7.1
|
||||
- Remove settings.xml and use ${HOME}/.m2/repository as maven repo
|
||||
|
||||
* Fri Dec 15 2023 xiexing <xiexing4@hisilicon.com> - 3.3.6-2
|
||||
- add conflicts to hadoop spec
|
||||
|
||||
|
||||
BIN
protoc-3.7.1-linux-riscv64.exe
Normal file
BIN
protoc-3.7.1-linux-riscv64.exe
Normal file
Binary file not shown.
BIN
protoc-gen-grpc-java-1.26.0-linux-riscv_64.exe
Normal file
BIN
protoc-gen-grpc-java-1.26.0-linux-riscv_64.exe
Normal file
Binary file not shown.
22
settings.xml
22
settings.xml
@ -1,22 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<settings xmlns="http://maven.apache.org/SETTINGS/1.0.0"
|
||||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0 http://maven.apache.org/xsd/settings-1.0.0.xsd">
|
||||
|
||||
<localRepository>@HOME@/repository/</localRepository>
|
||||
<pluginGroups>
|
||||
</pluginGroups>
|
||||
<proxies>
|
||||
</proxies>
|
||||
<servers>
|
||||
</servers>
|
||||
<mirrors>
|
||||
<mirror>
|
||||
<id>huaweicloud</id>
|
||||
<mirrorOf>*</mirrorOf>
|
||||
<url>https://repo.huaweicloud.com/repository/maven/</url>
|
||||
</mirror>
|
||||
</mirrors>
|
||||
<profiles>
|
||||
</profiles>
|
||||
</settings>
|
||||
Loading…
x
Reference in New Issue
Block a user