From patchwork Fri Jan 21 15:42:29 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adrian Perez de Castro X-Patchwork-Id: 1582626 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=igalia.com header.i=@igalia.com header.a=rsa-sha256 header.s=20170329 header.b=FE34FdSm; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=buildroot.org (client-ip=2605:bc80:3010::138; helo=smtp1.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=) Received: from smtp1.osuosl.org (smtp1.osuosl.org [IPv6:2605:bc80:3010::138]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4JgNvd6P7kz9sPC for ; Sat, 22 Jan 2022 02:43:39 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id 7BB15812B8; Fri, 21 Jan 2022 15:43:37 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 1CQAC1kuN3yd; Fri, 21 Jan 2022 15:43:34 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp1.osuosl.org (Postfix) with ESMTP id 115EA8134F; Fri, 21 Jan 2022 15:43:33 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp2.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id DEC311BF423 for ; Fri, 21 Jan 2022 15:43:00 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id D8F334011C for ; Fri, 21 Jan 2022 15:43:00 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Authentication-Results: smtp2.osuosl.org (amavisd-new); dkim=pass (2048-bit key) header.d=igalia.com Received: from smtp2.osuosl.org ([127.0.0.1]) by localhost (smtp2.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id sWfBv1i9XLRu for ; Fri, 21 Jan 2022 15:42:57 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.8.0 Received: from fanzine2.igalia.com (fanzine2.igalia.com [213.97.179.56]) by smtp2.osuosl.org (Postfix) with ESMTPS id F2A0940260 for ; Fri, 21 Jan 2022 15:42:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=igalia.com; s=20170329; h=Content-Transfer-Encoding:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To:Content-Type:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=1lxUNgqV5NlD0N1aI9hqAb+fdhrAEdHx32ddam1P9gE=; b=FE34FdSmA/Vgu0bVGP1aw1WPUn SnzgBu1Tkstk4cFuWNbqzlV5+mxmt2126mg66AXa6Y2lA+EW0f4kUdwgqvj0E+/7gKX9O7MRRs3/d 8oSYZR+aRAeKf+l7DwjyF9BteW/Rz+ozbBDZiWgnXco9ggxDioeu57p7hemH+6WIxeQiR3eFNiuq6 s4cHGdWWXvad14mAY9e8tGh68K96/4r9mwRQ7pGjOWfql35u6kVdOtohL99F7aEFW8JzduoTAyIPk 4jngoT00kyvlId3+DhgkePOukl3llEQvr+H8bS6qgbjXO4LNgqBLcCjuSOGvT1XJt9X+0W9+dh7Ng sRJjkXlg==; Received: from 91-153-34-128.elisa-laajakaista.fi ([91.153.34.128] helo=kodama) by fanzine2.igalia.com with esmtpsa (Cipher TLS1.3:ECDHE_X25519__RSA_PSS_RSAE_SHA512__AES_256_GCM:256) (Exim) id 1nAw3w-000BCQ-U7; Fri, 21 Jan 2022 16:42:53 +0100 Received: from localhost (kodama [local]) by kodama (OpenSMTPD) with ESMTPA id b06c3640; Fri, 21 Jan 2022 15:42:35 +0000 (UTC) From: Adrian Perez de Castro To: buildroot@buildroot.org Date: Fri, 21 Jan 2022 17:42:29 +0200 Message-Id: <20220121154235.798255-2-aperez@igalia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220121154235.798255-1-aperez@igalia.com> References: <20220112132618.2634250-2-aperez@igalia.com> <20220121154235.798255-1-aperez@igalia.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH RFC v2 1/7] package/ninja: do not require cmake X-BeenThere: buildroot@buildroot.org 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: Eric Le Bihan , Pierre Ducroquet , Samuel Martin , Peter Seiderer , Thomas Petazzoni Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" Use host-generic-package to manually build ninja. This avoids the need for host-cmake in preparation for the CMake build system machinery being changed to use ninja instead of make. Signed-off-by: Adrian Perez de Castro --- Changes v1 -> v2: - No changes. --- package/ninja/ninja.mk | 36 +++++++++++++++++++++++++++++++++++- 1 file changed, 35 insertions(+), 1 deletion(-) diff --git a/package/ninja/ninja.mk b/package/ninja/ninja.mk index ab1941023e..ae3be6a14f 100644 --- a/package/ninja/ninja.mk +++ b/package/ninja/ninja.mk @@ -9,8 +9,42 @@ NINJA_SITE = $(call github,ninja-build,ninja,v$(NINJA_VERSION)) NINJA_LICENSE = Apache-2.0 NINJA_LICENSE_FILES = COPYING +# Ninja is used by CMake-based packages, avoid a circular dependency by +# by using host-generic-package instead and using a single command to +# compile the binary. This does in essence the same as the "bootstrap.py" +# included in the distribution avoiding the need for host-python. +define HOST_NINJA_BUILD_CMDS + cd $(@D) && $(HOSTCXX) $(HOST_CXXFLAGS) $(HOST_LDFLAGS) \ + src/build_log.cc \ + src/build.cc \ + src/clean.cc \ + src/clparser.cc \ + src/dyndep.cc \ + src/dyndep_parser.cc \ + src/debug_flags.cc \ + src/deps_log.cc \ + src/disk_interface.cc \ + src/edit_distance.cc \ + src/eval_env.cc \ + src/graph.cc \ + src/graphviz.cc \ + src/line_printer.cc \ + src/manifest_parser.cc \ + src/metrics.cc \ + src/parser.cc \ + src/state.cc \ + src/string_piece_util.cc \ + src/util.cc \ + src/version.cc \ + src/depfile_parser.cc \ + src/lexer.cc \ + src/subprocess-posix.cc \ + src/ninja.cc \ + -o ninja +endef + define HOST_NINJA_INSTALL_CMDS $(INSTALL) -m 0755 -D $(@D)/ninja $(HOST_DIR)/bin/ninja endef -$(eval $(host-cmake-package)) +$(eval $(host-generic-package)) From patchwork Fri Jan 21 15:42:30 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adrian Perez de Castro X-Patchwork-Id: 1582627 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=igalia.com header.i=@igalia.com header.a=rsa-sha256 header.s=20170329 header.b=nX0/qc2c; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=buildroot.org (client-ip=2605:bc80:3010::138; helo=smtp1.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=) Received: from smtp1.osuosl.org (smtp1.osuosl.org [IPv6:2605:bc80:3010::138]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4JgNvn4S3Sz9t3b for ; Sat, 22 Jan 2022 02:43:49 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id EA9EE81387; Fri, 21 Jan 2022 15:43:46 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id z_PSI_N0wShQ; Fri, 21 Jan 2022 15:43:46 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp1.osuosl.org (Postfix) with ESMTP id 05D89813A6; Fri, 21 Jan 2022 15:43:45 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp4.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id 230BF1C115D for ; Fri, 21 Jan 2022 15:43:01 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id 11A504022B for ; Fri, 21 Jan 2022 15:43:01 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Authentication-Results: smtp4.osuosl.org (amavisd-new); dkim=pass (2048-bit key) header.d=igalia.com Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id mvFrGkh9mVwH for ; Fri, 21 Jan 2022 15:43:00 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.8.0 Received: from fanzine2.igalia.com (fanzine2.igalia.com [213.97.179.56]) by smtp4.osuosl.org (Postfix) with ESMTPS id 660BB40217 for ; Fri, 21 Jan 2022 15:43:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=igalia.com; s=20170329; h=Content-Transfer-Encoding:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To:Content-Type:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=kCaA54F/QhnNC3pROsf5W7/WC3OFfAcnX6KX9CqUns4=; b=nX0/qc2c9rf/MnGgtwKvpHIZFo KRt4mntyiOcT2Zi7JojoVftg8ucT+MX0FWY5SMj4IS6qsx59HZHDZkqKzNYemaSht8Bb4v0uHk1r3 BAB7fa+UYM85SS2WkA1OKSrmRLkE1jvjlTJJPMq0LZ0mr86FkgAgpAu+1YjSt3kA7ttEFk7m/9qqx WOhfV+9G+2+JWARM6QoeOpcEjcdOgJ2VID4BeivrNiLehrGxFetMKyZplRy4CPBUdLijEKxgyEeEV G+EFr7Pk4TBFOz2odyNCFgq0HrQuTgUUEXhpdvKcMrc7oiG+jbrq5Vj3PGsTy+Xa9b7K+jbqtLu3u 1NusgKsQ==; Received: from 91-153-34-128.elisa-laajakaista.fi ([91.153.34.128] helo=kodama) by fanzine2.igalia.com with esmtpsa (Cipher TLS1.3:ECDHE_X25519__RSA_PSS_RSAE_SHA512__AES_256_GCM:256) (Exim) id 1nAw40-000BCn-0n; Fri, 21 Jan 2022 16:42:56 +0100 Received: from localhost (kodama [local]) by kodama (OpenSMTPD) with ESMTPA id 24f9c788; Fri, 21 Jan 2022 15:42:35 +0000 (UTC) From: Adrian Perez de Castro To: buildroot@buildroot.org Date: Fri, 21 Jan 2022 17:42:30 +0200 Message-Id: <20220121154235.798255-3-aperez@igalia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220121154235.798255-1-aperez@igalia.com> References: <20220112132618.2634250-2-aperez@igalia.com> <20220121154235.798255-1-aperez@igalia.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH RFC v2 2/7] package/pkg-cmake.mk: use ninja instead of make X-BeenThere: buildroot@buildroot.org 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: Eric Le Bihan , Pierre Ducroquet , Samuel Martin , Peter Seiderer , Thomas Petazzoni Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" Switch to ninja as the build tool for the CMake package infrastructure. Note that the changes make packages which use [host-]cmake-package depend on host-ninja. Signed-off-by: Adrian Perez de Castro --- Changes v1 -> v2: - No changes. --- package/pkg-cmake.mk | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/package/pkg-cmake.mk b/package/pkg-cmake.mk index 3b1db35fb6..65f005a914 100644 --- a/package/pkg-cmake.mk +++ b/package/pkg-cmake.mk @@ -51,11 +51,6 @@ endif define inner-cmake-package -$(2)_MAKE ?= $$(MAKE) -$(2)_INSTALL_OPTS ?= install -$(2)_INSTALL_STAGING_OPTS ?= DESTDIR=$$(STAGING_DIR) install/fast -$(2)_INSTALL_TARGET_OPTS ?= DESTDIR=$$(TARGET_DIR) install/fast - $(3)_SUPPORTS_IN_SOURCE_BUILD ?= YES @@ -88,6 +83,7 @@ define $(2)_CONFIGURE_CMDS rm -f CMakeCache.txt && \ PATH=$$(BR_PATH) \ $$($$(PKG)_CONF_ENV) $$(BR2_CMAKE) $$($$(PKG)_SRCDIR) \ + -GNinja \ -DCMAKE_TOOLCHAIN_FILE="$$(HOST_DIR)/share/buildroot/toolchainfile.cmake" \ -DCMAKE_INSTALL_PREFIX="/usr" \ -DCMAKE_COLOR_MAKEFILE=OFF \ @@ -117,6 +113,7 @@ define $(2)_CONFIGURE_CMDS PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1 \ PKG_CONFIG_ALLOW_SYSTEM_LIBS=1 \ $$($$(PKG)_CONF_ENV) $$(BR2_CMAKE) $$($$(PKG)_SRCDIR) \ + -GNinja \ -DCMAKE_INSTALL_SO_NO_EXE=0 \ -DCMAKE_FIND_ROOT_PATH="$$(HOST_DIR)" \ -DCMAKE_FIND_ROOT_PATH_MODE_PROGRAM="BOTH" \ @@ -154,6 +151,8 @@ endif # primitives to find {C,LD}FLAGS, add it to the dependency list. $(2)_DEPENDENCIES += host-pkgconf +$(2)_DEPENDENCIES += host-ninja + $(2)_DEPENDENCIES += $(BR2_CMAKE_HOST_DEPENDENCY) # @@ -163,11 +162,13 @@ $(2)_DEPENDENCIES += $(BR2_CMAKE_HOST_DEPENDENCY) ifndef $(2)_BUILD_CMDS ifeq ($(4),target) define $(2)_BUILD_CMDS - $$(TARGET_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) $$($$(PKG)_MAKE_OPTS) -C $$($$(PKG)_BUILDDIR) + $$(TARGET_MAKE_ENV) $$($$(PKG)_NINJA_ENV) \ + $$(NINJA) $$(NINJA_OPTS) $$($$(PKG)_NINJA_OPTS) -C $$($$(PKG)_BUILDDIR) endef else define $(2)_BUILD_CMDS - $$(HOST_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) $$($$(PKG)_MAKE_OPTS) -C $$($$(PKG)_BUILDDIR) + $$(HOST_MAKE_ENV) $$($$(PKG)_NINJA_ENV) \ + $$(NINJA) $$(NINJA_OPTS) $$($$(PKG)_NINJA_OPTS) -C $$($$(PKG)_BUILDDIR) endef endif endif @@ -178,7 +179,8 @@ endif # ifndef $(2)_INSTALL_CMDS define $(2)_INSTALL_CMDS - $$(HOST_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) $$($$(PKG)_MAKE_OPTS) $$($$(PKG)_INSTALL_OPTS) -C $$($$(PKG)_BUILDDIR) + $$(HOST_MAKE_ENV) $$($$(PKG)_NINJA_ENV) \ + $$(NINJA) $$(NINJA_OPTS) -C $$($$(PKG)_BUILDDIR) install endef endif @@ -188,7 +190,8 @@ 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)_NINJA_ENV) DESTDIR=$$(STAGING_DIR) \ + $$(NINJA) $$(NINJA_OPTS) -C $$($$(PKG)_BUILDDIR) install endef endif @@ -198,7 +201,8 @@ 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)_NINJA_ENV) DESTDIR=$$(TARGET_DIR) \ + $$(NINJA) $$(NINJA_OPTS) -C $$($$(PKG)_BUILDDIR) install endef endif From patchwork Fri Jan 21 15:42:31 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adrian Perez de Castro X-Patchwork-Id: 1582625 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=igalia.com header.i=@igalia.com header.a=rsa-sha256 header.s=20170329 header.b=qmUXMukG; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=buildroot.org (client-ip=2605:bc80:3010::136; helo=smtp3.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=) Received: from smtp3.osuosl.org (smtp3.osuosl.org [IPv6:2605:bc80:3010::136]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4JgNvK3Mkcz9sPC for ; Sat, 22 Jan 2022 02:43:25 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id F3B1A60ABE; Fri, 21 Jan 2022 15:43:22 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 5b4Llq6yO-CJ; Fri, 21 Jan 2022 15:43:22 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp3.osuosl.org (Postfix) with ESMTP id 3D96C606CB; Fri, 21 Jan 2022 15:43:21 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp2.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id BF67C1BF423 for ; Fri, 21 Jan 2022 15:42:59 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id ACB954011C for ; Fri, 21 Jan 2022 15:42:59 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Authentication-Results: smtp2.osuosl.org (amavisd-new); dkim=pass (2048-bit key) header.d=igalia.com Received: from smtp2.osuosl.org ([127.0.0.1]) by localhost (smtp2.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id o-TCWGKFu91v for ; Fri, 21 Jan 2022 15:42:58 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.8.0 Received: from fanzine2.igalia.com (fanzine2.igalia.com [213.97.179.56]) by smtp2.osuosl.org (Postfix) with ESMTPS id 9AD62404D0 for ; Fri, 21 Jan 2022 15:42:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=igalia.com; s=20170329; h=Content-Transfer-Encoding:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To:Content-Type:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=qsmXdyU0hrBFMth0PtMhXc1fm5NXvD48If7wAnAcRzk=; b=qmUXMukGkDzVqAE2qAZeBlCw/k akNHyopqXPn+vI86NFLm/1ZHOm47bgKW17yVyq2BgEWKqeGfkqaxsM1UauM0SCvbuIy3PHGbl/9F2 LBJzBEMkl7y4NSKdxn+VLzkq7ixeVC6hEVdDpFd7lgaE0GjEAZcbJnTVocxTPrlZxtgDzh4434g6/ t2xoztEzAkkJyQdtuEttbg6u49yvhJnwnIvkn1E9j293jq/1CTZPSBr5biWTxxA29E3ltA9hoJAe+ U4at3yQUGHeo6YOcWO+uqiIndPuo13D01VCus7+t7lGRyN+68Wo2oWdNluwWnIOtndYqAqPUaLHgJ LRkfz9GA==; Received: from 91-153-34-128.elisa-laajakaista.fi ([91.153.34.128] helo=kodama) by fanzine2.igalia.com with esmtpsa (Cipher TLS1.3:ECDHE_X25519__RSA_PSS_RSAE_SHA512__AES_256_GCM:256) (Exim) id 1nAw40-000BCQ-J1; Fri, 21 Jan 2022 16:42:56 +0100 Received: from localhost (kodama [local]) by kodama (OpenSMTPD) with ESMTPA id 2245ca95; Fri, 21 Jan 2022 15:42:35 +0000 (UTC) From: Adrian Perez de Castro To: buildroot@buildroot.org Date: Fri, 21 Jan 2022 17:42:31 +0200 Message-Id: <20220121154235.798255-4-aperez@igalia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220121154235.798255-1-aperez@igalia.com> References: <20220112132618.2634250-2-aperez@igalia.com> <20220121154235.798255-1-aperez@igalia.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH RFC v2 3/7] package/musepack: use MUSEPACK_NINJA_OPTS X-BeenThere: buildroot@buildroot.org 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: Eric Le Bihan , Pierre Ducroquet , Samuel Martin , Peter Seiderer , Thomas Petazzoni Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" Replace the usage of MUSEPACK_MAKE with MUSEPACK_NINJA_OPTS to disable the parallel build. Unfortunately switching to Ninja for building CMake packages has not solved the parallel build issues. Signed-off-by: Adrian Perez de Castro --- Changes v1 -> v2: - Tweak muspack package to disallow parallel builds with Ninja. --- package/musepack/musepack.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/musepack/musepack.mk b/package/musepack/musepack.mk index fc66c684a5..000db5fd76 100644 --- a/package/musepack/musepack.mk +++ b/package/musepack/musepack.mk @@ -9,8 +9,8 @@ MUSEPACK_SITE = http://files.musepack.net/source MUSEPACK_SOURCE = musepack_src_$(MUSEPACK_VERSION).tar.gz MUSEPACK_DEPENDENCIES = libcuefile libreplaygain MUSEPACK_INSTALL_STAGING = YES -MUSEPACK_MAKE = $(MAKE1) MUSEPACK_LICENSE = BSD-3-Clause (*mpcdec), LGPL-2.1+ (*mpcenc) MUSEPACK_LICENSE_FILES = libmpcdec/COPYING libmpcenc/quant.c +MUSEPACK_NINJA_OPTS = -j1 $(eval $(cmake-package)) From patchwork Fri Jan 21 15:42:32 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adrian Perez de Castro X-Patchwork-Id: 1582628 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=igalia.com header.i=@igalia.com header.a=rsa-sha256 header.s=20170329 header.b=UdmUhxN+; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=buildroot.org (client-ip=2605:bc80:3010::136; helo=smtp3.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=) Received: from smtp3.osuosl.org (smtp3.osuosl.org [IPv6:2605:bc80:3010::136]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4JgNw14JH2z9sPC for ; Sat, 22 Jan 2022 02:44:01 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id D17B760EB0; Fri, 21 Jan 2022 15:43:58 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id QTjEXQsG1yn8; Fri, 21 Jan 2022 15:43:58 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp3.osuosl.org (Postfix) with ESMTP id 14A3660D7B; Fri, 21 Jan 2022 15:43:57 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp4.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id 59C4E1BF423 for ; Fri, 21 Jan 2022 15:43:03 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id 4893A40231 for ; Fri, 21 Jan 2022 15:43:03 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Authentication-Results: smtp4.osuosl.org (amavisd-new); dkim=pass (2048-bit key) header.d=igalia.com Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id gzc6qUT7OZ1X for ; Fri, 21 Jan 2022 15:43:02 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.8.0 Received: from fanzine2.igalia.com (fanzine2.igalia.com [213.97.179.56]) by smtp4.osuosl.org (Postfix) with ESMTPS id 7611440207 for ; Fri, 21 Jan 2022 15:43:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=igalia.com; s=20170329; h=Content-Transfer-Encoding:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To:Content-Type:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=83x7U1tlSihqX/oPPCjBioKCheM80pF9zZD/ZGIrjnU=; b=UdmUhxN+7Ab3GRuLBbHvZx0/Sm 3d3UXinjbmvIrgPYesaGgoQ4EqMJvMhW27JpvDHtR8RkTkQu65p/VVfHPTyLCftWziWppeAuW4h6D /5sj8H7CqJ6/mBdoOZEDcYxPDFl8ShsSFg5EeVhb4MUdalRai1gPRK2rfRxtjcoBGlMjXbxA7gg5x 5Cc8R7I7IRkMmEtPXT57O5JgGwtDK5n4eFGw5yaH1DvL7pHbwzhawtF4jRy6DSD2im815nFht4S1R uU0y2jKnXcYi4VM4TIUJs7vV4k7Hw6nLnLZJroQY+jIvckrIn/ctG7JsE1/dMp5O9NyPx4zIK8vgA z+coQnXw==; Received: from 91-153-34-128.elisa-laajakaista.fi ([91.153.34.128] helo=kodama) by fanzine2.igalia.com with esmtpsa (Cipher TLS1.3:ECDHE_X25519__RSA_PSS_RSAE_SHA512__AES_256_GCM:256) (Exim) id 1nAw43-000BCn-Pm; Fri, 21 Jan 2022 16:42:59 +0100 Received: from localhost (kodama [local]) by kodama (OpenSMTPD) with ESMTPA id aa6b3313; Fri, 21 Jan 2022 15:42:35 +0000 (UTC) From: Adrian Perez de Castro To: buildroot@buildroot.org Date: Fri, 21 Jan 2022 17:42:32 +0200 Message-Id: <20220121154235.798255-5-aperez@igalia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220121154235.798255-1-aperez@igalia.com> References: <20220112132618.2634250-2-aperez@igalia.com> <20220121154235.798255-1-aperez@igalia.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH RFC v2 4/7] package/mariadb: use HOST_MARIADB_NINJA_OPTS X-BeenThere: buildroot@buildroot.org 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: Eric Le Bihan , Pierre Ducroquet , Samuel Martin , Peter Seiderer , Thomas Petazzoni Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" Replace usage of HOST_MARIADB_MAKE_OPTS with HOST_MARIADB_NINJA_OPTS. Signed-off-by: Adrian Perez de Castro --- Changes v1 -> v2: - Tweeak to use CMake+Ninja infra. --- package/mariadb/mariadb.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/mariadb/mariadb.mk b/package/mariadb/mariadb.mk index db967ca3ed..d24174dd74 100644 --- a/package/mariadb/mariadb.mk +++ b/package/mariadb/mariadb.mk @@ -101,7 +101,7 @@ HOST_MARIADB_CONF_OPTS += -DWITH_SSL=system # -DIMPORT_EXECUTABLES=$(HOST_MARIADB_BUILDDIR)/import_executables.cmake # must then be passed to cmake during target build. # see also https://mariadb.com/kb/en/mariadb/cross-compiling-mariadb/ -HOST_MARIADB_MAKE_OPTS = import_executables +HOST_MARIADB_NINJA_OPTS = import_executables MARIADB_CONF_OPTS += \ -DIMPORT_EXECUTABLES=$(HOST_MARIADB_BUILDDIR)/import_executables.cmake From patchwork Fri Jan 21 15:42:33 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adrian Perez de Castro X-Patchwork-Id: 1582629 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=igalia.com header.i=@igalia.com header.a=rsa-sha256 header.s=20170329 header.b=QMIlDgkO; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=buildroot.org (client-ip=2605:bc80:3010::138; helo=smtp1.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=) Received: from smtp1.osuosl.org (smtp1.osuosl.org [IPv6:2605:bc80:3010::138]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4JgNwD73MDz9sPC for ; Sat, 22 Jan 2022 02:44:12 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id C9755812B8; Fri, 21 Jan 2022 15:44:10 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Uw8hJL2BF3ym; Fri, 21 Jan 2022 15:44:10 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp1.osuosl.org (Postfix) with ESMTP id 0BDB3815CD; Fri, 21 Jan 2022 15:44:08 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp3.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id 6444C1C115D for ; Fri, 21 Jan 2022 15:43:03 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id 526B460DC2 for ; Fri, 21 Jan 2022 15:43:03 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Authentication-Results: smtp3.osuosl.org (amavisd-new); dkim=pass (2048-bit key) header.d=igalia.com Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id UZQ6Hdev5Pwm for ; Fri, 21 Jan 2022 15:43:02 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.8.0 Received: from fanzine2.igalia.com (fanzine2.igalia.com [213.97.179.56]) by smtp3.osuosl.org (Postfix) with ESMTPS id 98BE860D7B for ; Fri, 21 Jan 2022 15:43:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=igalia.com; s=20170329; h=Content-Transfer-Encoding:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To:Content-Type:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=GPzpvVFFXkksNmh1eyB3AA83P31CZt+b5iiXklVQNIk=; b=QMIlDgkOL14gO0NQQ/vTdwAUf5 TsClB1qzp/BiADcZXUc1/YeBJwcgCYwI8T0vnkdDRRKRwNJebhzF3dyoZoZRk+gtzvx27rWEyDEWp 8DsXVyTptJGieABnw/3ciQ14G4nUG+hZM5q8s0PcDH7Mt1b8bJzXJG+vCwt4qYX+9PxLD5KWJSwMW Td05yNmul/5ZOaEecbaJVZUXquWBlwzuafF4qtcMsIrfFPHi72W9yyQ8js6v+P4WxOgYV6W6TRuZA 7nEib9RpB+3JO0n2x6HGyKDnfWBWCFwJA3pNtwU3KvVqYnh6TAA+NsZeBLoiYl+0+2nbs6b2PrGdb YWRxJb6A==; Received: from 91-153-34-128.elisa-laajakaista.fi ([91.153.34.128] helo=kodama) by fanzine2.igalia.com with esmtpsa (Cipher TLS1.3:ECDHE_X25519__RSA_PSS_RSAE_SHA512__AES_256_GCM:256) (Exim) id 1nAw44-000BCQ-9y; Fri, 21 Jan 2022 16:43:00 +0100 Received: from localhost (kodama [local]) by kodama (OpenSMTPD) with ESMTPA id 6c9757a0; Fri, 21 Jan 2022 15:42:35 +0000 (UTC) From: Adrian Perez de Castro To: buildroot@buildroot.org Date: Fri, 21 Jan 2022 17:42:33 +0200 Message-Id: <20220121154235.798255-6-aperez@igalia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220121154235.798255-1-aperez@igalia.com> References: <20220112132618.2634250-2-aperez@igalia.com> <20220121154235.798255-1-aperez@igalia.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH RFC v2 5/7] package/kf5/kf5-extra-cmake-modules: do not build documentation X-BeenThere: buildroot@buildroot.org 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: Eric Le Bihan , Pierre Ducroquet , Samuel Martin , Peter Seiderer , Thomas Petazzoni Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" Pass needed CMake options to disable generating documentations. The documentation is built using python-sphinx, which is not packaged in Buildroot. Prior to this change, if the build host would have a Python installation with the sphinx module installed the automatic detection tried to build documentation, which would fail in cases where the sphinxcontrib-qthelp package is missing from the host Python installation. The error message in this case was: Extension error: Could not import extension ecm (exception: cannot import name 'htmlescape' from 'sphinx.util.pycompat' (/usr/lib/python3.10/site-packages/sphinx/util/pycompat.py)) Signed-off-by: Adrian Perez de Castro --- Changes v1 -> v2: - Add CMake options to skip trying to build documentation. --- .../kf5/kf5-extra-cmake-modules/kf5-extra-cmake-modules.mk | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/package/kf5/kf5-extra-cmake-modules/kf5-extra-cmake-modules.mk b/package/kf5/kf5-extra-cmake-modules/kf5-extra-cmake-modules.mk index 3c4281b960..ba2748456e 100644 --- a/package/kf5/kf5-extra-cmake-modules/kf5-extra-cmake-modules.mk +++ b/package/kf5/kf5-extra-cmake-modules/kf5-extra-cmake-modules.mk @@ -14,4 +14,9 @@ KF5_EXTRA_CMAKE_MODULES_DEPENDENCIES = host-pkgconf KF5_EXTRA_CMAKE_MODULES_INSTALL_STAGING = YES KF5_EXTRA_CMAKE_MODULES_INSTALL_TARGET = NO +KF5_EXTRA_CMAKE_MODULES_CONF_OPTS += \ + -DBUILD_HTML_DOCS=OFF \ + -DBUILD_MAN_DOCS=OFF \ + -DBUILD_QTHELP_DOCS=OFF + $(eval $(cmake-package)) From patchwork Fri Jan 21 15:42:34 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adrian Perez de Castro X-Patchwork-Id: 1582630 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=igalia.com header.i=@igalia.com header.a=rsa-sha256 header.s=20170329 header.b=JXfE6lmx; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=buildroot.org (client-ip=2605:bc80:3010::137; helo=smtp4.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=) Received: from smtp4.osuosl.org (smtp4.osuosl.org [IPv6:2605:bc80:3010::137]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4JgNwT2nPGz9sPC for ; Sat, 22 Jan 2022 02:44:25 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id 974AD4025A; Fri, 21 Jan 2022 15:44:22 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id PNBfKnKyfuCW; Fri, 21 Jan 2022 15:44:21 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp4.osuosl.org (Postfix) with ESMTP id E1C024026E; Fri, 21 Jan 2022 15:44:20 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp2.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id 7FF071BF423 for ; Fri, 21 Jan 2022 15:43:05 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id 7B47840260 for ; Fri, 21 Jan 2022 15:43:05 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Authentication-Results: smtp2.osuosl.org (amavisd-new); dkim=pass (2048-bit key) header.d=igalia.com Received: from smtp2.osuosl.org ([127.0.0.1]) by localhost (smtp2.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id wKCceoaYlUVJ for ; Fri, 21 Jan 2022 15:43:04 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.8.0 Received: from fanzine2.igalia.com (fanzine2.igalia.com [213.97.179.56]) by smtp2.osuosl.org (Postfix) with ESMTPS id B6D2F4011C for ; Fri, 21 Jan 2022 15:43:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=igalia.com; s=20170329; h=Content-Transfer-Encoding:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To:Content-Type:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=p2hoc6wf4fOMQE3HFeuZ4m1UxCAwApvy5jOdpoKEbFA=; b=JXfE6lmxlXXwAyIReT+vBzEI1F 8Mm+Nfoqe8IFm54vlusV5Fubuoy6CRL6RFyx9bPE1d491UWSYDnB8Ly/xesmDbaUGmftau25mendb FyTkiGTKGKz2dYY98IFPCi2V9dPLIsI8EB+IWmikPr6CFd0u7s9XXkOcRKXSmtLCoS59nTAr78hrn imW3kD4KPrz2C9Jqdi6H7uvySZWHI3548MiRUKT3N7Eyb+1C5X/tBQXlExNGJL2XRHtPn7SM4vcyx AGNf/Qzv7qUG6w+GQkehfq+d/mjALPypq+OMW5QLYADW07CQs1GWipnJF1uyxOoxRyz+v8uvKAAAk EzyFv3aA==; Received: from 91-153-34-128.elisa-laajakaista.fi ([91.153.34.128] helo=kodama) by fanzine2.igalia.com with esmtpsa (Cipher TLS1.3:ECDHE_X25519__RSA_PSS_RSAE_SHA512__AES_256_GCM:256) (Exim) id 1nAw44-000BD5-TA; Fri, 21 Jan 2022 16:43:01 +0100 Received: from localhost (kodama [local]) by kodama (OpenSMTPD) with ESMTPA id db066d08; Fri, 21 Jan 2022 15:42:35 +0000 (UTC) From: Adrian Perez de Castro To: buildroot@buildroot.org Date: Fri, 21 Jan 2022 17:42:34 +0200 Message-Id: <20220121154235.798255-7-aperez@igalia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220121154235.798255-1-aperez@igalia.com> References: <20220112132618.2634250-2-aperez@igalia.com> <20220121154235.798255-1-aperez@igalia.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH RFC v2 6/7] package/libcorrect: avoid multiple rules for same target X-BeenThere: buildroot@buildroot.org 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: Eric Le Bihan , Pierre Ducroquet , Samuel Martin , Peter Seiderer , Thomas Petazzoni Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" Signed-off-by: Adrian Perez de Castro --- Changes v1 -> v2: - Avoid CMake generating two targets with the same name. Needs a better fix sent upstream to tweak CMakeLists.txt instead. --- package/libcorrect/libcorrect.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/libcorrect/libcorrect.mk b/package/libcorrect/libcorrect.mk index 0a84aa5c26..225111a64f 100644 --- a/package/libcorrect/libcorrect.mk +++ b/package/libcorrect/libcorrect.mk @@ -10,4 +10,6 @@ LIBCORRECT_LICENSE = BSD-3-Clause LIBCORRECT_LICENSE_FILES = LICENSE LIBCORRECT_INSTALL_STAGING = YES +LIBCORRECT_CONF_OPTS += -DBUILD_SHARED_LIBS=OFF + $(eval $(cmake-package)) From patchwork Fri Jan 21 15:42:35 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adrian Perez de Castro X-Patchwork-Id: 1582631 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=igalia.com header.i=@igalia.com header.a=rsa-sha256 header.s=20170329 header.b=NWVrjIa4; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=buildroot.org (client-ip=140.211.166.136; helo=smtp3.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=) Received: from smtp3.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4JgNwh5nJRz9sPC for ; Sat, 22 Jan 2022 02:44:36 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id E47FC60F3E; Fri, 21 Jan 2022 15:44:34 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id XZKFjLFff6kR; Fri, 21 Jan 2022 15:44:33 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp3.osuosl.org (Postfix) with ESMTP id C377160EB0; Fri, 21 Jan 2022 15:44:32 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp1.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id A297F1BF423 for ; Fri, 21 Jan 2022 15:43:06 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id 9E8DF83E4B for ; Fri, 21 Jan 2022 15:43:06 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Authentication-Results: smtp1.osuosl.org (amavisd-new); dkim=pass (2048-bit key) header.d=igalia.com Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id CjudaNEeu6-S for ; Fri, 21 Jan 2022 15:43:05 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.8.0 Received: from fanzine2.igalia.com (fanzine2.igalia.com [213.97.179.56]) by smtp1.osuosl.org (Postfix) with ESMTPS id 99C8B83E3C for ; Fri, 21 Jan 2022 15:43:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=igalia.com; s=20170329; h=Content-Transfer-Encoding:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To:Content-Type:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=joE/OcubERa4FS4i8wIVams15M81yfRXln+6V6dVQ0s=; b=NWVrjIa4RdNnkLisAUz7hl1q/+ +GZ7AI4Bnm7nKsqGZQuIRzHgSlKGBIDVeA3FG4VdQxIhEsLbRgRG1dmjdQwKpEywLMEaISmYpPVnp XR2FGcx5W1+Wj0mB0BRikdao7uamJivulmQrp4bN0MxoctMhZv/3KtjPEIsgzk6gven+YrKp+FXP4 SkQ4kX+zXHP8SEbU5e2NhVvN5r5oksvRdkCTpxka5q40KVX6ylToR4L3TW6mkZPfixJOfohLtWHL+ SHNDT/RfJdB1s+Mg711Hxk3X+k932wfmst8D0ajXtPzWM9TyhQDYgKnBr45LrMAQ4LWubS1NCJlp4 eGU8AgJw==; Received: from 91-153-34-128.elisa-laajakaista.fi ([91.153.34.128] helo=kodama) by fanzine2.igalia.com with esmtpsa (Cipher TLS1.3:ECDHE_X25519__RSA_PSS_RSAE_SHA512__AES_256_GCM:256) (Exim) id 1nAw47-000BCn-If; Fri, 21 Jan 2022 16:43:03 +0100 Received: from localhost (kodama [local]) by kodama (OpenSMTPD) with ESMTPA id 649c7bf6; Fri, 21 Jan 2022 15:42:35 +0000 (UTC) From: Adrian Perez de Castro To: buildroot@buildroot.org Date: Fri, 21 Jan 2022 17:42:35 +0200 Message-Id: <20220121154235.798255-8-aperez@igalia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220121154235.798255-1-aperez@igalia.com> References: <20220112132618.2634250-2-aperez@igalia.com> <20220121154235.798255-1-aperez@igalia.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH RFC v2 7/7] package/racehound: add patch to support building with ninja X-BeenThere: buildroot@buildroot.org 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: Eric Le Bihan , Pierre Ducroquet , Samuel Martin , Peter Seiderer , Thomas Petazzoni Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" SSIA. Signed-off-by: Adrian Perez de Castro Upstream-Status: https://github.com/euspectre/racehound/pull/6 --- Changes v1 -> v2: - Patch added to call into Kbuild with plain make. --- ...pport-non-Make-generators-e.g.-Ninja.patch | 112 ++++++++++++++++++ 1 file changed, 112 insertions(+) create mode 100644 package/racehound/0002-CMake-Support-non-Make-generators-e.g.-Ninja.patch diff --git a/package/racehound/0002-CMake-Support-non-Make-generators-e.g.-Ninja.patch b/package/racehound/0002-CMake-Support-non-Make-generators-e.g.-Ninja.patch new file mode 100644 index 0000000000..7f90fb8c69 --- /dev/null +++ b/package/racehound/0002-CMake-Support-non-Make-generators-e.g.-Ninja.patch @@ -0,0 +1,112 @@ +From f8d266b017fd76e2de9d20e0bb3951a5338075d1 Mon Sep 17 00:00:00 2001 +From: Adrian Perez de Castro +Date: Fri, 14 Jan 2022 14:33:21 +0200 +Subject: [PATCH] CMake: Support non-Make generators, e.g. Ninja + +--- + cmake/modules/FindKbuild.cmake | 15 +++++++++++++-- + cmake/modules/kbuild_system.cmake | 4 ++-- + cmake/modules/kmodule_files/CMakeLists.txt | 11 +++++++++-- + core/tests/common_target/CMakeLists.txt | 2 +- + 4 files changed, 25 insertions(+), 7 deletions(-) + +diff --git a/cmake/modules/FindKbuild.cmake b/cmake/modules/FindKbuild.cmake +index b79d140..2ba0a78 100644 +--- a/cmake/modules/FindKbuild.cmake ++++ b/cmake/modules/FindKbuild.cmake +@@ -5,6 +5,7 @@ + # (often /lib/modules/${KBUILD_VERSION_STRING}/build) + # KBUILD_INCLUDE_DIR - not used + # KBUILD_FOUND - TRUE if everything is correct, FALSE otherwise ++# KBUILD_MAKE_COMMAND - Command to run for Make invocations. + + if (NOT KBUILD_VERSION_STRING) + set(KBUILD_VERSION_STRING ${CMAKE_SYSTEM_VERSION} CACHE STRING +@@ -18,8 +19,18 @@ endif (NOT KBUILD_BUILD_DIR) + + set(KBUILD_INCLUDE_DIRS "NOT USED") + +-# Note: only KBUILD_BUILD_DIR variable is really used in the project. +-# Other variables defined only for FindModule architecture of CMake. ++# Only makefiles have $(MAKE) defined, in other cases invoke make directly. ++if (CMAKE_GENERATOR STREQUAL "Unix Makefiles") ++ set(KBUILD_MAKE_COMMAND $\(MAKE\)) ++else () ++ find_program(KBUILD_MAKE_COMMAND make REQUIRED) ++ set(KBUILD_MAKE_COMMAND ${KBUILD_MAKE_COMMAND} CC=${CMAKE_C_COMPILER} CFLAGS=${CMAKE_C_FLAGS}) ++endif () ++ ++ ++# Note: only KBUILD_BUILD_DIR and KBUILD_MAKE_COMMAND variables are really ++# used in the project. Other variables defined only for FindModule ++# architecture of CMake. + + # Handle the QUIETLY and REQUIRED arguments and set KBUILD_FOUND to TRUE if + # all listed variables are TRUE +diff --git a/cmake/modules/kbuild_system.cmake b/cmake/modules/kbuild_system.cmake +index e28ef33..e4e33df 100644 +--- a/cmake/modules/kbuild_system.cmake ++++ b/cmake/modules/kbuild_system.cmake +@@ -262,13 +262,13 @@ function(kbuild_add_module name) + > "${_dir}.${_name}.o.cmd") + endforeach(shipped_source_noext_abs ${shipped_source_noext_abs}) + endif(shipped_sources_noext_abs) +- ++ + # The rule to create module + add_custom_command( + OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${name}.ko ${symvers_file} + ${cmd_create_command} + ${symvers_command} +- COMMAND $(MAKE) -C ${KBUILD_BUILD_DIR} ++ COMMAND ${KBUILD_MAKE_COMMAND} -C ${KBUILD_BUILD_DIR} + M=${CMAKE_CURRENT_BINARY_DIR} modules + DEPENDS ${depend_files} + ) +diff --git a/cmake/modules/kmodule_files/CMakeLists.txt b/cmake/modules/kmodule_files/CMakeLists.txt +index 1147cc5..6115153 100644 +--- a/cmake/modules/kmodule_files/CMakeLists.txt ++++ b/cmake/modules/kmodule_files/CMakeLists.txt +@@ -5,7 +5,7 @@ if (NOT KERNELDIR) + set(KERNELDIR /lib/modules/${KBUILD_VERSION_STRING}/build) + endif (NOT KERNELDIR) + +-set(PWD $\(shell pwd\)) ++set(PWD $$\(pwd\)) + + project(kmodule_try_compile) + # Create rule for produce file from another file via copiing +@@ -27,9 +27,16 @@ if(COPY_FILE) + copy_file("${COPY_FILE}" "${CMAKE_CURRENT_BINARY_DIR}/try_compile.ko") + endif(COPY_FILE) + ++# Only makefiles have $(MAKE) defined, in other cases invoke make directly. ++if (CMAKE_GENERATOR STREQUAL "Unix Makefiles") ++ set(KBUILD_MAKE_COMMAND $\(MAKE\)) ++else () ++ find_program(KBUILD_MAKE_COMMAND make REQUIRED) ++endif () ++ + # Rule to produce try_compile.ko from try_compile.c + add_custom_command(OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/try_compile.ko" +- COMMAND $(MAKE) -C ${KERNELDIR} M=${PWD} modules ++ COMMAND ${KBUILD_MAKE_COMMAND} -C ${KERNELDIR} M=${PWD} modules + DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/try_compile.c") + + # Kbuild system cannot work with out-of-source build, +diff --git a/core/tests/common_target/CMakeLists.txt b/core/tests/common_target/CMakeLists.txt +index cf257ad..fe48e68 100644 +--- a/core/tests/common_target/CMakeLists.txt ++++ b/core/tests/common_target/CMakeLists.txt +@@ -17,7 +17,7 @@ add_custom_target("common_target_module" + + add_custom_command( + OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/${KMODULE_NAME}.ko" +- COMMAND $(MAKE) -f module.makefile ++ COMMAND ${KBUILD_MAKE_COMMAND} -f module.makefile + DEPENDS + "${CMAKE_CURRENT_BINARY_DIR}/cfake.c" + "${CMAKE_CURRENT_BINARY_DIR}/cfake.h" +-- +2.34.1 +