Open Build Service

_service:tar_scm_kernel_repo:autoconf.spec Changed

@@ -11,12 +11,14 @@
 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
 
-BuildRequires:  m4 perl perl-generators help2man gcc-c++
-Requires:       m4 perl
+BuildRequires:  m4 emacs perl perl-generators help2man gcc-c++
+Requires:       m4 emacs-filesystem perl
 Requires(post): info
 Requires(preun):info
 
@@ -33,7 +35,8 @@
 %autosetup -n %{name}-%{version} -p1
 
 %build
-%configure
+export EMACS=%{_bindir}/emacs
+%configure --with-lispdir=%{_emacs_sitelispdir}/autoconf
 %make_build
 
 %check
@@ -58,6 +61,7 @@
 %{_bindir}/*
 %{_datadir}/autoconf/
 %{_datadir}/config.site
+%{_datadir}/emacs/site-lisp/*
 %exclude %{_infodir}/standards*
 
 %files help
@@ -68,8 +72,11 @@
 
 
 %changelog
-* Mon Apr 11 2022 wulei <wulei80@h-partners.com> - 2.71-3
-- Delete emacs
+* Sat Oct 22 2022 yixiangzhike <yixiangzhike007@163.com> - 2.71-3
+- Type:bugfix
+- ID:NA
+- SUG:NA
+- DESC:Fix typo in variable name
 
 * Fri Dec 31 2021 wangjie <wangjie375@huawei.com> - 2.71-2
 - Type:enhancement

_service:tar_scm_kernel_repo:backport-_AC_PROG_CXX_STDCXX_EDITION_TRY-fix-typo-in-variable.patch Added

@@ -0,0 +1,31 @@
+From f460883035ef849a2248b1713f711292ec19f4f0 Mon Sep 17 00:00:00 2001
+From: Emanuele Giaquinta <emanuele.giaquinta@gmail.com>
+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: <YJ4TXAeJcvU0oSec@FSAPPLE2215.fi.f-secure.com>
+(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
+

_service Changed

Changes of Revision 5