Merge pull request #213 from anholt/no-python2

Remove Python 2 support
macos/v1.5.9
Emmanuele Bassi 5 years ago committed by GitHub
commit d43eae8714
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      configure.ac
  2. 1
      include/epoxy/meson.build
  3. 6
      meson.build
  4. 1
      src/gen_dispatch.py
  5. 1
      src/meson.build

@ -41,7 +41,7 @@ m4_ifndef([XORG_MACROS_VERSION],
XORG_MACROS_VERSION(1.8) XORG_MACROS_VERSION(1.8)
XORG_DEFAULT_OPTIONS XORG_DEFAULT_OPTIONS
AC_CHECK_PROGS([PYTHON], [python3 python2 python]) AC_CHECK_PROGS([PYTHON], [python3])
# Initialize libtool # Initialize libtool
AC_DISABLE_STATIC AC_DISABLE_STATIC

@ -25,7 +25,6 @@ foreach g: generated_headers
input: registry, input: registry,
output: [ gen_header ], output: [ gen_header ],
command: [ command: [
python,
gen_dispatch_py, gen_dispatch_py,
'--header', '--header',
'--no-source', '--no-source',

@ -196,12 +196,6 @@ if host_system == 'windows'
gdi32_dep = cc.find_library('gdi32', required: true) gdi32_dep = cc.find_library('gdi32', required: true)
endif endif
# Python
python = import('python3').find_python()
if not python.found()
python = find_program('python', required: true)
endif
# Generates the dispatch tables # Generates the dispatch tables
gen_dispatch_py = files('src/gen_dispatch.py') gen_dispatch_py = files('src/gen_dispatch.py')

@ -1,3 +1,4 @@
#!/usr/bin/env python3
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
# Copyright © 2013 Intel Corporation # Copyright © 2013 Intel Corporation

@ -33,7 +33,6 @@ foreach g: generated_sources
input: registry, input: registry,
output: [ gen_source ], output: [ gen_source ],
command: [ command: [
python,
gen_dispatch_py, gen_dispatch_py,
'--source', '--source',
'--no-header', '--no-header',

Loading…
Cancel
Save