From patchwork Sun Oct 8 16:54:28 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eicke Herbertz X-Patchwork-Id: 1844935 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; secure) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=bombadil.20210309 header.b=pb7DSCIk; dkim=fail reason="signature verification failed" (2048-bit key; secure) header.d=posteo.de header.i=@posteo.de header.a=rsa-sha256 header.s=2017 header.b=G9Ii8hyU; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.openwrt.org (client-ip=2607:7c80:54:3::133; helo=bombadil.infradead.org; envelope-from=openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org; receiver=patchwork.ozlabs.org) Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:3::133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4S3T0W499Zz1yqN for ; Mon, 9 Oct 2023 03:59:21 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-ID:Date:Subject:Cc :To:From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=bvD4CK/4zh/YWeJUq0NcIHbS11UiUzFIL1GUw7hunhs=; b=pb7DSCIkGTxugG KbW2STQxeIbcrixveibKpX38dBMK/byHBt0eYtjdLgaBmRS+gZpuUUb+l61L8b76NtQXJqN94sej+ Xvbmj45NyPiHKZWom/6XLLThWhUJaGfzyc50f9svIieBYV/kC9S3o+TkIUr6gpr+BzcvDEs1ujGRs lKNuZRzeOl0jcJD7g5mNaEXoBNeHjs1Qr8vSYfaL+7EkCfZY6eiy/P0a0Ous73ef4Yum5MrFzWwbm WUd28QOdJBNZ2M7kPptmXWGPPeKYlpqsZX4yCQ7KImH++BiEPt3pSZsjvxNxPp1Zerai11SI1MI7s QF47SGsXiUgKVq126JSg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1qpX3f-0093hF-2T; Sun, 08 Oct 2023 16:55:11 +0000 Received: from mout02.posteo.de ([185.67.36.66]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1qpX3b-0093gd-1Q for openwrt-devel@lists.openwrt.org; Sun, 08 Oct 2023 16:55:08 +0000 Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id B4F45240101 for ; Sun, 8 Oct 2023 18:55:00 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.de; s=2017; t=1696784100; bh=lcQ2PRdT273QRRcH1iVN/cGhbW3VG2YpZyCY9546AiI=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version: Content-Transfer-Encoding:From; b=G9Ii8hyUjbOR44p6+gO4bAkQGZwA/9DBJVBRClVVu9AH2VRREu32xXLBAD80yapqY X+4SjQyjhwyO8xFdBUhr06Fx1fqttwbGCq2X4EH9aQWlu2EhQjlVt+y517qDaF6e5q LaQ3+wI8i1Asc+c4UdDrnm7yom5ZftsVfQwWWqs7h8HQVyymP384QsfCG/IjNeRazY wxcHNgtHGy1L9BBsQyWRcFxubfYSEb6bzic3G0Xaq+WDl0Wi/WkE+x60GZ3Vu4WpVI Zei2NWAC0Fiv3YH+qwQdtbLrfM7h20D434fQlGY8PpUos6xrXEX7mHcDr/6KEn+OpF NYcrJ3fgLlTvA== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4S3SvS1XX1z9rxG; Sun, 8 Oct 2023 18:55:00 +0200 (CEST) From: wolletd@posteo.de To: openwrt-devel@lists.openwrt.org Cc: Eicke Herbertz Subject: [PATCH] build: explicitly specify Makefile generator Date: Sun, 8 Oct 2023 16:54:28 +0000 Message-ID: <20231008165428.109029-1-wolletd@posteo.de> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20231008_095507_657707_9391E1FE X-CRM114-Status: UNSURE ( 4.82 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -2.5 (--) X-Spam-Report: Spam detection software, running on the system "bombadil.infradead.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: From: Eicke Herbertz When CMAKE_GENERATOR environment variable is defined, CMake will use the specified generator by default instead of "Unix Makefiles". This breaks the build of packages setting PKG_USE_NINJA to 0, like [...] Content analysis details: (-2.5 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -2.3 RCVD_IN_DNSWL_MED RBL: Sender listed at https://www.dnswl.org/, medium trust [185.67.36.66 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain 0.0 RCVD_IN_MSPIKE_H5 RBL: Excellent reputation (+5) [185.67.36.66 listed in wl.mailspike.net] 0.0 RCVD_IN_MSPIKE_WL Mailspike good senders X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: OpenWrt Development List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org From: Eicke Herbertz When CMAKE_GENERATOR environment variable is defined, CMake will use the specified generator by default instead of "Unix Makefiles". This breaks the build of packages setting PKG_USE_NINJA to 0, like package/kernel/mt76. Signed-off-by: Eicke Herbertz --- include/cmake.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/include/cmake.mk b/include/cmake.mk index 95870ffdb0..32e94d384b 100644 --- a/include/cmake.mk +++ b/include/cmake.mk @@ -68,6 +68,8 @@ ifeq ($(HOST_USE_NINJA),1) define Host/Uninstall/Default +$(NINJA) -C $(HOST_CMAKE_BINARY_DIR) uninstall endef +else + CMAKE_HOST_OPTIONS += -DCMAKE_GENERATOR="Unix Makefiles" endif ifeq ($(PKG_USE_NINJA),1) @@ -80,6 +82,8 @@ ifeq ($(PKG_USE_NINJA),1) define Build/Install/Default +DESTDIR="$(PKG_INSTALL_DIR)" $(NINJA) -C $(CMAKE_BINARY_DIR) install endef +else + CMAKE_OPTIONS += -DCMAKE_GENERATOR="Unix Makefiles" endif define Build/Configure/Default