From patchwork Thu Apr 4 19:24:13 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Summers, Stuart" X-Patchwork-Id: 1077627 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.133; helo=hemlock.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=intel.com Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 44ZtDm50GRz9sPW for ; Fri, 5 Apr 2019 06:24:40 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id B7BC887CC1; Thu, 4 Apr 2019 19:24:38 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id bniWRYyI1xJS; Thu, 4 Apr 2019 19:24:33 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 981C586961; Thu, 4 Apr 2019 19:24:31 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id C83371BF977 for ; Thu, 4 Apr 2019 19:24:17 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id C168D86AB5 for ; Thu, 4 Apr 2019 19:24:17 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id N2ugl_hwVLQh for ; Thu, 4 Apr 2019 19:24:15 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by fraxinus.osuosl.org (Postfix) with ESMTPS id 881C086AC1 for ; Thu, 4 Apr 2019 19:24:15 +0000 (UTC) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga006.jf.intel.com ([10.7.209.51]) by fmsmga102.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 04 Apr 2019 12:24:14 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.60,309,1549958400"; d="scan'208";a="133032733" Received: from jssummer-desk.ra.intel.com ([10.54.134.188]) by orsmga006.jf.intel.com with ESMTP; 04 Apr 2019 12:24:14 -0700 From: Stuart Summers To: Date: Thu, 4 Apr 2019 12:24:13 -0700 Message-Id: <20190404192413.10205-2-stuart.summers@intel.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190404192413.10205-1-stuart.summers@intel.com> References: <20190404192413.10205-1-stuart.summers@intel.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH 1/1] package/pkgconf: add host link to pkg-config X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: buildroot@buildroot.org Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" A patch was added to the Linux kernel in 5.1.0-rc3 which adds a requirement that the host build environment include pkg-config. Since pkg-config was deprecated in buildroot, add a link in the host directory to /usr/bin/pkg-config. Also add a new config option to enforce building host-pkgconf before building the Linux kernel. Signed-off-by: Stuart Summers --- linux/Config.in | 8 ++++++++ linux/linux.mk | 4 ++++ package/pkgconf/pkgconf.mk | 8 +++++++- 3 files changed, 19 insertions(+), 1 deletion(-) diff --git a/linux/Config.in b/linux/Config.in index 9a4d46e534..5d0c623c2b 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -432,6 +432,14 @@ config BR2_LINUX_KERNEL_NEEDS_HOST_LIBELF CONFIG_UNWINDER_ORC=y, please install libelf-dev, libelf-devel or elfutils-libelf-devel". +config BR2_LINUX_KERNEL_NEEDS_HOST_PKG_CONFIG + bool "Needs host pkgconf" + help + Starting in 5.1.0-rc3, a change was added to the Linux kernel + which uses pkg-config to determine the location of the libelf + library. Without this option, the kernel will fail with build + errors. + # Linux extensions source "linux/Config.ext.in" diff --git a/linux/linux.mk b/linux/linux.mk index 6bf2b88038..d011f92828 100644 --- a/linux/linux.mk +++ b/linux/linux.mk @@ -100,6 +100,10 @@ ifeq ($(BR2_LINUX_KERNEL_NEEDS_HOST_LIBELF),y) LINUX_DEPENDENCIES += host-elfutils endif +ifeq ($(BR2_LINUX_KERNEL_NEEDS_HOST_PKG_CONFIG),y) +LINUX_DEPENDENCIES += host-pkgconf +endif + # If host-uboot-tools is selected by the user, assume it is needed to # create a custom image ifeq ($(BR2_PACKAGE_HOST_UBOOT_TOOLS),y) diff --git a/package/pkgconf/pkgconf.mk b/package/pkgconf/pkgconf.mk index e3c73fd405..8284799f1e 100644 --- a/package/pkgconf/pkgconf.mk +++ b/package/pkgconf/pkgconf.mk @@ -16,6 +16,10 @@ define PKGCONF_LINK_PKGCONFIG ln -sf pkgconf $(TARGET_DIR)/usr/bin/pkg-config endef +define HOST_PKGCONF_LINK_PKGCONFIG + ln -sf pkgconf $(HOST_DIR)/usr/bin/pkg-config +endef + define HOST_PKGCONF_INSTALL_WRAPPER $(INSTALL) -m 0755 -D package/pkgconf/pkg-config.in \ $(HOST_DIR)/bin/pkg-config @@ -32,7 +36,9 @@ define HOST_PKGCONF_SHARED endef PKGCONF_POST_INSTALL_TARGET_HOOKS += PKGCONF_LINK_PKGCONFIG -HOST_PKGCONF_POST_INSTALL_HOOKS += HOST_PKGCONF_INSTALL_WRAPPER +HOST_PKGCONF_POST_INSTALL_HOOKS += \ + HOST_PKGCONF_INSTALL_WRAPPER \ + HOST_PKGCONF_LINK_PKGCONFIG ifeq ($(BR2_STATIC_LIBS),y) HOST_PKGCONF_POST_INSTALL_HOOKS += HOST_PKGCONF_STATIC