!29 修复gcc12构建失败问题

From: @wenwj0 
Reviewed-by: @macchen1 
Signed-off-by: @macchen1
This commit is contained in:
openeuler-ci-bot 2023-07-24 02:02:30 +00:00 committed by Gitee
commit 7b87c97646
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 15 additions and 1 deletions

View File

@ -0,0 +1,10 @@
--- hadoop-3.1.4-src/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-nativetask/src/CMakeLists.txt 2020-07-21 01:17:58.000000000 +0800
+++ hadoop-3.1.4-src/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-nativetask/src/CMakeLists.txt 2023-07-21 16:33:10.948752821 +0800
@@ -27,6 +27,7 @@
# Add extra compiler and linker flags.
# -Wno-sign-compare
hadoop_add_compiler_flags("-DNDEBUG -DSIMPLE_MEMCPY -fno-strict-aliasing -fsigned-char")
+set(CMAKE_CXX_STANDARD 11)
# Source location.
set(SRC main/native)

View File

@ -12,7 +12,7 @@
%define _binaries_in_noarch_packages_terminate_build 0 %define _binaries_in_noarch_packages_terminate_build 0
Name: hadoop-3.1 Name: hadoop-3.1
Version: 3.1.4 Version: 3.1.4
Release: 5 Release: 6
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
@ -35,6 +35,7 @@ Source13: %{real_name}-yarn-site.xml
Patch1: 0001-sys_errlist-undeclared.patch Patch1: 0001-sys_errlist-undeclared.patch
Patch2: 0002-bugfix-invalid-variable-name.patch Patch2: 0002-bugfix-invalid-variable-name.patch
Patch3: 0003-compatible-with-gcc12.patch
BuildRoot: %{_tmppath}/%{real_name}-%{version}-%{release}-root BuildRoot: %{_tmppath}/%{real_name}-%{version}-%{release}-root
@ -1113,6 +1114,9 @@ fi
%config(noreplace) %{_sysconfdir}/%{real_name}/container-executor.cfg %config(noreplace) %{_sysconfdir}/%{real_name}/container-executor.cfg
%changelog %changelog
* Fri Jul 21 2023 wenweijian <wenweijian2@huawei.com> - 3.1.4-6
- compatiable with gcc12
* Wed Jun 15 2022 Chenyx <chenyixiong3@huawei.com> - 3.1.4-5 * Wed Jun 15 2022 Chenyx <chenyixiong3@huawei.com> - 3.1.4-5
- License compliance rectification - License compliance rectification