From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 4FA70C433EF for ; Tue, 19 Jul 2022 18:38:58 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 8B55984044; Tue, 19 Jul 2022 20:38:55 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="OtaBBCVH"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 3369583FEE; Tue, 19 Jul 2022 20:38:54 +0200 (CEST) Received: from mail-ej1-x62f.google.com (mail-ej1-x62f.google.com [IPv6:2a00:1450:4864:20::62f]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 15D228403C for ; Tue, 19 Jul 2022 20:38:52 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=heiko.thiery@gmail.com Received: by mail-ej1-x62f.google.com with SMTP id oy13so28778486ejb.1 for ; Tue, 19 Jul 2022 11:38:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=WgnRCbQ4u4Ae02ZegUuqApOfUBZKaxPzOxU9TxP5drg=; b=OtaBBCVHp9VJJd20sZOH9uf1oxUu5OBBdhtMCIjdru52l+cbW0sm/74mX88TW2KpVz rtk3+K0PCoJWmC7zimDP0cLBp2q8AillxCrvlnUtRsZfwHmWDTr6pKozz+Xx2XhW8mh2 lfbP8Z70FFDB+qlP+thFRNHOGq80QXNE4HmkNW4zwkZk9y/r5IWrneGfS9L/jTqvZCH2 lb9jyyIzuzF99vUXt6cYPqSejteYaO+VR4rpjWccB51tro3Wp2T6S+zGz1/A9I6S2mPF kEw59Po9LE5husadvs0ARYje8ixFyj4GIrcbWEB8t9y7KkOMRt7aNvtf4y9p4xe8yDqK TmqA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=WgnRCbQ4u4Ae02ZegUuqApOfUBZKaxPzOxU9TxP5drg=; b=jLyHzbkeq3hvfVS9UI+kT6jsnb7OIIXMtOyqGAuXMjsg9D5SIQjjTLBd/jsMdnOLWn zp4G4Xx9+ZM/nqyag8G/BjqpQBOWqvq5Inh7ehAVmitFaSGkmqPb8yF2A6ZTEPSPoLUw TwCRC82MKnet/a2kFVSJsGYLiPal8egsde51DKkCdAUS5fj4gXIDPEKm3/1vAHq3kmmF Zwzx1mmDBWQ2dvS4JasdzqfCrOXit0kdHu5Odph7Tcl9Xu2wsdS7l2KZtW795pMBiOmp 4QwmE7SFKc0YfCtbhVZh2wbQFA5au/gipCIuDf2TplUc6dGhvM8BG/IbTvOIsfNv2axJ 0L+A== X-Gm-Message-State: AJIora+NG/eYi1B1wb9l8mC6zncf3CPtFG80HzpUpc3icBYT3aGd7ZSJ UZctfBce7h8D8GGt9hJ9U8E2g9+f1f4= X-Google-Smtp-Source: AGRyM1vw8UoZsqmcNEu5ZT5rcMeOacvbgCBAsbaN7MCgbxdcmOfjyMNMGTDueEzsK6ayTT/9FlNvXw== X-Received: by 2002:a17:906:ef8b:b0:72b:58da:b115 with SMTP id ze11-20020a170906ef8b00b0072b58dab115mr30542476ejb.417.1658255931044; Tue, 19 Jul 2022 11:38:51 -0700 (PDT) Received: from hthiery.fritz.box ([2a02:810b:5a40:2a43:8e16:45ff:fe22:ad85]) by smtp.gmail.com with ESMTPSA id sb12-20020a1709076d8c00b0072b2ffc662esm6912665ejc.156.2022.07.19.11.38.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 Jul 2022 11:38:50 -0700 (PDT) From: Heiko Thiery To: u-boot@lists.denx.de Cc: =?UTF-8?q?Pali=20Roh=C3=A1r?= , Stefan Roese , Simon Glass , Chris Packham , =?UTF-8?q?Marek=20Beh=C3=BAn?= , AKASHI Takahiro , Samuel Holland , Heiko Thiery Subject: [PATCH 1/2] tools: mkeficapsule: use pkg-config to get -luuid and -lgnutls Date: Tue, 19 Jul 2022 20:38:37 +0200 Message-Id: <20220719183837.536343-1-heiko.thiery@gmail.com> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.6 at phobos.denx.de X-Virus-Status: Clean Instead of hardcoding -luuid -lgnutls as the flags needed to build mkeficapsule, use pkg-config when available. We gracefully fallback on the previous behavior of hardcoding -luuid -lgnutls if pkg-config is not available or fails with an error. Signed-off-by: Heiko Thiery --- tools/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/Makefile b/tools/Makefile index 9f2339666a..9f6b282ad8 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -242,7 +242,8 @@ hostprogs-$(CONFIG_MIPS) += mips-relocs hostprogs-$(CONFIG_ASN1_COMPILER) += asn1_compiler HOSTCFLAGS_asn1_compiler.o = -idirafter $(srctree)/include -HOSTLDLIBS_mkeficapsule += -lgnutls -luuid +HOSTLDLIBS_mkeficapsule += \ + $(shell pkg-config --libs gnutls uuid 2> /dev/null || echo "-lgnutls -luuid") hostprogs-$(CONFIG_TOOLS_MKEFICAPSULE) += mkeficapsule # We build some files with extra pedantic flags to try to minimize things -- 2.30.2