Hi!

When flock program doesn't exist, libgomp configure attempts to
offer a fallback version using a perl script, but we weren't using
absolute filename to that, so it apparently failed to work correctly.

The following patch arranges for it to get the absolute filename.

Tested by John David in the PR.

2024-01-09  Jakub Jelinek  <ja...@redhat.com>

        PR libgomp/113192
        * configure.ac (FLOCK): Use \$(abs_top_srcdir)/testsuite/flock
        rather than $srcdir/testsuite/flock.
        * configure: Regenerated.

--- libgomp/configure.ac.jj     2023-11-02 07:49:21.693801244 +0100
+++ libgomp/configure.ac        2024-01-08 21:46:21.014765685 +0100
@@ -343,7 +343,7 @@ AX_COUNT_CPUS
 AC_CHECK_PROGS(FLOCK, flock)
 # Fallback if 'perl' is available.
 if test -z "$FLOCK"; then
-  AC_CHECK_PROG(FLOCK, perl, $srcdir/testsuite/flock)
+  AC_CHECK_PROG(FLOCK, perl, \$(abs_top_srcdir)/testsuite/flock)
 fi
 
 AC_SUBST(SYSROOT_CFLAGS_FOR_TARGET)
--- libgomp/configure.jj        2024-01-06 02:29:24.566795886 +0100
+++ libgomp/configure   2024-01-08 21:46:23.799726387 +0100
@@ -16655,7 +16655,7 @@ do
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_FLOCK="$srcdir/testsuite/flock"
+    ac_cv_prog_FLOCK="\$(abs_top_srcdir)/testsuite/flock"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" 
>&5
     break 2
   fi

        Jakub

Reply via email to