From patchwork Tue Jan 9 09:01:08 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jakub Jelinek X-Patchwork-Id: 83599 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id E58AC385DC16 for ; Tue, 9 Jan 2024 09:02:15 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by sourceware.org (Postfix) with ESMTPS id 866173857C41 for ; Tue, 9 Jan 2024 09:01:13 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 866173857C41 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 866173857C41 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=170.10.133.124 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1704790884; cv=none; b=nn2mvHOgyqyDUf5FOk4MJBsL/lsrhvaM9s1IX7p5jxA16eRH5recT0EFqvIhale4LxhYC2o4sBGEsrhBxx0G4UjMiV6IjTBAMMb93xH8k3P32ttuULVH0vLl4M0nRjinI2oDoNoJhIE7lUuYQAr4afFozS9zz4UQ/txTAt0y97E= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1704790884; c=relaxed/simple; bh=udIjui/oVHVFi4EyXJqONVwh8Pmz0ru+qxl63EnQ2JU=; h=DKIM-Signature:Date:From:To:Subject:Message-ID:MIME-Version; b=unq3Vco7zXoupXIKYTCWVoKd07fpY4IcMnAfT08738IYqMgAV/TJ/JGcUSdEtVSnduDk3abeIom89o6OKeudWYEHTqYN6a9A6eRAmoWxlUKrZWjf7GWQlJiW8SaV63Vz+S2zoH3EPiVyH7SXt5dwvOb4jgYIiBag+jZa8mEEjKg= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1704790873; h=from:from:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type; bh=Af7bEtr3jia6kBnX57yC2GUFMDyOEFtl1DGPraPEFPc=; b=RUDkMVWsCuCZ6ICEGe3v05UtxrTzZBGC91wEptsp8xJNXNEeRePMMw0ahnrEeNyUAfg52Q BPy7U4kyd3PiXwo2WwMA3Wbi1np7QOMfwOHEJtCeGYCgz7tvifYxWneATVKRXqEGAAogOV L1jDattzr+yELacknFkpJ7M973+SaVc= Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-480-Lfy8rv3NM8uliEPpahTtUA-1; Tue, 09 Jan 2024 04:01:11 -0500 X-MC-Unique: Lfy8rv3NM8uliEPpahTtUA-1 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 87740380670B for ; Tue, 9 Jan 2024 09:01:11 +0000 (UTC) Received: from tucnak.zalov.cz (unknown [10.39.192.92]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 4C875492BC7 for ; Tue, 9 Jan 2024 09:01:11 +0000 (UTC) Received: from tucnak.zalov.cz (localhost [127.0.0.1]) by tucnak.zalov.cz (8.17.1/8.17.1) with ESMTPS id 409919MX1771710 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NOT) for ; Tue, 9 Jan 2024 10:01:09 +0100 Received: (from jakub@localhost) by tucnak.zalov.cz (8.17.1/8.17.1/Submit) id 409918ZU1771709 for gcc-patches@gcc.gnu.org; Tue, 9 Jan 2024 10:01:08 +0100 Date: Tue, 9 Jan 2024 10:01:08 +0100 From: Jakub Jelinek To: gcc-patches@gcc.gnu.org Subject: [committed] libgomp: Use absolute pathname to testsuite/flock [PR113192] Message-ID: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.9 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Disposition: inline X-Spam-Status: No, score=-4.9 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_NONE, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: Jakub Jelinek Errors-To: gcc-patches-bounces+patchwork=sourceware.org@gcc.gnu.org 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 PR libgomp/113192 * configure.ac (FLOCK): Use \$(abs_top_srcdir)/testsuite/flock rather than $srcdir/testsuite/flock. * configure: Regenerated. Jakub --- 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