summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNirbheek Chauhan <nirbheek@centricular.com>2017-01-28 06:52:15 +0530
committerNirbheek Chauhan <nirbheek@centricular.com>2017-01-28 06:54:10 +0530
commitd82bedc2273cdd885c7d8d6d4d9b0b0b72278f9c (patch)
tree5cf7bf50d3327d158c9ba2649dfc1575d8fa56fd
parent7c902e3e2be1835d2b626b6a2dcceb313b12c82f (diff)
downloadlibepoxy-d82bedc2273cdd885c7d8d6d4d9b0b0b72278f9c.tar.gz
meson: Don't call find_program objects with python
On UNIX-like OSes, the OS will read the shebang and use the correct interpreter, and on Windows, Meson will read the shebang and use the correct interpreter. Adding it manually will cause python to try to interpret python
-rw-r--r--include/epoxy/meson.build4
-rw-r--r--meson.build5
-rw-r--r--src/meson.build4
3 files changed, 0 insertions, 13 deletions
diff --git a/include/epoxy/meson.build b/include/epoxy/meson.build
index 38fe4ad..623a9fe 100644
--- a/include/epoxy/meson.build
+++ b/include/epoxy/meson.build
@@ -4,7 +4,6 @@ gl_generated = custom_target('gl_generated.h',
'gl_generated.h',
],
command: [
- python,
gen_dispatch_py,
'--header',
'--no-source',
@@ -24,7 +23,6 @@ if build_egl
'egl_generated.h',
],
command: [
- python,
gen_dispatch_py,
'--header',
'--no-source',
@@ -44,7 +42,6 @@ if build_glx
'glx_generated.h',
],
command: [
- python,
gen_dispatch_py,
'--header',
'--no-source',
@@ -64,7 +61,6 @@ if build_wgl
'wgl_generated.h',
],
command: [
- python,
gen_dispatch_py,
'--header',
'--no-source',
diff --git a/meson.build b/meson.build
index 88d5b74..c4d132f 100644
--- a/meson.build
+++ b/meson.build
@@ -132,11 +132,6 @@ configure_file(input: 'epoxy.pc.in',
install: true,
install_dir: join_paths(epoxy_libdir, 'pkgconfig'))
-# Find Python for gen_dispatch
-# XXX: With Meson 0.37 we should use
-# python = import('python3').find_python()
-python = find_program('python3')
-
# Generates the dispatch tables
gen_dispatch_py = find_program('src/gen_dispatch.py')
diff --git a/src/meson.build b/src/meson.build
index 05d4f7b..27c1bb5 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -12,7 +12,6 @@ gl_generated = custom_target('gl_generated_dispatch.c',
'gl_generated_dispatch.c',
],
command: [
- python,
gen_dispatch_py,
'--source',
'--no-header',
@@ -30,7 +29,6 @@ if build_egl
'egl_generated_dispatch.c',
],
command: [
- python,
gen_dispatch_py,
'--source',
'--no-header',
@@ -48,7 +46,6 @@ if build_glx
'glx_generated_dispatch.c',
],
command: [
- python,
gen_dispatch_py,
'--source',
'--no-header',
@@ -66,7 +63,6 @@ if build_wgl
'wgl_generated_dispatch.c',
],
command: [
- python,
gen_dispatch_py,
'--source',
'--no-header',