From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2181) id 21CC9385780D; Tue, 19 Apr 2022 10:59:11 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 21CC9385780D MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Jonathan Wakely To: gcc-cvs@gcc.gnu.org, libstdc++-cvs@gcc.gnu.org Subject: [gcc r12-8191] libstdc++: Fix syntax error in libbacktrace configuration X-Act-Checkin: gcc X-Git-Author: Jonathan Wakely X-Git-Refname: refs/heads/master X-Git-Oldrev: 3f7c81ef14815bbb94f215d908dbd406c35c45d0 X-Git-Newrev: a2a7da1a055c98d9b4578151f273e0e7572aa605 Message-Id: <20220419105911.21CC9385780D@sourceware.org> Date: Tue, 19 Apr 2022 10:59:11 +0000 (GMT) X-BeenThere: gcc-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 19 Apr 2022 10:59:11 -0000 https://gcc.gnu.org/g:a2a7da1a055c98d9b4578151f273e0e7572aa605 commit r12-8191-ga2a7da1a055c98d9b4578151f273e0e7572aa605 Author: Jonathan Wakely Date: Tue Apr 19 09:55:30 2022 +0100 libstdc++: Fix syntax error in libbacktrace configuration Using == instead of = causes a configuration error with dash as the shell: checking whether to build libbacktrace support... /home/devel/building/work/src/gcc-12-20220417/libstdc++-v3/configure: 77471: test: auto: unexpected operator /home/devel/building/work/src/gcc-12-20220417/libstdc++-v3/configure: 77474: test: auto: unexpected operator auto This means we fail to change the value from "auto" to "no" and so this test passes: GLIBCXX_CONDITIONAL(ENABLE_BACKTRACE, [test "$enable_libstdcxx_backtrace" != no]) This leads to the libbacktrace directory being included in the build without being configured properly, and bootstrap fails. libstdc++-v3/ChangeLog: * acinclude.m4 (GLIBCXX_ENABLE_BACKTRACE): Fix shell operators. * configure: Regenerate. Diff: --- libstdc++-v3/acinclude.m4 | 6 +++--- libstdc++-v3/configure | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/libstdc++-v3/acinclude.m4 b/libstdc++-v3/acinclude.m4 index 6aece2adff8..138bd58d86c 100644 --- a/libstdc++-v3/acinclude.m4 +++ b/libstdc++-v3/acinclude.m4 @@ -5007,10 +5007,10 @@ esac BACKTRACE_CPPFLAGS="$BACKTRACE_CPPFLAGS -DBACKTRACE_ELF_SIZE=$elfsize" AC_MSG_CHECKING([whether to build libbacktrace support]) - if test "$enable_libstdcxx_backtrace" == "auto"; then + if test "$enable_libstdcxx_backtrace" = "auto"; then enable_libstdcxx_backtrace=no fi - if test "$enable_libstdcxx_backtrace" == "yes"; then + if test "$enable_libstdcxx_backtrace" = "yes"; then BACKTRACE_SUPPORTED=1 AC_CHECK_HEADERS(sys/mman.h) @@ -5057,7 +5057,7 @@ BACKTRACE_CPPFLAGS="$BACKTRACE_CPPFLAGS -DBACKTRACE_ELF_SIZE=$elfsize" BACKTRACE_SUPPORTS_THREADS=0 fi AC_MSG_RESULT($enable_libstdcxx_backtrace) - GLIBCXX_CONDITIONAL(ENABLE_BACKTRACE, [test "$enable_libstdcxx_backtrace" != no]) + GLIBCXX_CONDITIONAL(ENABLE_BACKTRACE, [test "$enable_libstdcxx_backtrace" = yes]) ]) # Macros from the top-level gcc directory. diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure index 7a0ac405331..9b94fd71e42 100755 --- a/libstdc++-v3/configure +++ b/libstdc++-v3/configure @@ -77468,10 +77468,10 @@ BACKTRACE_CPPFLAGS="$BACKTRACE_CPPFLAGS -DBACKTRACE_ELF_SIZE=$elfsize" { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build libbacktrace support" >&5 $as_echo_n "checking whether to build libbacktrace support... " >&6; } - if test "$enable_libstdcxx_backtrace" == "auto"; then + if test "$enable_libstdcxx_backtrace" = "auto"; then enable_libstdcxx_backtrace=no fi - if test "$enable_libstdcxx_backtrace" == "yes"; then + if test "$enable_libstdcxx_backtrace" = "yes"; then BACKTRACE_SUPPORTED=1 for ac_header in sys/mman.h @@ -78563,7 +78563,7 @@ else fi - if test "$enable_libstdcxx_backtrace" != no; then + if test "$enable_libstdcxx_backtrace" = yes; then ENABLE_BACKTRACE_TRUE= ENABLE_BACKTRACE_FALSE='#' else