packages/erlang
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!12 fix build error for autoconf 2.71

Browse Source 
Merge pull request !12 from wk333/openEuler-22.03-LTS-Next
This commit is contained in:
openeuler-ci-bot 2022-01-11 02:03:23 +00:00 committed by Gitee
commit 912d5aceab
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 70 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
erlang.spec
View File

@ -11,7 +11,7 @@
%global __with_wxwidgets 1
Name: erlang
Version: 21.3.3
Release: 3
Release: 4
Summary: General-purpose programming language and runtime environment
License: ASL 2.0
URL: https://www.erlang.org
@ -32,6 +32,7 @@ Patch8: otp-0008-Avoid-forking-sed-to-get-basename.patch
Patch9: otp-0009-Load-man-pages-from-system-wide-directory.patch
Patch10: otp-0010-Improve-nodes-querying.patch
Patch11: extern-ei-default-socket-callbacks.patch
Patch12: fix-build-error-for-autoconf-2.71.patch
BuildRequires: gcc gcc-c++ flex
%if %{with doc}
%if 0%{?need_bootstrap} < 1
@ -1724,6 +1725,9 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \
%endif
%changelog
* Mon Jan 10 2022 wangkai <wangkai385@huawei.com> - 21.3.3-4
- fix build error for autoconf 2.71
* Fri Jul 30 2021 liping <liping136@huawei.com> - 21.3.3-3
- Support parallel compilation

65
fix-build-error-for-autoconf-2.71.patch Normal file
View File

@ -0,0 +1,65 @@
From c5b04efb55304a7c6f569c33c8e5875a32877f31 Mon Sep 17 00:00:00 2001
From: Rickard Green <rickard@erlang.org>
Date: Mon, 21 Dec 2020 17:13:27 +0100
Subject: [PATCH] Fix uses of AC_CONFIG_AUX_DIRS() in configure scripts
---
lib/megaco/configure.in | 7 +------
lib/odbc/configure.in | 7 +------
lib/snmp/configure.in | 7 +------
3 files changed, 6 insertions(+), 26 deletions(-)
diff --git a/lib/megaco/configure.in b/lib/megaco/configure.in
index bf22776ae01..789fbbed043 100644
--- a/lib/megaco/configure.in
+++ b/lib/megaco/configure.in
@@ -25,12 +25,7 @@ dnl define([AC_CACHE_SAVE], )dnl
AC_INIT(vsn.mk)
-if test -z "$ERL_TOP" || test ! -d $ERL_TOP ; then
- AC_CONFIG_AUX_DIRS(autoconf)
-else
- erl_top=${ERL_TOP}
- AC_CONFIG_AUX_DIRS($erl_top/erts/autoconf)
-fi
+AC_CONFIG_AUX_DIRS(${ERL_TOP}/erts/autoconf)
if test "X$host" != "Xfree_source" -a "X$host" != "Xwin32"; then
AC_CANONICAL_HOST
diff --git a/lib/odbc/configure.in b/lib/odbc/configure.in
index f13cd8c901c..7b02f0d4dfa 100644
--- a/lib/odbc/configure.in
+++ b/lib/odbc/configure.in
@@ -25,12 +25,7 @@ dnl define([AC_CACHE_SAVE], )dnl
dnl Process this file with autoconf to produce a configure script.
AC_INIT(c_src/odbcserver.c)
-if test -z "$ERL_TOP" || test ! -d $ERL_TOP ; then
- AC_CONFIG_AUX_DIRS(autoconf)
-else
- erl_top=${ERL_TOP}
- AC_CONFIG_AUX_DIRS($erl_top/erts/autoconf)
-fi
+AC_CONFIG_AUX_DIRS(${ERL_TOP}/erts/autoconf)
if test "X$host" != "Xfree_source" -a "X$host" != "Xwin32"; then
AC_CANONICAL_HOST
diff --git a/lib/snmp/configure.in b/lib/snmp/configure.in
index f9ca8f9ac47..bac042ccca5 100644
--- a/lib/snmp/configure.in
+++ b/lib/snmp/configure.in
@@ -4,12 +4,7 @@ define([AC_CACHE_SAVE], )dnl
AC_INIT(vsn.mk)
-if test -z "$ERL_TOP" || test ! -d $ERL_TOP ; then
- AC_CONFIG_AUX_DIRS(autoconf)
-else
- erl_top=${ERL_TOP}
- AC_CONFIG_AUX_DIRS($erl_top/erts/autoconf)
-fi
+AC_CONFIG_AUX_DIRS(${ERL_TOP}/erts/autoconf)
if test "X$host" != "Xfree_source" -a "X$host" != "Xwin32"; then
AC_CANONICAL_HOST