From: Fred Morcos <fred.morcos@open-xchange.com>
Date: Fri, 18 Aug 2023 19:09:53 +0000 (+0200)
Subject: Meson: Don't lookup the venv module for Python anymore
X-Git-Tag: rec-5.1.0-alpha1~80^2~187
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1062e0ba5564fa62200f35c5b78265bfbc18c0a1;p=thirdparty%2Fpdns.git

Meson: Don't lookup the venv module for Python anymore
---

diff --git a/meson/python-venv/meson.build b/meson-archive/python-venv/meson.build
similarity index 100%
rename from meson/python-venv/meson.build
rename to meson-archive/python-venv/meson.build
diff --git a/meson.build b/meson.build
index 9f9ad309ef..0a771669cc 100644
--- a/meson.build
+++ b/meson.build
@@ -63,7 +63,7 @@ subdir('meson' / 'unit-tests')              # Unit Tests
 subdir('meson' / 'auth-backend-unit-tests') # Auth Backend Unit Tests
 subdir('meson' / 'reproducible')            # Reproducible Builds
 subdir('meson' / 'fuzz-targets')            # Fuzzing Targets
-subdir('meson' / 'python-venv')             # Python Venv
+subdir('meson' / 'python')                  # Python
 subdir('meson' / 'from-git')                # From Git
 subdir('meson' / 'dlopen')                  # dlopen
 subdir('meson' / 'verbose-logging')         # Verbose Logging
@@ -87,19 +87,19 @@ if not ragel.found() and not fs.exists('pdns' / 'dnslabeltext.cc')
 endif
 
 # Swagger
-if not fs.exists('pdns' / 'api-swagger.json') and not python_have_venv
-  error('Python3 and/or its venv module is not available and ' +
-        '`pdns/api-swagger.json` cannot be found. ' +
-        'The Authoritative Server cannot be built.')
-endif
+# if not fs.exists('pdns' / 'api-swagger.json') and not python_have_venv
+#   error('Python3 and/or its venv module is not available and ' +
+#         '`pdns/api-swagger.json` cannot be found. ' +
+#         'The Authoritative Server cannot be built.')
+# endif
 # TODO Generate api-swagger.json
 
 # Manpages
-if not fs.exists('docs' / 'pdns_server.1') and not python_have_venv
-  warning('Python3 and/or its venv module is not available and ' +
-          '`docs/pdns_server.1` cannot be found. ' +
-          'Documentation will not be built.')
-endif
+# if not fs.exists('docs' / 'pdns_server.1') and not python_have_venv
+#   warning('Python3 and/or its venv module is not available and ' +
+#           '`docs/pdns_server.1` cannot be found. ' +
+#           'Documentation will not be built.')
+# endif
 # TODO Generate pdns_server.1 manpage
 
 # Modules
diff --git a/meson/python/meson.build b/meson/python/meson.build
new file mode 100644
index 0000000000..8655beed8d
--- /dev/null
+++ b/meson/python/meson.build
@@ -0,0 +1,6 @@
+py = import('python')
+python_prog = py.find_installation('python3', required: false)
+
+summary('Python', python_prog.found(), bool_yn: true, section: 'Python')
+summary('Path', python_prog.full_path(), section: 'Python')
+summary('Version', python_prog.version(), section: 'Python')