svn commit: r335869 - in head/lang/python26: . files
Kubilay Kocak
koobs at FreeBSD.org
Sun Dec 8 08:06:04 UTC 2013
Author: koobs
Date: Sun Dec 8 08:06:03 2013
New Revision: 335869
URL: http://svnweb.freebsd.org/changeset/ports/335869
Log:
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
Modified:
head/lang/python26/Makefile
head/lang/python26/files/extra-patch-setup.py (contents, props changed)
head/lang/python26/files/patch-setup.py (contents, props changed)
head/lang/python26/pkg-plist
Modified: head/lang/python26/Makefile
==============================================================================
--- head/lang/python26/Makefile Sun Dec 8 07:13:01 2013 (r335868)
+++ head/lang/python26/Makefile Sun Dec 8 08:06:03 2013 (r335869)
@@ -46,7 +46,7 @@ EXAMPLESDIR= ${PREFIX}/share/examples/${
DATADIR= ${PREFIX}/share/${PYTHON_VERSION}
PLATFORMS= plat-freebsd6 plat-freebsd7 plat-freebsd8 plat-freebsd9 \
- plat-freebsd10
+ plat-freebsd10 plat-freebsd11
BIN_SCRIPTS= 2to3 idle pydoc smtpd.py
BIN_FILES= python python-shared python-config python-shared-config \
@@ -160,6 +160,8 @@ pre-patch:
${PATCH_WRKSRC}/Lib/plat-freebsd9
${CP} -r ${PATCH_WRKSRC}/Lib/plat-freebsd8 \
${PATCH_WRKSRC}/Lib/plat-freebsd10
+ ${CP} -r ${PATCH_WRKSRC}/Lib/plat-freebsd8 \
+ ${PATCH_WRKSRC}/Lib/plat-freebsd11
${MKDIR} ${WRKSRC} ${SHARED_WRKSRC}/Modules
${LN} ${PATCH_WRKSRC}/Lib/smtpd.py ${PATCH_WRKSRC}/Tools/scripts/
.for script in ${BIN_SCRIPTS}
Modified: head/lang/python26/files/extra-patch-setup.py
==============================================================================
--- head/lang/python26/files/extra-patch-setup.py Sun Dec 8 07:13:01 2013 (r335868)
+++ head/lang/python26/files/extra-patch-setup.py Sun Dec 8 08:06:03 2013 (r335869)
@@ -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,
Modified: head/lang/python26/files/patch-setup.py
==============================================================================
--- head/lang/python26/files/patch-setup.py Sun Dec 8 07:13:01 2013 (r335868)
+++ head/lang/python26/files/patch-setup.py Sun Dec 8 08:06:03 2013 (r335869)
@@ -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
Modified: head/lang/python26/pkg-plist
==============================================================================
--- head/lang/python26/pkg-plist Sun Dec 8 07:13:01 2013 (r335868)
+++ head/lang/python26/pkg-plist Sun Dec 8 08:06:03 2013 (r335869)
@@ -913,6 +913,8 @@ lib/lib%%PYTHON_VERSION%%.so.1
%%PYTHON_LIBDIR%%/plat-freebsd9/regen
%%PYTHON_LIBDIR%%/plat-freebsd10/IN.py
%%PYTHON_LIBDIR%%/plat-freebsd10/regen
+%%PYTHON_LIBDIR%%/plat-freebsd11/IN.py
+%%PYTHON_LIBDIR%%/plat-freebsd11/regen
%%PYTHON_LIBDIR%%/platform.py
%%PYTHON_LIBDIR%%/plistlib.py
%%PYTHON_LIBDIR%%/popen2.py
@@ -2216,6 +2218,7 @@ lib/libpython2.6.a
@dirrm %%PYTHON_LIBDIR%%/sqlite3/test
@dirrm %%PYTHON_LIBDIR%%/sqlite3
@dirrm %%PYTHON_LIBDIR%%/site-packages
+ at dirrm %%PYTHON_LIBDIR%%/plat-freebsd11
@dirrm %%PYTHON_LIBDIR%%/plat-freebsd10
@dirrm %%PYTHON_LIBDIR%%/plat-freebsd9
@dirrm %%PYTHON_LIBDIR%%/plat-freebsd8
More information about the svn-ports-all
mailing list