From 22a887960334d66dd3267d9907906a3baf002f1d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20B=C3=A9rat?= Date: Tue, 11 Oct 2022 09:06:59 +0200 Subject: [PATCH] Fix typo in variable name Cherry-pick upstream patch f460883035ef849a2248b1713f711292ec19f4f0 Fixes BZ#2132715 Reviewed-by: Carlos O'Donell --- ...CXX_EDITION_TRY-fix-typo-in-variable.patch | 31 +++++++++++++++++++ autoconf.spec | 8 ++++- 2 files changed, 38 insertions(+), 1 deletion(-) create mode 100644 0001-_AC_PROG_CXX_STDCXX_EDITION_TRY-fix-typo-in-variable.patch diff --git a/0001-_AC_PROG_CXX_STDCXX_EDITION_TRY-fix-typo-in-variable.patch b/0001-_AC_PROG_CXX_STDCXX_EDITION_TRY-fix-typo-in-variable.patch new file mode 100644 index 0000000..0a00c5b --- /dev/null +++ b/0001-_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.37.2 + diff --git a/autoconf.spec b/autoconf.spec index ffe9c5c..4fd3cde 100644 --- a/autoconf.spec +++ b/autoconf.spec @@ -6,13 +6,16 @@ Summary: A GNU tool for automatically configuring source code Name: autoconf Version: 2.71 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv2+ and GFDL Source0: https://ftp.gnu.org/gnu/autoconf/autoconf-%{version}.tar.xz Source1: config.site Source2: autoconf-init.el URL: https://www.gnu.org/software/autoconf/ +# Cherry-pick from upstream f460883035ef849a2248b1713f711292ec19f4f0 +Patch0: 0001-_AC_PROG_CXX_STDCXX_EDITION_TRY-fix-typo-in-variable.patch + BuildArch: noarch @@ -124,6 +127,9 @@ install -p -m 0644 %{SOURCE2} %{buildroot}%{_emacs_sitestartdir} %changelog +* Tue Oct 11 2022 Frederic Berat - 2.71-4 +- Cherry-pick: Fix typo in variable name (#2132715) + * Wed Jul 20 2022 Fedora Release Engineering - 2.71-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild