[ptxdist] [PATCH] host-harfbuzz: Follow the meson conversion of target harfbuzz.

[ptxdist] [PATCH] host-harfbuzz: Follow the meson conversion of target harfbuzz.

[Christian Melki]

I don't have a test target for host-harfbuzz (can't find a selection of it).
So maybe someone else can test this?

Signed-off-by: Christian Melki <christian.melki@t2data.com>
---
 rules/host-harfbuzz.in   |  1 +
 rules/host-harfbuzz.make | 47 ++++++++++++++++++++--------------------
 2 files changed, 25 insertions(+), 23 deletions(-)

diff --git a/rules/host-harfbuzz.in b/rules/host-harfbuzz.in
index 8b0c63052..388def30e 100644
--- a/rules/host-harfbuzz.in
+++ b/rules/host-harfbuzz.in
@@ -2,6 +2,7 @@
 
 config HOST_HARFBUZZ
 	tristate
+	select HOST_MESON
 	select HOST_FREETYPE
 	select HOST_GLIB
 	select HOST_GRAPHITE2		if HOST_HARFBUZZ_GRAPHITE
diff --git a/rules/host-harfbuzz.make b/rules/host-harfbuzz.make
index af48caeb2..f23089319 100644
--- a/rules/host-harfbuzz.make
+++ b/rules/host-harfbuzz.make
@@ -15,29 +15,30 @@ HOST_PACKAGES-$(PTXCONF_HOST_HARFBUZZ) += host-harfbuzz
 # Prepare
 # ----------------------------------------------------------------------------
 
-#
-# autoconf
-#
-HOST_HARFBUZZ_CONF_TOOL	:= autoconf
+HOST_HARFBUZZ_CONF_TOOL	:= meson
 HOST_HARFBUZZ_CONF_OPT	:=  \
-	$(HOST_AUTOCONF) \
-	--disable-code-coverage \
-	--disable-static \
-	--disable-gtk-doc \
-	--disable-gtk-doc-html \
-	--disable-gtk-doc-pdf \
-	--disable-introspection \
-	--without-libstdc++ \
-	--with-glib \
-	--without-gobject \
-	--without-cairo \
-	--without-chafa \
-	--$(call ptx/wwo, PTXCONF_HOST_HARFBUZZ_ICU)-icu \
-	--$(call ptx/wwo, PTXCONF_HOST_HARFBUZZ_GRAPHITE)-graphite2 \
-	--with-freetype \
-	--without-uniscribe \
-	--without-gdi \
-	--without-directwrite \
-	--without-coretext
+	 $(HOST_MESON_OPT) \
+	-Dbenchmark=disabled \
+	-Dcairo=disabled \
+	-Dchafa=disabled \
+	-Dcoretext=disabled \
+	-Ddirectwrite=disabled \
+	-Ddoc_tests=false \
+	-Ddocs=disabled \
+	-Dexperimental_api=false \
+	-Dfreetype=enabled \
+	-Dfuzzer_ldflags="" \
+	-Dgdi=disabled \
+	-Dglib=enabled \
+	-Dgobject=disabled \
+	-Dgraphite=disabled \
+	-Dgraphite2=$(call ptx/endis, PTXCONF_HOST_HARFBUZZ_GRAPHITE)d \
+	-Dicu=$(call ptx/endis, PTXCONF_HOST_HARFBUZZ_ICU)d \
+	-Dicu_builtin=false \
+	-Dintrospection=disabled \
+	-Dragel_subproject=false \
+	-Dtests=disabled \
+	-Dutilities=disabled \
+	-Dwasm=disabled
 
 # vim: syntax=make
-- 
2.34.1

Re: [ptxdist] [APPLIED] host-harfbuzz: Follow the meson conversion of target harfbuzz.

[Michael Olbrich]

Thanks, applied as 504b0e912c25a2566bc0c1a3086fae20f4dc47eb.

Michael

[sent from post-receive hook]

On Thu, 08 Feb 2024 17:03:18 +0100, Christian Melki <christian.melki@t2data.com> wrote:
> I don't have a test target for host-harfbuzz (can't find a selection of it).
> So maybe someone else can test this?
> 
> Signed-off-by: Christian Melki <christian.melki@t2data.com>
> Message-Id: <20240129194542.1105490-1-christian.melki@t2data.com>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/rules/host-harfbuzz.in b/rules/host-harfbuzz.in
> index 8b0c63052ea0..388def30ea58 100644
> --- a/rules/host-harfbuzz.in
> +++ b/rules/host-harfbuzz.in
> @@ -2,6 +2,7 @@
>  
>  config HOST_HARFBUZZ
>  	tristate
> +	select HOST_MESON
>  	select HOST_FREETYPE
>  	select HOST_GLIB
>  	select HOST_GRAPHITE2		if HOST_HARFBUZZ_GRAPHITE
> diff --git a/rules/host-harfbuzz.make b/rules/host-harfbuzz.make
> index af48caeb20d8..f23089319d15 100644
> --- a/rules/host-harfbuzz.make
> +++ b/rules/host-harfbuzz.make
> @@ -15,29 +15,30 @@ HOST_PACKAGES-$(PTXCONF_HOST_HARFBUZZ) += host-harfbuzz
>  # Prepare
>  # ----------------------------------------------------------------------------
>  
> -#
> -# autoconf
> -#
> -HOST_HARFBUZZ_CONF_TOOL	:= autoconf
> +HOST_HARFBUZZ_CONF_TOOL	:= meson
>  HOST_HARFBUZZ_CONF_OPT	:=  \
> -	$(HOST_AUTOCONF) \
> -	--disable-code-coverage \
> -	--disable-static \
> -	--disable-gtk-doc \
> -	--disable-gtk-doc-html \
> -	--disable-gtk-doc-pdf \
> -	--disable-introspection \
> -	--without-libstdc++ \
> -	--with-glib \
> -	--without-gobject \
> -	--without-cairo \
> -	--without-chafa \
> -	--$(call ptx/wwo, PTXCONF_HOST_HARFBUZZ_ICU)-icu \
> -	--$(call ptx/wwo, PTXCONF_HOST_HARFBUZZ_GRAPHITE)-graphite2 \
> -	--with-freetype \
> -	--without-uniscribe \
> -	--without-gdi \
> -	--without-directwrite \
> -	--without-coretext
> +	 $(HOST_MESON_OPT) \
> +	-Dbenchmark=disabled \
> +	-Dcairo=disabled \
> +	-Dchafa=disabled \
> +	-Dcoretext=disabled \
> +	-Ddirectwrite=disabled \
> +	-Ddoc_tests=false \
> +	-Ddocs=disabled \
> +	-Dexperimental_api=false \
> +	-Dfreetype=enabled \
> +	-Dfuzzer_ldflags="" \
> +	-Dgdi=disabled \
> +	-Dglib=enabled \
> +	-Dgobject=disabled \
> +	-Dgraphite=disabled \
> +	-Dgraphite2=$(call ptx/endis, PTXCONF_HOST_HARFBUZZ_GRAPHITE)d \
> +	-Dicu=$(call ptx/endis, PTXCONF_HOST_HARFBUZZ_ICU)d \
> +	-Dicu_builtin=false \
> +	-Dintrospection=disabled \
> +	-Dragel_subproject=false \
> +	-Dtests=disabled \
> +	-Dutilities=disabled \
> +	-Dwasm=disabled
>  
>  # vim: syntax=make