Просмотр исходного кода

Fix build of ossaudiodev in Linux/FreeBSD for Python 3.1 (#2047)

With the normal `setup.py`, the installation of the `ossaudiodev`
module is skipped under GNU/Linux with newer kernel versions because
Python 3.1 appends the major kernel version to the result of
`build_ext.get_platform` and later `ossaudiodev` is skipped if the
major kernel version is not 2. A similar problem might occur if
installing in FreeBSD.

This problem may even occur if installing Python 3.1 in a Docker image
of an old OS (e.g. prehistoric Debian or CentOS), because the major
kernel version is still the one of the host system.

The solution is to use `str.startswith` and only check that the
platform starts with 'linux' or 'freebsd'.
pull/2049/head
Víctor Molina García 4 лет назад
committed by GitHub
Родитель
Сommit
22e1aa6e9d
Не найден GPG ключ соответствующий данной подписи Идентификатор GPG ключа: 4AEE18F83AFDEB23
6 измененных файлов: 64 добавлений и 1 удалений
  1. +10
    -0
      plugins/python-build/share/python-build/patches/3.1.0/Python-3.1/000_patch-setup.py.diff
  2. +10
    -0
      plugins/python-build/share/python-build/patches/3.1.1/Python-3.1.1/000_patch-setup.py.diff
  3. +10
    -0
      plugins/python-build/share/python-build/patches/3.1.2/Python-3.1.2/000_patch-setup.py.diff
  4. +10
    -1
      plugins/python-build/share/python-build/patches/3.1.3/Python-3.1.3/000_patch-setup.py.diff
  5. +12
    -0
      plugins/python-build/share/python-build/patches/3.1.4/Python-3.1.4/000_patch-setup.py.diff
  6. +12
    -0
      plugins/python-build/share/python-build/patches/3.1.5/Python-3.1.5/000_patch-setup.py.diff

+ 10
- 0
plugins/python-build/share/python-build/patches/3.1.0/Python-3.1/000_patch-setup.py.diff Просмотреть файл

@ -43,3 +43,13 @@ diff -r -u ../Python-3.1/setup.py ./setup.py
# Add paths specified in the environment variables LDFLAGS and
# CPPFLAGS for header and library files.
@@ -1203,8 +1203,7 @@
# End multiprocessing
# Platform-specific libraries
- if platform in ('linux2', 'freebsd4', 'freebsd5', 'freebsd6',
- 'freebsd7', 'freebsd8'):
+ if platform.startswith('linux') or platform.startswith('freebsd'):
exts.append( Extension('ossaudiodev', ['ossaudiodev.c']) )
else:
missing.append('ossaudiodev')

+ 10
- 0
plugins/python-build/share/python-build/patches/3.1.1/Python-3.1.1/000_patch-setup.py.diff Просмотреть файл

@ -43,3 +43,13 @@ diff -r -u ../Python-3.1/setup.py ./setup.py
# Add paths specified in the environment variables LDFLAGS and
# CPPFLAGS for header and library files.
@@ -1203,8 +1203,7 @@
# End multiprocessing
# Platform-specific libraries
- if platform in ('linux2', 'freebsd4', 'freebsd5', 'freebsd6',
- 'freebsd7', 'freebsd8'):
+ if platform.startswith('linux') or platform.startswith('freebsd'):
exts.append( Extension('ossaudiodev', ['ossaudiodev.c']) )
else:
missing.append('ossaudiodev')

+ 10
- 0
plugins/python-build/share/python-build/patches/3.1.2/Python-3.1.2/000_patch-setup.py.diff Просмотреть файл

@ -43,3 +43,13 @@ diff -r -u ../Python-3.1/setup.py ./setup.py
# Add paths specified in the environment variables LDFLAGS and
# CPPFLAGS for header and library files.
@@ -1207,8 +1207,7 @@
# End multiprocessing
# Platform-specific libraries
- if platform in ('linux2', 'freebsd4', 'freebsd5', 'freebsd6',
- 'freebsd7', 'freebsd8'):
+ if platform.startswith('linux') or platform.startswith('freebsd'):
exts.append( Extension('ossaudiodev', ['ossaudiodev.c']) )
else:
missing.append('ossaudiodev')

+ 10
- 1
plugins/python-build/share/python-build/patches/3.1.3/Python-3.1.3/000_patch-setup.py.diff Просмотреть файл

@ -44,4 +44,13 @@ diff -r -u setup.py setup.py
# Add paths specified in the environment variables LDFLAGS and
# CPPFLAGS for header and library files.
@@ -1321,8 +1321,7 @@
# End multiprocessing
# Platform-specific libraries
- if platform in ('linux2', 'freebsd4', 'freebsd5', 'freebsd6',
- 'freebsd7', 'freebsd8'):
+ if platform.startswith('linux') or platform.startswith('freebsd'):
exts.append( Extension('ossaudiodev', ['ossaudiodev.c']) )
else:
missing.append('ossaudiodev')

+ 12
- 0
plugins/python-build/share/python-build/patches/3.1.4/Python-3.1.4/000_patch-setup.py.diff Просмотреть файл

@ -0,0 +1,12 @@
--- setup.py.orig 2012-04-10 01:25:37.000000000 +0200
+++ setup.py 2021-09-03 10:16:58.575042300 +0200
@@ -1344,8 +1344,7 @@
# End multiprocessing
# Platform-specific libraries
- if platform in ('linux2', 'freebsd4', 'freebsd5', 'freebsd6',
- 'freebsd7', 'freebsd8'):
+ if platform.startswith('linux') or platform.startswith('freebsd'):
exts.append( Extension('ossaudiodev', ['ossaudiodev.c']) )
else:
missing.append('ossaudiodev')

+ 12
- 0
plugins/python-build/share/python-build/patches/3.1.5/Python-3.1.5/000_patch-setup.py.diff Просмотреть файл

@ -0,0 +1,12 @@
--- setup.py.orig 2012-04-10 01:25:37.000000000 +0200
+++ setup.py 2021-09-03 10:16:58.575042300 +0200
@@ -1344,8 +1344,7 @@
# End multiprocessing
# Platform-specific libraries
- if platform in ('linux2', 'freebsd4', 'freebsd5', 'freebsd6',
- 'freebsd7', 'freebsd8'):
+ if platform.startswith('linux') or platform.startswith('freebsd'):
exts.append( Extension('ossaudiodev', ['ossaudiodev.c']) )
else:
missing.append('ossaudiodev')

Загрузка…
Отмена
Сохранить