From mboxrd@z Thu Jan  1 00:00:00 1970
Delivery-date: Fri, 24 Mar 2023 10:04:06 +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 <ptxdist-bounces+lore=lore.pengutronix.de@pengutronix.de>)
	id 1pfdLB-00D3jt-Gs
	for lore@lore.pengutronix.de; Fri, 24 Mar 2023 10:04:06 +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 <ptxdist-bounces@pengutronix.de>)
	id 1pfdLA-0008PB-Eu; Fri, 24 Mar 2023 10:04:04 +0100
Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2])
 by metis.ext.pengutronix.de with esmtps
 (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92)
 (envelope-from <mol@pengutronix.de>)
 id 1pfdKh-00089u-45; Fri, 24 Mar 2023 10:03:35 +0100
Received: from [2a0a:edc0:0:1101:1d::54] (helo=dude05.red.stw.pengutronix.de)
 by drehscheibe.grey.stw.pengutronix.de with esmtp (Exim 4.94.2)
 (envelope-from <mol@pengutronix.de>)
 id 1pfdKg-006LC6-GT; Fri, 24 Mar 2023 10:03:34 +0100
Received: from mol by dude05.red.stw.pengutronix.de with local (Exim 4.94.2)
 (envelope-from <mol@pengutronix.de>)
 id 1pfdKf-001FVz-Sj; Fri, 24 Mar 2023 10:03:33 +0100
From: Michael Olbrich <m.olbrich@pengutronix.de>
To: ptxdist@pengutronix.de
Date: Fri, 24 Mar 2023 10:03:33 +0100
Message-Id: <20230324090333.297844-1-m.olbrich@pengutronix.de>
X-Mailer: git-send-email 2.30.2
In-Reply-To: <20230314140010.2452314-2-p.zabel@pengutronix.de>
References: <20230314140010.2452314-2-p.zabel@pengutronix.de>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Subject: Re: [ptxdist] [APPLIED] 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 <ptxdist.pengutronix.de>
List-Unsubscribe: <http://metis.pengutronix.de/cgi-bin/mailman/options/ptxdist>, 
 <mailto:ptxdist-request@pengutronix.de?subject=unsubscribe>
List-Archive: <http://metis.pengutronix.de/cgi-bin/mailman/private/ptxdist/>
List-Post: <mailto:ptxdist@pengutronix.de>
List-Help: <mailto:ptxdist-request@pengutronix.de?subject=help>
List-Subscribe: <http://metis.pengutronix.de/cgi-bin/mailman/listinfo/ptxdist>, 
 <mailto:ptxdist-request@pengutronix.de?subject=subscribe>
Reply-To: ptxdist@pengutronix.de
Cc: Philipp Zabel <p.zabel@pengutronix.de>
Sender: "ptxdist" <ptxdist-bounces@pengutronix.de>
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

Thanks, applied as c9a53bbdff81304ec3b6b7a69f744d50c1aea8f1.

Michael

[sent from post-receive hook]

On Fri, 24 Mar 2023 10:03:33 +0100, Philipp Zabel <p.zabel@pengutronix.de> wrote:
> Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
> Message-Id: <20230314140010.2452314-2-p.zabel@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> 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