|
From: Paul F. <pa...@so...> - 2023-04-16 12:29:07
|
https://sourceware.org/git/gitweb.cgi?p=valgrind.git;h=0bc69d40a5021b158804fb4f39592596333f7013 commit 0bc69d40a5021b158804fb4f39592596333f7013 Author: Paul Floyd <pj...@wa...> Date: Sun Apr 16 14:27:04 2023 +0200 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: --- configure.ac | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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.]) |