From: Paul Floyd <pjfloyd@wanadoo.fr>
Date: Sun, 16 Apr 2023 12:27:04 +0000 (+0200)
Subject: illunmos: fix configure scf_handle_bind check
X-Git-Tag: VALGRIND_3_21_0~52
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0bc69d40a5021b158804fb4f39592596333f7013;p=thirdparty%2Fvalgrind.git

illunmos: fix configure scf_handle_bind check

Migration to GCC 10 changes to 64bit load, see
https://github.com/omniosorg/omnios-extra/blob/master/build/valgrind/patches/libscf.patch
---

diff --git a/configure.ac b/configure.ac
index a886d0deaa..a439ec85d9 100755
--- a/configure.ac
+++ b/configure.ac
@@ -4513,11 +4513,11 @@ if test "X$VGCONF_ARCH_PRI" = "Xamd64"; then
 else
   libscf=/usr/lib/libscf.so.1
 fi
-if ! $DIS_PATH -F scf_handle_bind $libscf  | grep -q 0x526570; then
+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  | sed -n 's/.*0x526570\(..\).*/\1/p' )
+hex=$( $DIS_PATH -F scf_handle_bind $libscf  | perl -pe '($_) = /0x(?:4d01)?526570(\d{2}),/' )
 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.])