Merged revisions 80322 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r80322 | matthias.klose | 2010-04-22 00:18:52 +0200 (Do, 22 Apr 2010) | 2 lines

  - Build the ossaudio extension on GNU/kFreeBSD.
........

diff --git a/Misc/NEWS b/Misc/NEWS
index 381ea4e5764b56fa0b266cf0c6bbf134fe3e78da..414f15c676c62016ab8b1532ccb1da2cdf13b153 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -1022,6 +1022,8 @@ Extension Modules
 - Issue #7999: os.setreuid() and os.setregid() would refuse to accept a -1
   parameter on some platforms such as OS X.
 
+- Build the ossaudio extension on GNU/kFreeBSD.
+
 Build
 -----
 

diff --git a/setup.py b/setup.py
index ada6ca4f4709773efe09d2c31bd98920549ca484..42ef2c0c7136db9be21e0e328680686adce52d0b 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -1227,8 +1227,9 @@ class PyBuildExt(build_ext):
         # End multiprocessing
 
         # Platform-specific libraries
-        if platform in ('linux2', 'freebsd4', 'freebsd5', 'freebsd6',
-                        'freebsd7', 'freebsd8'):
+        if (platform in ('linux2', 'freebsd4', 'freebsd5', 'freebsd6',
+                        'freebsd7', 'freebsd8')
+            or platform.startswith("gnukfreebsd")):
             exts.append( Extension('ossaudiodev', ['ossaudiodev.c']) )
         else:
             missing.append('ossaudiodev')