From patchwork Fri Jan 6 22:37:48 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?C=C3=A9dric_Marie?= X-Patchwork-Id: 712200 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3twKXJ4wlmz9t1C for ; Sat, 7 Jan 2017 09:50:56 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="key not found in DNS" (0-bit key; unprotected) header.d=openmailbox.org header.i=@openmailbox.org header.b="CuEQ0pz1"; dkim=fail reason="key not found in DNS" (0-bit key; unprotected) header.d=openmailbox.org header.i=@openmailbox.org header.b="CuEQ0pz1"; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id B8B1E878D8; Fri, 6 Jan 2017 22:50:53 +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 nUDch7pn5VwI; Fri, 6 Jan 2017 22:50:51 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 7932F86817; Fri, 6 Jan 2017 22:50:51 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id C16F71C1FBD for ; Fri, 6 Jan 2017 22:50:50 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id BB79E2670B for ; Fri, 6 Jan 2017 22:50:50 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id kq2o4NxeWDfi for ; Fri, 6 Jan 2017 22:50:50 +0000 (UTC) X-Greylist: delayed 00:11:57 by SQLgrey-1.7.6 Received: from lb1.openmailbox.org (lb1.openmailbox.org [5.79.108.160]) by silver.osuosl.org (Postfix) with ESMTPS id C71FD2315B for ; Fri, 6 Jan 2017 22:50:49 +0000 (UTC) Received: by lb1.openmailbox.org (Postfix, from userid 20002) id E330E54081F; Fri, 6 Jan 2017 23:39:06 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=openmailbox.org; s=openmailbox; t=1483742346; bh=ifwZzPv3UMh9hNJ0HQ1gIFWsUC032wd88c9QfUYFngM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=CuEQ0pz1Xat4R0d1xM902vKf7BC3AnYWetWaiGFxP3vqNZBnLkFZhxiG8kC34DnP5 kGoNZOEqGWsNvO5mPGg8KzxM6EV6gC79CL9FbWomdvGuRiSOSU/U1Su0ca4Il3rMQB FgmpNt/IFDNaqax2rPSCRZpxcPYU6fCcwrKLG6jI= From: =?UTF-8?q?C=C3=A9dric=20Marie?= DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=openmailbox.org; s=openmailbox; t=1483742346; bh=ifwZzPv3UMh9hNJ0HQ1gIFWsUC032wd88c9QfUYFngM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=CuEQ0pz1Xat4R0d1xM902vKf7BC3AnYWetWaiGFxP3vqNZBnLkFZhxiG8kC34DnP5 kGoNZOEqGWsNvO5mPGg8KzxM6EV6gC79CL9FbWomdvGuRiSOSU/U1Su0ca4Il3rMQB FgmpNt/IFDNaqax2rPSCRZpxcPYU6fCcwrKLG6jI= To: buildroot@buildroot.org Date: Fri, 6 Jan 2017 23:37:48 +0100 Message-Id: <20170106223748.2203-2-cedric.marie@openmailbox.org> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20170106223748.2203-1-cedric.marie@openmailbox.org> References: <20170106223748.2203-1-cedric.marie@openmailbox.org> MIME-Version: 1.0 Cc: =?UTF-8?q?C=C3=A9dric=20Marie?= Subject: [Buildroot] [PATCH 2/2] Update documentation of CMake infrastructure X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Describe BR2_CMAKE_USE_NINJA_BACKEND option, and update all the variables that have changed with this evolution. Replace LIBFOO_INSTALL_STAGING_OPTS and LIBFOO_INSTALL_TARGET_OPTS with LIBFOO_INSTALL_STAGING_ENV, LIBFOO_INSTALL_TARGET_ENV and LIBFOO_INSTALL_OPTS. Signed-off-by: Cédric Marie --- docs/manual/adding-packages-cmake.txt | 37 +++++++++++++++++++++++------------ 1 file changed, 25 insertions(+), 12 deletions(-) diff --git a/docs/manual/adding-packages-cmake.txt b/docs/manual/adding-packages-cmake.txt index 6ccf390..06331dd 100644 --- a/docs/manual/adding-packages-cmake.txt +++ b/docs/manual/adding-packages-cmake.txt @@ -117,25 +117,38 @@ typical packages will therefore only use a few of them. the given package, for one reason or another. By default, set to +$(MAKE)+. If parallel building is not supported by the package, then it should be set to +LIBFOO_MAKE=$(MAKE1)+. + When +BR2_CMAKE_USE_NINJA_BACKEND+ is enabled, the default value is + +$(HOST_DIR)/usr/bin/ninja+. If parallel building is not supported by + the package, then it should be set to + +LIBFOO_MAKE=$(HOST_DIR)/usr/bin/ninja -j1+. * +LIBFOO_MAKE_ENV+, to specify additional environment variables to pass to make in the build step. These are passed before the +make+ command. By default, empty. * +LIBFOO_MAKE_OPTS+, to specify additional variables to pass to make - in the build step. These are passed after the +make+ command. By - default, empty. - -* +LIBFOO_INSTALL_STAGING_OPTS+ contains the make options used to - install the package to the staging directory. By default, the value - is +DESTDIR=$(STAGING_DIR) install+, which is correct for most - CMake packages. It is still possible to override it. - -* +LIBFOO_INSTALL_TARGET_OPTS+ contains the make options used to + in the build step. These are passed after the +make+ or +ninja+ + command. If +BR2_CMAKE_USE_NINJA_BACKEND+ is enabled and +VERBOSE+ is + set, the default value is -v. Otherwise it is empty. With Ninja + backend, the verbose mode is not set in the configure step. Instead, + ninja -v option must be used in the following steps. + +* +LIBFOO_INSTALL_STAGING_ENV+ contains environment variables to pass + to make or ninja, to install the package to the staging directory. By + default, the value is +DESTDIR=$(STAGING_DIR)+, which is correct for + most CMake packages. It is still possible to override it. + +* +LIBFOO_INSTALL_TARGET_ENV+ contains environment variables to pass + to make or ninja, to install the package to the target directory. By + default, the value is +DESTDIR=$(TARGET_DIR)+. The default value is + correct for most CMake packages, but it is still possible to override + it if needed. + +* +LIBFOO_INSTALL_OPTS+ contains the make or ninja options used to install the package to the target directory. By default, the value - is +DESTDIR=$(TARGET_DIR) install+. The default value is correct - for most CMake packages, but it is still possible to override it if - needed. + is +install/fast+ for make and +install+ for ninja. The default value + is correct for most CMake packages, but it is still possible to + override it if needed. With the CMake infrastructure, all the steps required to build and install the packages are already defined, and they generally work well