From d3c1d1756f21a598627d2c26ec5970cabce9df9d Mon Sep 17 00:00:00 2001 From: yixiangzhike Date: Sat, 22 Oct 2022 14:55:22 +0800 Subject: [PATCH] fix typo in variable name Signed-off-by: yixiangzhike --- autoconf.spec | 10 +++++- ...CXX_EDITION_TRY-fix-typo-in-variable.patch | 31 +++++++++++++++++++ 2 files changed, 40 insertions(+), 1 deletion(-) create mode 100644 backport-_AC_PROG_CXX_STDCXX_EDITION_TRY-fix-typo-in-variable.patch diff --git a/autoconf.spec b/autoconf.spec index 2fb42b1..ccec31e 100644 --- a/autoconf.spec +++ b/autoconf.spec @@ -3,7 +3,7 @@ Name: autoconf Version: 2.71 -Release: 2 +Release: 3 Summary: An extensible package to automatically configure software source code packages License: GPLv2+ and GPLv3+ and GFDL-1.3-only URL: https://www.gnu.org/software/%{name}/ @@ -11,6 +11,8 @@ Source0: http://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.xz Source1: config.site Source2: autoconf-el.el +Patch1: backport-_AC_PROG_CXX_STDCXX_EDITION_TRY-fix-typo-in-variable.patch + Patch9000: skip-one-test-at-line-1616-of-autotest.patch BuildArch: noarch @@ -70,6 +72,12 @@ fi %changelog +* Sat Oct 22 2022 yixiangzhike - 2.71-3 +- Type:bugfix +- ID:NA +- SUG:NA +- DESC:Fix typo in variable name + * Thu Jul 28 2022 fuanan - 2.71-2 - Type:bugfix - ID:NA diff --git a/backport-_AC_PROG_CXX_STDCXX_EDITION_TRY-fix-typo-in-variable.patch b/backport-_AC_PROG_CXX_STDCXX_EDITION_TRY-fix-typo-in-variable.patch new file mode 100644 index 0000000..dcf9173 --- /dev/null +++ b/backport-_AC_PROG_CXX_STDCXX_EDITION_TRY-fix-typo-in-variable.patch @@ -0,0 +1,31 @@ +From f460883035ef849a2248b1713f711292ec19f4f0 Mon Sep 17 00:00:00 2001 +From: Emanuele Giaquinta +Date: Fri, 14 May 2021 09:06:20 +0300 +Subject: [PATCH] _AC_PROG_CXX_STDCXX_EDITION_TRY: fix typo in variable name + +The typo causes "ac_prog_cxx_stdcxx" to be always set to "cxx11", +regardless of whether the C++ compiler supports C++11. +Message-Id: +(tiny change) +--- + lib/autoconf/c.m4 | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/lib/autoconf/c.m4 b/lib/autoconf/c.m4 +index 9f881f0b..47434c89 100644 +--- a/lib/autoconf/c.m4 ++++ b/lib/autoconf/c.m4 +@@ -2749,8 +2749,8 @@ AC_DEFUN([_AC_PROG_CXX_STDCXX_EDITION_TRY], + [AC_REQUIRE([_AC_CXX_CXX$1_TEST_PROGRAM])]dnl + [AS_IF([test x$ac_prog_cxx_stdcxx = xno], + [AC_MSG_CHECKING([for $CXX option to enable C++$1 features]) +-AC_CACHE_VAL(ac_cv_prog_cxx_$1, +-[ac_cv_prog_cxx_$1=no ++AC_CACHE_VAL(ac_cv_prog_cxx_cxx$1, ++[ac_cv_prog_cxx_cxx$1=no + ac_save_CXX=$CXX + AC_LANG_CONFTEST([AC_LANG_DEFINES_PROVIDED][$][ac_cxx_conftest_cxx$1_program]) + for ac_arg in '' m4_normalize(m4_defn([_AC_CXX_CXX$1_OPTIONS])) +-- +2.27.0 + -- Gitee