From patchwork Fri May 1 19:37:12 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Marek_Beh=C3=BAn?= X-Patchwork-Id: 11523195 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 9C3931392 for ; Fri, 1 May 2020 19:37:16 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 5A29D2137B for ; Fri, 1 May 2020 19:37:16 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=nic.cz header.i=@nic.cz header.b="QVT+STat" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726449AbgEAThQ (ORCPT ); Fri, 1 May 2020 15:37:16 -0400 Received: from mail.nic.cz ([217.31.204.67]:58688 "EHLO mail.nic.cz" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726405AbgEAThP (ORCPT ); Fri, 1 May 2020 15:37:15 -0400 Received: from dellmb.labs.office.nic.cz (unknown [IPv6:2001:1488:fffe:6:cac7:3539:7f1f:463]) by mail.nic.cz (Postfix) with ESMTP id 972E4141CDC; Fri, 1 May 2020 21:37:13 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=nic.cz; s=default; t=1588361833; bh=t/Er3jX2ZGNTCCzV9UtdPSmjDwKuwnzj4/57EloYe9I=; h=From:To:Date; b=QVT+STat5JpA+iQ8s02gMCUkPmaR7yQvTSz6L+NMqXa+uYKAfo6W9xl4a+YKClBIY MqWNgqhtCsPNv9D0xHI7W97y5LIz6uuWr4vP6tn+6n2yFxx/WBiSotlbRmsi19OTmN 9RvW0X9ITcVNeh3n7SQJvkJMI7SEUOc/ArCzehdw= From: =?utf-8?q?Marek_Beh=C3=BAn?= To: devicetree@vger.kernel.org Cc: =?utf-8?q?Marek_Beh=C3=BAn?= , Pavel Modilaynen , Rob Herring , Masahiro Yamada , Michal Marek , linux-kbuild@vger.kernel.org Subject: [PATCH v2] dtc: Use better check for libyaml Date: Fri, 1 May 2020 21:37:12 +0200 Message-Id: <20200501193712.18930-1-marek.behun@nic.cz> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200501015147.32391-1-marek.behun@nic.cz> References: MIME-Version: 1.0 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mail.nic.cz X-Spam-Status: No, score=0.00 X-Spamd-Bar: / X-Virus-Scanned: clamav-milter 0.101.4 at mail X-Virus-Status: Clean Sender: linux-kbuild-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kbuild@vger.kernel.org The current check for libyaml based on pkg-config may succeed even if yaml.h header is missing. Try to determine if header and library are present by compiling a simple program. This creates macros hostcc-header and hostcc-symbol in scripts/Kbuild.include, which check whether a header file and a library symbol are present on host system, by compiling a simple program. Fixes: 067c650c456e ("dtc: Use pkg-config to locate libyaml") Signed-off-by: Marek Behún Cc: Pavel Modilaynen Cc: Rob Herring Cc: Masahiro Yamada Cc: Michal Marek Cc: linux-kbuild@vger.kernel.org --- scripts/Kbuild.include | 14 ++++++++++++++ scripts/dtc/Makefile | 10 ++++++---- 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/scripts/Kbuild.include b/scripts/Kbuild.include index 6cabf20ce66a..33af76aa86c1 100644 --- a/scripts/Kbuild.include +++ b/scripts/Kbuild.include @@ -154,6 +154,20 @@ ld-version = $(shell $(LD) --version | $(srctree)/scripts/ld-version.sh) # Usage: $(call ld-ifversion, -ge, 22252, y) ld-ifversion = $(shell [ $(ld-version) $(1) $(2) ] && echo $(3) || echo $(4)) +# hostcc-header +# Usage: $(call hostcc-header,header.h,-I/usr/include/libname) +# third argument is optional +hostcc-header = $(call try-run, \ + { echo "\#include <$(1)>" ; echo "int main(){}"; } | \ + $(HOSTCC) $(2) -x c - -o /dev/null,y,n) + +# hostcc-symbol +# Usage: $(call hostcc-symbol,symbol_name,-llibname) +# third argument is optional +hostcc-symbol = $(call try-run, \ + echo "void $(1)();int main(){$(1)();}" | \ + $(HOSTCC) -x c - -o /dev/null $(2),y,n) + ###### ### diff --git a/scripts/dtc/Makefile b/scripts/dtc/Makefile index ef85f8b7d4a7..d04c03b0899d 100644 --- a/scripts/dtc/Makefile +++ b/scripts/dtc/Makefile @@ -12,15 +12,17 @@ dtc-objs += dtc-lexer.lex.o dtc-parser.tab.o # Source files need to get at the userspace version of libfdt_env.h to compile HOST_EXTRACFLAGS := -I $(srctree)/$(src)/libfdt -ifeq ($(shell pkg-config --exists yaml-0.1 2>/dev/null && echo yes),) +_yaml_libs = $(shell pkg-config --libs yaml-0.1 2>/dev/null) +ifeq ($(call hostcc-header,yaml.h)$(call hostcc-symbol,yaml_get_version,\ + $(_yaml_libs)),yy) +dtc-objs += yamltree.o +HOSTLDLIBS_dtc := $(_yaml_libs) +else ifneq ($(CHECK_DT_BINDING)$(CHECK_DTBS),) $(error dtc needs libyaml for DT schema validation support. \ Install the necessary libyaml development package.) endif HOST_EXTRACFLAGS += -DNO_YAML -else -dtc-objs += yamltree.o -HOSTLDLIBS_dtc := $(shell pkg-config yaml-0.1 --libs) endif # Generated files need one more search path to include headers in source tree