From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Tue, 14 Mar 2023 15:00:57 +0100 Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1pc5Cy-00Ee5K-5z for lore@lore.pengutronix.de; Tue, 14 Mar 2023 15:00:57 +0100 Received: from localhost ([127.0.0.1] helo=metis.ext.pengutronix.de) by metis.ext.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1pc5Cy-0005hX-B9; Tue, 14 Mar 2023 15:00:56 +0100 Received: from dude05.red.stw.pengutronix.de ([2a0a:edc0:0:1101:1d::54]) by metis.ext.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1pc5CM-0005Sc-QQ; Tue, 14 Mar 2023 15:00:18 +0100 From: Philipp Zabel To: ptxdist@pengutronix.de Date: Tue, 14 Mar 2023 15:00:10 +0100 Message-Id: <20230314140010.2452314-2-p.zabel@pengutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230314140010.2452314-1-p.zabel@pengutronix.de> References: <20230314140010.2452314-1-p.zabel@pengutronix.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [ptxdist] [PATCH 2/2] waffle: switch to meson build system X-BeenThere: ptxdist@pengutronix.de X-Mailman-Version: 2.1.29 Precedence: list List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: ptxdist@pengutronix.de Cc: Philipp Zabel Sender: "ptxdist" X-SA-Exim-Connect-IP: 127.0.0.1 X-SA-Exim-Mail-From: ptxdist-bounces@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false Signed-off-by: Philipp Zabel --- rules/waffle.in | 3 +-- rules/waffle.make | 27 ++++++++++++--------------- 2 files changed, 13 insertions(+), 17 deletions(-) diff --git a/rules/waffle.in b/rules/waffle.in index 1a5339407f8c..a125621f9c7c 100644 --- a/rules/waffle.in +++ b/rules/waffle.in @@ -3,8 +3,7 @@ menuconfig WAFFLE tristate prompt "waffle " - select HOST_CMAKE - select HOST_NINJA + select HOST_MESON select MESALIB select LIBXCB if WAFFLE_GLX || WAFFLE_X11_EGL select XORG_LIB_X11 if WAFFLE_GLX || WAFFLE_X11_EGL diff --git a/rules/waffle.make b/rules/waffle.make index cfea0e37ebde..4c53b9116351 100644 --- a/rules/waffle.make +++ b/rules/waffle.make @@ -29,24 +29,21 @@ WAFFLE_LICENSE_FILES := \ # Prepare # ---------------------------------------------------------------------------- -WAFFLE_CONF_TOOL := cmake +WAFFLE_CONF_TOOL := meson WAFFLE_CONF_OPT := \ - $(CROSS_CMAKE_USR) \ - -G Ninja \ - -DVALGRIND_EXECUTABLE= \ + $(CROSS_MESON_USR) \ + -Dbuild-examples=false \ + -Dbuild-htmldocs=false \ + -Dbuild-manpages=false \ + -Dbuild-tests=false \ + -Dgbm=$(call ptx/endis,PTXCONF_WAFFLE_GBM)d \ + -Dglx=$(call ptx/endis,PTXCONF_WAFFLE_GLX)d \ + -Dnacl=false \ -Dnacl_sdk_path= \ -Dnacl_version= \ - -Dwaffle_build_examples=OFF \ - -Dwaffle_build_htmldocs=OFF \ - -Dwaffle_build_manpages=OFF \ - -Dwaffle_build_tests=OFF \ - -Dwaffle_has_gbm=$(call ptx/onoff,PTXCONF_WAFFLE_GBM) \ - -Dwaffle_has_glx=$(call ptx/onoff,PTXCONF_WAFFLE_GLX) \ - -Dwaffle_has_nacl=OFF \ - -Dwaffle_has_surfaceless_egl=OFF \ - -Dwaffle_has_wayland=$(call ptx/onoff,PTXCONF_WAFFLE_WAYLAND) \ - -Dwaffle_has_x11_egl=$(call ptx/onoff,PTXCONF_WAFFLE_X11_EGL) \ - -Dwaffle_xsltproc= + -Dsurfaceless_egl=disabled \ + -Dwayland=$(call ptx/endis,PTXCONF_WAFFLE_WAYLAND)d \ + -Dx11_egl=$(call ptx/endis,PTXCONF_WAFFLE_X11_EGL)d # ---------------------------------------------------------------------------- # Target-Install -- 2.30.2