From patchwork Sat Feb 13 17:40:12 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Seiderer X-Patchwork-Id: 1440244 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.137; helo=fraxinus.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; secure) header.d=gmx.net header.i=@gmx.net header.a=rsa-sha256 header.s=badeba3b8450 header.b=aeKX8hYp; dkim-atps=neutral Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4DdHhJ4YRQz9sRN for ; Sun, 14 Feb 2021 04:40:32 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 27DD485B94; Sat, 13 Feb 2021 17:40:31 +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 d2pEJQ86Mm5n; Sat, 13 Feb 2021 17:40:30 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 988D885F29; Sat, 13 Feb 2021 17:40:30 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id B7D671BF2F6 for ; Sat, 13 Feb 2021 17:40:20 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id B488286963 for ; Sat, 13 Feb 2021 17:40:20 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Z4DZQLHB1Y37 for ; Sat, 13 Feb 2021 17:40:17 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mout.gmx.net (mout.gmx.net [212.227.17.20]) by whitealder.osuosl.org (Postfix) with ESMTPS id BB2CB869EC for ; Sat, 13 Feb 2021 17:40:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1613238015; bh=t/wi6pywmgmMPoq6buGPQxXa+hCV3dHfbmlnIsi+oTk=; h=X-UI-Sender-Class:From:To:Subject:Date:In-Reply-To:References; b=aeKX8hYpv6ceGr+QILQXcI3W4WIEly53JAYiRTEjeZhDpJgtFNLDBEr1xNyk2xPuK jmM1zEHw2jTTixghC9TS+vtH7Qth+kbWMWwcCg5B+x38h+LSflzM2kk6/3WE2590/X A71oYt/pA3QC6BhMD15WEq/Sra56mi9/BIPcqa1Y= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from localhost.fritz.box ([62.216.208.75]) by mail.gmx.net (mrgmx105 [212.227.17.168]) with ESMTPSA (Nemesis) id 1MV67y-1lLWjA44Qg-00S8Pn for ; Sat, 13 Feb 2021 18:40:15 +0100 From: Peter Seiderer To: buildroot@busybox.net Date: Sat, 13 Feb 2021 18:40:12 +0100 Message-Id: <20210213174013.32584-6-ps.report@gmx.net> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20210213174013.32584-1-ps.report@gmx.net> References: <20210213174013.32584-1-ps.report@gmx.net> MIME-Version: 1.0 X-Provags-ID: V03:K1:N2rf+Hl/h+U7wswU8J/i2S2EAuSeWAskIg3Af0e/eUEdguDRP0H 4glt8v5NwsUukYG7lYI2kcv3VJb0o8+dHN6noprqicxu0K8X2QOxvcBLYwErHIpl8l5Yffj xKCOTGn9e4t4Ba3RzX2/XLLnZmO/2ZU9tJ6kuoAKruWqEKyjK1QmAMyDxXKhao8AMfPLqVJ FlEpA72A7M4pl7cTmuzSQ== X-UI-Out-Filterresults: notjunk:1;V03:K0:TNJ7tOi4N+Y=:+PCGEx4O4FqAvFIdEBdzMO qs4Qb4NBipAY9vzn/n+dPn+BonMQqodensV4/YwSOvpmr+F2wdzzsqqyw/lfo9ukMgN7lwll4 H8C2NYc903JldEpEOlcBPH1LmSeAoYqp0Ae1xlF/v1gpgM0A0zolBICeF505t0FuTaNDOf46W Xg3GIs8hzoh2vol+j3CxdZKFatLinZ++dVgeq+JONQUEFQSX75xFli/A4SVCyBK/3i84nrRkD USM8qPUAMNs7yG1pZugk2FQSnCsDX3FKq9kpGfaqOS4vQi0WKdER0A7EQqyhXH3geixngHXxH XTP1L8wVRMfQB6WgQBmf/IwRmb0KUTX99E267ZM8DAM+YEhxwxzRRYxT9xyuiKyU1b0Ncx/aQ uRgPzuXItMIwhTOMaFprgSVhVJKqCesvcCyf7Nd+UDR/27N+Ezywkhy0Y3IOX68dgwKyXXpDl URUugZHsKM62JNiDWMWEjJ5gy4+I46QUXQ7oPDKQLdlktG48TAMbfeqpBj0lge88FCcsVUVJS bG09aGqTHN/mQZIxnedt6E4Z4kU+cdi5NMqc8EZdUk+av1/+mDCYGAPXadLXR2AldYWlCJbWl kPdHM/Dvw8xqLBnY1qyc3y0A3azVybfBWEB/mwbshmgR8VMh5gn7lPogOonRODAzQC9CeARhY aXc2a52ir0ASh7/3uF73FY2Q4z4j9/kekuw9iBySXGxg5fcaQYNMaLWyr4+TN0r9z+FLyEv8h pWjDI0DoXWeEGgO1bVLoq9O5ngelc9ER5Mbks0qBO6+nWOaYQfdQkJ2LMxJeb0wh3vZEIL37M Y74iCJ/QXLNopO/ie3Y2Bh8UN9qJEwjswH7OOO5f0V9FHHT8eIuRRu4lZDQXiptxlyqAi4fj/ YiDvVqx6AebvmzUAVmYA== Subject: [Buildroot] [RFC v1 5/6] package/pkg-cmake: add _INSTALL_STAGING_ENV/_INSTALL_TARGET_ENV 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: , Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Add _INSTALL_STAGING_ENV/_INSTALL_TARGET_ENV as needed for ninja make/install as ninja expects the DESDIR as eviornment var instead of parameter. This one makes ninja unhappy: $ ninja install DESTDIR=... This one makes ninja happy: $ DESTDIR=... ninja install Signed-off-by: Peter Seiderer --- ToDo: - add documentation Notes: - alternative to explicit make/ninja calls maybe common 'cmake --build'/'cmake --install' calls are a feasible solution (yet untested) - pro: more common code, con: less customizable, needs to take a look at the current users of _MAKE/_INSTALL_STAGING_OPTS/_INSTALL_TARGET_OPTS options --- package/pkg-cmake.mk | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/package/pkg-cmake.mk b/package/pkg-cmake.mk index c001051002..b758e50b76 100644 --- a/package/pkg-cmake.mk +++ b/package/pkg-cmake.mk @@ -58,7 +58,10 @@ $(2)_MAKE_ENV ?= $(2)_MAKE_OPTS ?= $(2)_INSTALL_OPTS ?= install $(2)_INSTALL_STAGING_OPTS ?= DESTDIR=$$(STAGING_DIR) install/fast +$(2)_INSTALL_STAGING_ENV ?= $(2)_INSTALL_TARGET_OPTS ?= DESTDIR=$$(TARGET_DIR) install/fast +$(2)_INSTALL_TARGET_ENV ?= + $(3)_SUPPORTS_IN_SOURCE_BUILD ?= YES @@ -192,7 +195,7 @@ endif # ifndef $(2)_INSTALL_STAGING_CMDS define $(2)_INSTALL_STAGING_CMDS - $$(TARGET_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) $$($$(PKG)_MAKE_OPTS) $$($$(PKG)_INSTALL_STAGING_OPTS) -C $$($$(PKG)_BUILDDIR) + $$(TARGET_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_INSTALL_STAGING_ENV) $$($$(PKG)_MAKE) $$($$(PKG)_MAKE_OPTS) $$($$(PKG)_INSTALL_STAGING_OPTS) -C $$($$(PKG)_BUILDDIR) endef endif @@ -202,7 +205,7 @@ endif # ifndef $(2)_INSTALL_TARGET_CMDS define $(2)_INSTALL_TARGET_CMDS - $$(TARGET_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) $$($$(PKG)_MAKE_OPTS) $$($$(PKG)_INSTALL_TARGET_OPTS) -C $$($$(PKG)_BUILDDIR) + $$(TARGET_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_INSTALL_TARGET_ENV) $$($$(PKG)_MAKE) $$($$(PKG)_MAKE_OPTS) $$($$(PKG)_INSTALL_TARGET_OPTS) -C $$($$(PKG)_BUILDDIR) endef endif