mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-28 17:48:58 +00:00
f1b7f45f8c
Release Notes: https://mirrors.edge.kernel.org/pub/linux/utils/util-linux/v2.40/v2.40-ReleaseNotes https://mirrors.edge.kernel.org/pub/linux/utils/util-linux/v2.40/v2.40.1-ReleaseNotes Remove upstreamed: 001-meson-properly-handle-gettext-non-existence.patch New: 0001-meson-Fix-build-python-option.patch Signed-off-by: Thomas Weißschuh <thomas@t-8ch.de>
32 lines
1.0 KiB
Diff
32 lines
1.0 KiB
Diff
From b66b70d62e50923502aeb3f6420a5f9c20f769d3 Mon Sep 17 00:00:00 2001
|
|
From: Jordan Williams <jordan@jwillikers.com>
|
|
Date: Thu, 9 May 2024 15:57:12 -0500
|
|
Subject: [PATCH] meson: Fix build-python option
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
The build-python option is for controlling whether or not pylibmount is
|
|
built.
|
|
Unfortunately, commit b6799cc rendered the option unused.
|
|
This change uses the build-python option again.
|
|
|
|
Signed-off-by: Jordan Williams <jordan@jwillikers.com>
|
|
Signed-off-by: Thomas Weißschuh <thomas@t-8ch.de>
|
|
---
|
|
libmount/python/meson.build | 40 ++++++++++++++++++-------------------
|
|
1 file changed, 20 insertions(+), 20 deletions(-)
|
|
|
|
diff --git a/libmount/python/meson.build b/libmount/python/meson.build
|
|
index 72985eca6b21..5dcdf807da89 100644
|
|
--- a/libmount/python/meson.build
|
|
+++ b/libmount/python/meson.build
|
|
@@ -1,4 +1,6 @@
|
|
-build_python = python.found()
|
|
+if get_option('build-python').disabled()
|
|
+ subdir_done()
|
|
+endif
|
|
|
|
pylibmount_sources = '''
|
|
pylibmount.c
|