diff options
| author | Kubilay Kocak <koobs@FreeBSD.org> | 2013-12-08 08:06:03 +0000 |
|---|---|---|
| committer | Kubilay Kocak <koobs@FreeBSD.org> | 2013-12-08 08:06:03 +0000 |
| commit | 066dc229318b15bc5edb004bc6aa9078403b8f8b (patch) | |
| tree | 84cf90d5ce867b84a1f1e1a0c0f0abbee5cba4e3 /lang/python26/files | |
| parent | lang/python26: Use ports libffi to address ctypes build failure on i386 (diff) | |
lang/python26: Add FreeBSD 11 support, enable POSIX Semaphores on FreeBSD 7+
Finish off adding FreeBSD 11 support to our Python ports by backporting
wg@'s changesets [1] and [2], and mine from python32 [3] to
lang/python26. These changes also bring more consistency and reduced diffs
between ports
[1] https://svnweb.freebsd.org/ports?view=revision&revision=333665
[2] https://svnweb.freebsd.org/ports?view=revision&revision=333487
[3] https://svnweb.freebsd.org/ports?view=revision&revision=335376
Reviewed by: milki
Notes
Notes:
svn path=/head/; revision=335869
Diffstat (limited to 'lang/python26/files')
| -rw-r--r-- | lang/python26/files/extra-patch-setup.py | 4 | ||||
| -rw-r--r-- | lang/python26/files/patch-setup.py | 20 |
2 files changed, 15 insertions, 9 deletions
diff --git a/lang/python26/files/extra-patch-setup.py b/lang/python26/files/extra-patch-setup.py index 1122acac8054..28fe87aaced3 100644 --- a/lang/python26/files/extra-patch-setup.py +++ b/lang/python26/files/extra-patch-setup.py @@ -4,7 +4,7 @@ ) libraries = [] -- elif platform in ('freebsd4', 'freebsd5', 'freebsd6', 'freebsd7', 'freebsd8', 'freebsd9', 'freebsd10'): +- elif platform in ('freebsd4', 'freebsd5', 'freebsd6', 'freebsd7', 'freebsd8', 'freebsd9', 'freebsd10', 'freebsd11'): + elif platform in ('freebsd4', 'freebsd5', 'freebsd6'): # FreeBSD's P1003.1b semaphore support is very experimental # and has many known problems. (as of June 2008) @@ -16,7 +16,7 @@ + ) + libraries = [] + -+ elif platform in ('freebsd7', 'freebsd8', 'freebsd9', 'freebsd10'): ++ elif platform in ('freebsd7', 'freebsd8', 'freebsd9', 'freebsd10', 'freebsd11'): + macros = dict( # FreeBSD 7+ + HAVE_SEM_OPEN=1, + HAVE_SEM_TIMEDWAIT=1, diff --git a/lang/python26/files/patch-setup.py b/lang/python26/files/patch-setup.py index 271cda1f30be..174c816cd0ee 100644 --- a/lang/python26/files/patch-setup.py +++ b/lang/python26/files/patch-setup.py @@ -1,5 +1,5 @@ ---- setup.py.orig 2010-07-17 20:31:09.000000000 +0800 -+++ setup.py 2010-09-03 08:59:33.000000000 +0800 +--- ./setup.py.orig 2013-10-30 02:04:39.000000000 +1100 ++++ ./setup.py 2013-12-08 18:42:28.054900011 +1100 @@ -18,7 +18,7 @@ from distutils.spawn import find_executable @@ -73,20 +73,26 @@ libraries = [] - elif platform in ('freebsd4', 'freebsd5', 'freebsd6', 'freebsd7', 'freebsd8'): -+ elif platform in ('freebsd4', 'freebsd5', 'freebsd6', 'freebsd7', 'freebsd8', 'freebsd9', 'freebsd10'): ++ elif platform in ('freebsd4', 'freebsd5', 'freebsd6', 'freebsd7', 'freebsd8', 'freebsd9', 'freebsd10', 'freebsd11'): # FreeBSD's P1003.1b semaphore support is very experimental # and has many known problems. (as of June 2008) macros = dict( # FreeBSD -@@ -1450,7 +1454,7 @@ +@@ -1449,8 +1453,12 @@ + else: missing.append('linuxaudiodev') - if platform in ('linux2', 'freebsd4', 'freebsd5', 'freebsd6', +- if platform in ('linux2', 'freebsd4', 'freebsd5', 'freebsd6', - 'freebsd7', 'freebsd8'): -+ 'freebsd7', 'freebsd8', 'freebsd9', 'freebsd10'): ++ ############################# ++ # Backport Commit: http://hg.python.org/cpython/rev/50f1922bc1d5 ++ # Backport Issue: http://bugs.python.org/issue12326 ++ ############################# ++ if any(platform.startswith(prefix) ++ for prefix in ("linux", "freebsd", "gnukfreebsd")): exts.append( Extension('ossaudiodev', ['ossaudiodev.c']) ) else: missing.append('ossaudiodev') -@@ -2026,9 +2030,7 @@ +@@ -2026,9 +2034,7 @@ ext_modules=[Extension('_struct', ['_struct.c'])], # Scripts to install |