From: Paul Floyd <pjfloyd@wanadoo.fr>
Date: Thu, 17 Aug 2023 20:05:47 +0000 (+0200)
Subject: Bug 472963 - Broken regular expression in configure.ac
X-Git-Tag: VALGRIND_3_22_0~131
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=991bf3789a828e60c24776a1cd2f8271255596bc;p=thirdparty%2Fvalgrind.git

Bug 472963 - Broken regular expression in configure.ac

Was extracting the last two decimal digits from a hex humber.

I switched to using grep and sed because the proposed solution
didn't work on Solaris 11.3.
---

diff --git a/NEWS b/NEWS
index 055dc41945..56f4701e00 100644
--- a/NEWS
+++ b/NEWS
@@ -47,6 +47,7 @@ are not entered into bugzilla tend to get forgotten about or ignored.
 470978  s390x: Valgrind cannot start qemu-kvm when "sysctl vm.allocate_pgste=0"
 471807  Add support for lazy reading and downloading of DWARF debuginfo
 472219  Syscall param ppoll(ufds.events) points to uninitialised byte(s)
+472963  Broken regular expression in configure.ac
 
 To see details of a given bug, visit
   https://bugs.kde.org/show_bug.cgi?id=XXXXXX
diff --git a/configure.ac b/configure.ac
index b4e9c11428..913e8e8c5d 100755
--- a/configure.ac
+++ b/configure.ac
@@ -4552,7 +4552,7 @@ if ! $DIS_PATH -F scf_handle_bind $libscf  | grep -q -E '0x(4d01)?526570'; then
   AC_MSG_WARN([Function `scf_handle_bind' does not contain repository cache protocol version.])
   AC_MSG_ERROR([Cannot determine version of the repository cache protocol.])
 fi
-hex=$( $DIS_PATH -F scf_handle_bind $libscf  | perl -pe '($_) = /0x(?:4d01)?526570(\d{2}),/' )
+hex=$( $DIS_PATH -F scf_handle_bind $libscf  | grep 526570 | sed 's/.*526570//;s/,.*//' )
 if test -z "$hex"; then
   AC_MSG_WARN([Version of the repository cache protocol is empty?!])
   AC_MSG_ERROR([Cannot determine version of the repository cache protocol.])