From: Philipp Zabel <p.zabel@pengutronix.de>
To: ptxdist@pengutronix.de
Cc: Philipp Zabel <p.zabel@pengutronix.de>
Subject: [ptxdist] [PATCH 2/2] waffle: switch to meson build system
Date: Tue, 14 Mar 2023 15:00:10 +0100 [thread overview]
Message-ID: <20230314140010.2452314-2-p.zabel@pengutronix.de> (raw)
In-Reply-To: <20230314140010.2452314-1-p.zabel@pengutronix.de>
Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
---
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
next prev parent reply other threads:[~2023-03-14 14:00 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-03-14 14:00 [ptxdist] [PATCH 1/2] waffle: version bump 1.7.0 -> 1.7.2 Philipp Zabel
2023-03-14 14:00 ` Philipp Zabel [this message]
2023-03-24 9:03 ` [ptxdist] [APPLIED] waffle: switch to meson build system Michael Olbrich
2023-03-24 9:03 ` [ptxdist] [APPLIED] waffle: version bump 1.7.0 -> 1.7.2 Michael Olbrich
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230314140010.2452314-2-p.zabel@pengutronix.de \
--to=p.zabel@pengutronix.de \
--cc=ptxdist@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox