Attachment 241007 Details for Bug 270361 – v1 (apply via "git am")

[patch] v1 (apply via "git am")

bug270361.diff (text/plain), 4.82 KB, created by Jan Beich on 2023-03-20 15:18:58 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jan Beich

Created: 2023-03-20 15:18:58 UTC

Size: 4.82 KB

patch

obsolete

>From 5c7a581408205693c1023766e9635f066a323cb1 Mon Sep 17 00:00:00 2001
>From: Jan Beich <jbeich@FreeBSD.org>
>Date: Mon, 20 Mar 2023 13:30:11 +0000
>Subject: [PATCH] Mk/Uses/meson.mk: add --auto-features=enabled to improve
> determinism
>
>Drop redundant -D<option>=enabled in consumers by desktop@ and gnome@
>
>PR:		270361
>Inspired by:	Arch, Void
>Exp-run by:	antoine
>---
> Mk/Uses/meson.mk             | 4 ++++
> audio/rhythmbox/Makefile     | 4 +---
> games/libmanette/Makefile    | 2 --
> lang/cjs/Makefile            | 2 --
> lang/gjs/Makefile            | 4 +---
> multimedia/libdv/Makefile    | 2 +-
> net/glib-networking/Makefile | 2 --
> print/harfbuzz/Makefile      | 3 +--
> x11-toolkits/gtk40/Makefile  | 2 +-
> 9 files changed, 9 insertions(+), 16 deletions(-)
>
>diff --git a/Mk/Uses/meson.mk b/Mk/Uses/meson.mk
>index 9affd4b9ed4e..c7738110db64 100644
>--- a/Mk/Uses/meson.mk
>+++ b/Mk/Uses/meson.mk
>@@ -36,6 +36,10 @@ CONFIGURE_ARGS+=	--prefix ${PREFIX} \
> 			--mandir man \
> 			--infodir ${INFO_PATH}
> 
>+# Enable all optional features to make builds deterministic. Consumers can
>+# expose those as port OPTIONS_* or explicitly pass -D<option>=disabled
>+CONFIGURE_ARGS+=	--auto-features=enabled
>+
> # Disable color output.  Meson forces it on by default, Ninja
> # strips it before it goes to the log, but Samurai does not, so we
> # might end up with ANSI escape sequences in the logs.
>diff --git a/audio/rhythmbox/Makefile b/audio/rhythmbox/Makefile
>index 40287a5fea46..28121d2e171a 100644
>--- a/audio/rhythmbox/Makefile
>+++ b/audio/rhythmbox/Makefile
>@@ -29,9 +29,7 @@ USES=		desktop-file-utils gettext gnome gstreamer localbase:ldflags meson \
> USE_GNOME=	cairo gdkpixbuf2 glib20 gtk30 introspection libxml2
> USE_XORG=	ice x11 xorgproto
> USE_GSTREAMER=	flac lame jpeg cdparanoia vorbis
>-MESON_ARGS=	-Dplugins_vala=enabled \
>-		-Dlibsecret=enabled \
>-		-Dgtk_doc=false \
>+MESON_ARGS=	-Dgtk_doc=false \
> 		-Dtests=disabled
> USE_LDCONFIG=	yes
> 
>diff --git a/games/libmanette/Makefile b/games/libmanette/Makefile
>index 732a689ded5e..e710aef00a15 100644
>--- a/games/libmanette/Makefile
>+++ b/games/libmanette/Makefile
>@@ -19,8 +19,6 @@ USES=		compiler:c11 gnome meson pkgconfig tar:xz vala:build
> USE_GNOME=	glib20 introspection
> USE_LDCONFIG=	yes
> 
>-MESON_ARGS=	-Dgudev=enabled
>-
> OPTIONS_DEFINE=	DOCS EXAMPLES TEST
> OPTIONS_SUB=	yes
> 
>diff --git a/lang/cjs/Makefile b/lang/cjs/Makefile
>index c9fca6864b3b..420f46a20de9 100644
>--- a/lang/cjs/Makefile
>+++ b/lang/cjs/Makefile
>@@ -24,8 +24,6 @@ USES=		compiler:c++17-lang gettext gnome localbase meson pkgconfig \
> USE_GNOME=	cairo gdkpixbuf2 gtk30 introspection
> USE_XORG=	x11 xext
> MESON_ARGS=	-Dinstalled_tests=false \
>-		-Dcairo=enabled \
>-		-Dreadline=enabled \
> 		-Dprofiler=disabled
> USE_LDCONFIG=	yes
> 
>diff --git a/lang/gjs/Makefile b/lang/gjs/Makefile
>index abb0da48a273..dbc3b34e50ae 100644
>--- a/lang/gjs/Makefile
>+++ b/lang/gjs/Makefile
>@@ -22,9 +22,7 @@ USES=		compiler:c++11-lib gettext gnome \
> 		localbase meson pkgconfig python:build readline tar:xz xorg
> USE_GNOME=	cairo gdkpixbuf2 gtk30 introspection
> USE_XORG=	x11 xext
>-MESON_ARGS=	-Dcairo=enabled \
>-		-Dreadline=enabled \
>-		-Dprofiler=disabled \
>+MESON_ARGS=	-Dprofiler=disabled \
> 		-Dinstalled_tests=false
> USE_LDCONFIG=	yes
> 
>diff --git a/multimedia/libdv/Makefile b/multimedia/libdv/Makefile
>index 6e7b6d3892de..c6de6c1f06be 100644
>--- a/multimedia/libdv/Makefile
>+++ b/multimedia/libdv/Makefile
>@@ -24,6 +24,6 @@ USE_LDCONFIG=	yes
> 
> LDFLAGS_i386=	-Wl,-znotext
> 
>-MESON_ARGS=	-Dpopt=enabled -Dtools=enabled
>+MESON_ARGS=	-Dtools=enabled
> 
> .include <bsd.port.mk>
>diff --git a/net/glib-networking/Makefile b/net/glib-networking/Makefile
>index d932dc698a7f..fa8270f77185 100644
>--- a/net/glib-networking/Makefile
>+++ b/net/glib-networking/Makefile
>@@ -23,8 +23,6 @@ USES=		compiler:c11 gettext gnome localbase meson pkgconfig \
> 		python:3.7+,build tar:xz
> USE_GNOME=	glib20
> 
>-MESON_ARGS=	-Denvironment_proxy=enabled
>-
> BINARY_ALIAS=	python3=${PYTHON_VERSION}
> 
> post-install:
>diff --git a/print/harfbuzz/Makefile b/print/harfbuzz/Makefile
>index ec46ed76f8e1..06c3e0908107 100644
>--- a/print/harfbuzz/Makefile
>+++ b/print/harfbuzz/Makefile
>@@ -21,8 +21,7 @@ USE_LDCONFIG=	yes
> SHEBANG_GLOB=	*.py
> CPE_VENDOR=	harfbuzz_project
> 
>-MESON_ARGS=	-Dglib=enabled -Dgobject=enabled -Dgraphite2=enabled \
>-		-Dchafa=disabled -Dfreetype=enabled -Dtests=disabled
>+MESON_ARGS=	-Dgraphite2=enabled -Dchafa=disabled -Dtests=disabled
> 
> PLIST_SUB+=	LIBVER=0.60710.0
> 
>diff --git a/x11-toolkits/gtk40/Makefile b/x11-toolkits/gtk40/Makefile
>index be5430f33c43..f8175c06e50b 100644
>--- a/x11-toolkits/gtk40/Makefile
>+++ b/x11-toolkits/gtk40/Makefile
>@@ -32,7 +32,7 @@ USE_LDCONFIG=	yes
> USE_PERL5=	build
> USE_GNOME=	atk cairo gdkpixbuf2 introspection:build pango \
> 		librsvg2:run
>-MESON_ARGS=	-Dintrospection=enabled -Dbuild-testsuite=false
>+MESON_ARGS=	-Dbuild-testsuite=false
> LDFLAGS+=	-lexecinfo
> 
> BINARY_ALIAS=	python3=${PYTHON_CMD}

Actions: View | Diff

Attachments on bug 270361: 241007 | 241057