From: Jakub Jelinek <jakub@redhat.com>
Date: Tue, 9 Jan 2024 08:54:06 +0000 (+0100)
Subject: libgomp: Use absolute pathname to testsuite/flock [PR113192]
X-Git-Tag: releases/gcc-13.3.0~401
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3ac307df305146a438988acbea2341829e8b7ad3;p=thirdparty%2Fgcc.git

libgomp: Use absolute pathname to testsuite/flock [PR113192]

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  <jakub@redhat.com>

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

(cherry picked from commit f2e967e0257bc8188840df236595e7218b6bf748)
---

diff --git a/libgomp/configure b/libgomp/configure
index ed18809ff1ce..404f7064fd0c 100755
--- a/libgomp/configure
+++ b/libgomp/configure
@@ -16550,7 +16550,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
diff --git a/libgomp/configure.ac b/libgomp/configure.ac
index cc96e5b753b4..de7e8159053f 100644
--- a/libgomp/configure.ac
+++ b/libgomp/configure.ac
@@ -343,7 +343,7 @@ AC_MSG_NOTICE([checking for flock implementation])
 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
 
 # Get target configury.