From patchwork Mon Aug 7 10:33:03 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Arsen_Arsenovi=C4=87?= X-Patchwork-Id: 131824 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:c44e:0:b0:3f2:4152:657d with SMTP id w14csp1383317vqr; Mon, 7 Aug 2023 04:35:58 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHXMVqYFgYwNG/cLcEk8O4VcUyWfG6jaKM+qgxh2gwLMLcP+8ELWIGCt3boqMwFGjPYGAiK X-Received: by 2002:a17:906:2009:b0:99c:bb4d:f59e with SMTP id 9-20020a170906200900b0099cbb4df59emr5295037ejo.63.1691408158116; Mon, 07 Aug 2023 04:35:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691408158; cv=none; d=google.com; s=arc-20160816; b=ynJOguvedJ+Gdk9W1/oPGq7fi9RwHPHurTs9CPhs3RedmDmgCww8Ht6aoJSluRo7rN ntVf8NOA+9MGysGBDcfRfqEnNaVM6O4sddhEmGuppfVc1GeivBotgwxXcoKJFr/pUDcx 3AjbjW6/CjzrpqlGj7DhWY1CC+SJmcfe95k40WXRvVP/oq5RnQmcn1fFXRojKhUAF8S9 8nNsaCs60SOmtL4vGma47JTU+05zYlu9P8HAIv4faOGj8BKhif67tHG9vxWPXKcF39rV DFtFR1xJf3Ynu/oXvjSk8C+jgBIoYQYqZriAvS+pGB1OSNgQvXMYQd6cQg40JlTP9ie3 Hzig== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:from:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:dmarc-filter:delivered-to :dkim-signature:dkim-filter; bh=/LJ22PIy3Uv2fNmvPyCoP33SUWVOPuYtCEkDxUtV6O8=; fh=LWKhc7NerQoFl9IBR8o10dF/eUIuDygKHK2T3P4dr7g=; b=p77F9iw/D9wEBxDzE6dPN7duddtFtdM/kh/kI2vpNdJfAb33ZPz9VnWl/aE5pL4+EX J06njB4bHKQBjzuZNKIPbd6v54tTGKXtE5GQ7B61K7+ve1RgxNxdk4m8tz7zUJnba6xp Ms2n7utPw0iTjLWJkZ7ovRDHT5wtvU8FWe2Em3GCZhdMHiFoHUa8w0D++RDP2vcijtd8 edJz2uhvz9AUZOWe5m/evkZ+oZSkPd0wHWmqBWVhA/BBXb9YdZw4Qb56Vr9a7t91EsmE HyyJ5JaBscQBADEfj480YpJ7kRjDgs553wo9fdvFNINUMQeZ0WOfBGhnpwOcEnBnUQou 5jnQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b="YzJ7CN/D"; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gnu.org Received: from server2.sourceware.org (ip-8-43-85-97.sourceware.org. [8.43.85.97]) by mx.google.com with ESMTPS id p7-20020a17090635c700b00991f1e4b041si5206061ejb.737.2023.08.07.04.35.57 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Aug 2023 04:35:58 -0700 (PDT) Received-SPF: pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) client-ip=8.43.85.97; Authentication-Results: mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b="YzJ7CN/D"; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gnu.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 91BF9385772C for ; Mon, 7 Aug 2023 11:26:38 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 91BF9385772C DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1691407598; bh=/LJ22PIy3Uv2fNmvPyCoP33SUWVOPuYtCEkDxUtV6O8=; h=To:Cc:Subject:Date:In-Reply-To:References:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From:Reply-To:From; b=YzJ7CN/Dn5XH9TXIbjWkZVrSLwBihGAh/m71oeGuQIfiJsLp+8BQE8ETXyLNBj4J1 C1+lB2tnX6P47IGkfs2Vqca7nuyrAscj+qV78N9v161UGKVCLASf9hjseLgyTtp6fA 0lxX7gn23g76xVny5UxU//9xvoPGt6w48/lOTybA= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mout-p-201.mailbox.org (mout-p-201.mailbox.org [80.241.56.171]) by sourceware.org (Postfix) with ESMTPS id B26583856DC0 for ; Mon, 7 Aug 2023 11:19:33 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org B26583856DC0 Received: from smtp102.mailbox.org (smtp102.mailbox.org [10.196.197.102]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-201.mailbox.org (Postfix) with ESMTPS id 4RKDNz1GlBz9sQ8; Mon, 7 Aug 2023 13:19:31 +0200 (CEST) To: gcc-patches@gcc.gnu.org Cc: "H.J. Lu" Subject: [PATCH 21/24] PKG_CHECK_MODULES: Properly check if $pkg_cv_[]$1[]_LIBS works Date: Mon, 7 Aug 2023 12:33:03 +0200 Message-ID: <20230807105935.2098236-22-arsen@aarsen.me> In-Reply-To: <20230807105935.2098236-1-arsen@aarsen.me> References: <20230807105935.2098236-1-arsen@aarsen.me> MIME-Version: 1.0 X-Spam-Status: No, score=-11.0 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_INFOUSMEBIZ, RCVD_IN_DNSWL_LOW, SPF_HELO_NONE, SPF_PASS, TXREP 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.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: =?utf-8?q?Arsen_Arsenovi=C4=87_via_Gcc-patches?= From: =?utf-8?q?Arsen_Arsenovi=C4=87?= Reply-To: =?utf-8?q?Arsen_Arsenovi=C4=87?= Errors-To: gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org Sender: "Gcc-patches" X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1773570000563404834 X-GMAIL-MSGID: 1773570000563404834 From: "H.J. Lu" There is no need to check $pkg_cv_[]$1[]_LIBS works if package check failed. config/ChangeLog: * pkg.m4 (PKG_CHECK_MODULES): Use AC_TRY_LINK only if $pkg_failed = no. --- config/pkg.m4 | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/config/pkg.m4 b/config/pkg.m4 index 45587e97c8b..7ebf517cd6a 100644 --- a/config/pkg.m4 +++ b/config/pkg.m4 @@ -148,10 +148,12 @@ _PKG_CONFIG([$1][_CFLAGS], [cflags], [$2]) _PKG_CONFIG([$1][_LIBS], [libs], [$2]) dnl Check whether $pkg_cv_[]$1[]_LIBS works. -pkg_save_LDFLAGS="$LDFLAGS" -LDFLAGS="$LDFLAGS $pkg_cv_[]$1[]_LIBS" -AC_TRY_LINK([],[return 0;], [pkg_failed=no], [pkg_failed=yes]) -LDFLAGS=$pkg_save_LDFLAGS +if test $pkg_failed = no; then + pkg_save_LDFLAGS="$LDFLAGS" + LDFLAGS="$LDFLAGS $pkg_cv_[]$1[]_LIBS" + AC_TRY_LINK([],[], [], [pkg_failed=yes]) + LDFLAGS=$pkg_save_LDFLAGS +fi m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS and $1[]_LIBS to avoid the need to call pkg-config.