From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-il1-x143.google.com (mail-il1-x143.google.com [IPv6:2607:f8b0:4864:20::143]) by sourceware.org (Postfix) with ESMTPS id 4786C3857C52; Tue, 28 Jul 2020 13:28:02 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 4786C3857C52 Received: by mail-il1-x143.google.com with SMTP id b18so10929096ilo.12; Tue, 28 Jul 2020 06:28:02 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=MVJiICy+rTgx0yGA3XloKtQ57zI5AwD91x/XNcy8pmw=; b=OomFzxngXHw4vNYqiXIIMA9E6OI0yLQoITo2CCol+rOae8olqLT1wD9jgtQXHC59Ad dJCpYjJjvXnDL7Z+ZnhxJzLDeReFjr5Tnu11IH3gWHRVqR2bLn9pu6CDKsheBUKfGXpp 6ckGyndzYkqr7Bzfk9hfd2CAJy1HWWsgxki22ylz3F7FbCo3sLjvPOCvozD2erSvLzAq dN1bzfTUu+43CvTg0OZ97374Spy4ulHD/SmG5zyEw243qGgSI2eeFIiJ96+YyuE9Rvkf rUTIt3LRb7Ef1IMNLG192rGwllika0qaFSwaET2wym4+TdbOGs/K/faheEf7tAt25dCo Nw9Q== X-Gm-Message-State: AOAM5318ROmjlUuLv7u0VnyvRDtla0zn1Z9uD/APtYenxRVq4EEthrhH 4BfwhCxkL+yTupViAqryPArrOEYQrfJG47kQP3s= X-Google-Smtp-Source: ABdhPJxMxaLhB8854TgvLE6dRk/5pbo42dAyxYQ0y8wD01dOhNPm3SlvqqERTOnL7sKIhMTU0BRVHcvbzgZA9U51qKo= X-Received: by 2002:a92:874a:: with SMTP id d10mr29307051ilm.273.1595942881659; Tue, 28 Jul 2020 06:28:01 -0700 (PDT) MIME-Version: 1.0 References: <20200502022903.175852-1-amerey@redhat.com> <3d9da16939fa6b503188033b56d30531e03d5d2a.camel@redhat.com> <87a72ino27.fsf@tromey.com> <64517fee-8b8f-84b2-a116-c3d146ff1119@simark.ca> <87eep4hp3s.fsf@tromey.com> In-Reply-To: From: "H.J. Lu" Date: Tue, 28 Jul 2020 06:27:25 -0700 Message-ID: Subject: [PATCH] PKG_CHECK_MODULES: Properly check if $pkg_cv_[]$1[]_LIBS works To: Mark Wielaard Cc: Aaron Merey , Simon Marchi , Tom Tromey , GCC Patches , Aaron Merey via Binutils , GDB Content-Type: multipart/mixed; boundary="0000000000008b943605ab806874" X-Spam-Status: No, score=-8.6 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_FROM, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 28 Jul 2020 13:28:03 -0000 --0000000000008b943605ab806874 Content-Type: text/plain; charset="UTF-8" On Tue, Jul 28, 2020 at 5:54 AM Mark Wielaard wrote: > > Hi, > > On Mon, 2020-07-27 at 12:32 -0700, H.J. Lu via Binutils wrote: > > diff --git a/config/pkg.m4 b/config/pkg.m4 > > index 13a8890178..45587e97c8 100644 > > --- a/config/pkg.m4 > > +++ b/config/pkg.m4 > > @@ -147,6 +147,12 @@ AC_MSG_CHECKING([for $2]) > > _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 > > + > > m4_define([_PKG_TEXT], [Alternatively, you may set the environment > > variables $1[]_CFLAGS > > and $1[]_LIBS to avoid the need to call pkg-config. > > See the pkg-config man page for more details.]) > > This hunk seems wrong. You are testing whether the $pkg_cv_[]$1[]_LIBS > flags work, but they might be empty if the library wasn't found > (pkg_failed=yes). Then the AC_TRY_LINK will obviously succeed, and then > you set pkg_failed=no. But that indicates that the library was found. > This fixes it. Thanks. -- H.J. --0000000000008b943605ab806874 Content-Type: text/x-patch; charset="US-ASCII"; name="0001-PKG_CHECK_MODULES-Properly-check-if-pkg_cv_-1-_LIBS-.patch" Content-Disposition: attachment; filename="0001-PKG_CHECK_MODULES-Properly-check-if-pkg_cv_-1-_LIBS-.patch" Content-Transfer-Encoding: base64 Content-ID: X-Attachment-Id: f_kd5z520k0 RnJvbSBjZDYzZmI4OTg1MTdjZWRmMzM2Njg3MWY1NDYzNzVjZjVlMjVjNzM0IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiAiSC5KLiBMdSIgPGhqbC50b29sc0BnbWFpbC5jb20+CkRhdGU6 IFR1ZSwgMjggSnVsIDIwMjAgMDY6MTg6NTAgLTA3MDAKU3ViamVjdDogW1BBVENIXSBQS0dfQ0hF Q0tfTU9EVUxFUzogUHJvcGVybHkgY2hlY2sgaWYgJHBrZ19jdl9bXSQxW11fTElCUwogd29ya3MK ClRoZXJlIGlzIG5vIG5lZWQgdG8gY2hlY2sgJHBrZ19jdl9bXSQxW11fTElCUyB3b3JrcyBpZiBw YWNrYWdlIGNoZWNrCmZhaWxlZC4KCmNvbmZpZy8KCglQUiBiaW51dGlscy8yNjMwMQoJKiBwa2cu bTQgKFBLR19DSEVDS19NT0RVTEVTKTogVXNlIEFDX1RSWV9MSU5LIG9ubHkgaWYKCSRwa2dfZmFp bGVkID0gbm8uCgpiaW51dGlscy8KCglQUiBiaW51dGlscy8yNjMwMQoJKiBjb25maWd1cmU6IFJl Z2VuZXJhdGVkLgoKZ2RiLwoKCVBSIGJpbnV0aWxzLzI2MzAxCgkqIGNvbmZpZ3VyZTogUmVnZW5l cmF0ZWQuCi0tLQogYmludXRpbHMvY29uZmlndXJlIHwgMTQgKysrKysrKystLS0tLS0KIGNvbmZp Zy9wa2cubTQgICAgICB8IDEwICsrKysrKy0tLS0KIGdkYi9jb25maWd1cmUgICAgICB8IDE0ICsr KysrKysrLS0tLS0tCiAzIGZpbGVzIGNoYW5nZWQsIDIyIGluc2VydGlvbnMoKyksIDE2IGRlbGV0 aW9ucygtKQoKZGlmZiAtLWdpdCBhL2JpbnV0aWxzL2NvbmZpZ3VyZSBiL2JpbnV0aWxzL2NvbmZp Z3VyZQppbmRleCA0NjIwYTZiMTA1Li4xODMxNmI3Njk2IDEwMDc1NQotLS0gYS9iaW51dGlscy9j b25maWd1cmUKKysrIGIvYmludXRpbHMvY29uZmlndXJlCkBAIC0xMjQzOSwyNyArMTI0MzksMjkg QEAgZmkKICAgICBwa2dfZmFpbGVkPXVudHJpZWQKIGZpCiAKLXBrZ19zYXZlX0xERkxBR1M9IiRM REZMQUdTIgotTERGTEFHUz0iJExERkxBR1MgJHBrZ19jdl9ERUJVR0lORk9EX0xJQlMiCi1jYXQg Y29uZmRlZnMuaCAtIDw8X0FDRU9GID5jb25mdGVzdC4kYWNfZXh0CitpZiB0ZXN0ICRwa2dfZmFp bGVkID0gbm87IHRoZW4KKyAgcGtnX3NhdmVfTERGTEFHUz0iJExERkxBR1MiCisgIExERkxBR1M9 IiRMREZMQUdTICRwa2dfY3ZfREVCVUdJTkZPRF9MSUJTIgorICBjYXQgY29uZmRlZnMuaCAtIDw8 X0FDRU9GID5jb25mdGVzdC4kYWNfZXh0CiAvKiBlbmQgY29uZmRlZnMuaC4gICovCiAKIGludAog bWFpbiAoKQogewotcmV0dXJuIDA7CisKICAgOwogICByZXR1cm4gMDsKIH0KIF9BQ0VPRgogaWYg YWNfZm5fY190cnlfbGluayAiJExJTkVOTyI7IHRoZW4gOgotICBwa2dfZmFpbGVkPW5vCisKIGVs c2UKICAgcGtnX2ZhaWxlZD15ZXMKIGZpCiBybSAtZiBjb3JlIGNvbmZ0ZXN0LmVyciBjb25mdGVz dC4kYWNfb2JqZXh0IFwKICAgICBjb25mdGVzdCRhY19leGVleHQgY29uZnRlc3QuJGFjX2V4dAot TERGTEFHUz0kcGtnX3NhdmVfTERGTEFHUworICBMREZMQUdTPSRwa2dfc2F2ZV9MREZMQUdTCitm aQogCiAKIApkaWZmIC0tZ2l0IGEvY29uZmlnL3BrZy5tNCBiL2NvbmZpZy9wa2cubTQKaW5kZXgg NDU1ODdlOTdjOC4uN2ViZjUxN2NkNiAxMDA2NDQKLS0tIGEvY29uZmlnL3BrZy5tNAorKysgYi9j b25maWcvcGtnLm00CkBAIC0xNDgsMTAgKzE0OCwxMiBAQCBfUEtHX0NPTkZJRyhbJDFdW19DRkxB R1NdLCBbY2ZsYWdzXSwgWyQyXSkKIF9QS0dfQ09ORklHKFskMV1bX0xJQlNdLCBbbGlic10sIFsk Ml0pCiAKIGRubCBDaGVjayB3aGV0aGVyICRwa2dfY3ZfW10kMVtdX0xJQlMgd29ya3MuCi1wa2df c2F2ZV9MREZMQUdTPSIkTERGTEFHUyIKLUxERkxBR1M9IiRMREZMQUdTICRwa2dfY3ZfW10kMVtd X0xJQlMiCi1BQ19UUllfTElOSyhbXSxbcmV0dXJuIDA7XSwgW3BrZ19mYWlsZWQ9bm9dLCBbcGtn X2ZhaWxlZD15ZXNdKQotTERGTEFHUz0kcGtnX3NhdmVfTERGTEFHUworaWYgdGVzdCAkcGtnX2Zh aWxlZCA9IG5vOyB0aGVuCisgIHBrZ19zYXZlX0xERkxBR1M9IiRMREZMQUdTIgorICBMREZMQUdT PSIkTERGTEFHUyAkcGtnX2N2X1tdJDFbXV9MSUJTIgorICBBQ19UUllfTElOSyhbXSxbXSwgW10s IFtwa2dfZmFpbGVkPXllc10pCisgIExERkxBR1M9JHBrZ19zYXZlX0xERkxBR1MKK2ZpCiAKIG00 X2RlZmluZShbX1BLR19URVhUXSwgW0FsdGVybmF0aXZlbHksIHlvdSBtYXkgc2V0IHRoZSBlbnZp cm9ubWVudCB2YXJpYWJsZXMgJDFbXV9DRkxBR1MKIGFuZCAkMVtdX0xJQlMgdG8gYXZvaWQgdGhl IG5lZWQgdG8gY2FsbCBwa2ctY29uZmlnLgpkaWZmIC0tZ2l0IGEvZ2RiL2NvbmZpZ3VyZSBiL2dk Yi9jb25maWd1cmUKaW5kZXggZWIzOGFhYWNmYy4uNWVmODVlOGM4NiAxMDA3NTUKLS0tIGEvZ2Ri L2NvbmZpZ3VyZQorKysgYi9nZGIvY29uZmlndXJlCkBAIC03MDM3LDI3ICs3MDM3LDI5IEBAIGZp CiAgICAgcGtnX2ZhaWxlZD11bnRyaWVkCiBmaQogCi1wa2dfc2F2ZV9MREZMQUdTPSIkTERGTEFH UyIKLUxERkxBR1M9IiRMREZMQUdTICRwa2dfY3ZfREVCVUdJTkZPRF9MSUJTIgotY2F0IGNvbmZk ZWZzLmggLSA8PF9BQ0VPRiA+Y29uZnRlc3QuJGFjX2V4dAoraWYgdGVzdCAkcGtnX2ZhaWxlZCA9 IG5vOyB0aGVuCisgIHBrZ19zYXZlX0xERkxBR1M9IiRMREZMQUdTIgorICBMREZMQUdTPSIkTERG TEFHUyAkcGtnX2N2X0RFQlVHSU5GT0RfTElCUyIKKyAgY2F0IGNvbmZkZWZzLmggLSA8PF9BQ0VP RiA+Y29uZnRlc3QuJGFjX2V4dAogLyogZW5kIGNvbmZkZWZzLmguICAqLwogCiBpbnQKIG1haW4g KCkKIHsKLXJldHVybiAwOworCiAgIDsKICAgcmV0dXJuIDA7CiB9CiBfQUNFT0YKIGlmIGFjX2Zu X2NfdHJ5X2xpbmsgIiRMSU5FTk8iOyB0aGVuIDoKLSAgcGtnX2ZhaWxlZD1ubworCiBlbHNlCiAg IHBrZ19mYWlsZWQ9eWVzCiBmaQogcm0gLWYgY29yZSBjb25mdGVzdC5lcnIgY29uZnRlc3QuJGFj X29iamV4dCBcCiAgICAgY29uZnRlc3QkYWNfZXhlZXh0IGNvbmZ0ZXN0LiRhY19leHQKLUxERkxB R1M9JHBrZ19zYXZlX0xERkxBR1MKKyAgTERGTEFHUz0kcGtnX3NhdmVfTERGTEFHUworZmkKIAog CiAKLS0gCjIuMjYuMgoK --0000000000008b943605ab806874--