From: Matthias Klose <doko@ubuntu.com>
Date: Wed, 21 Apr 2010 22:21:03 +0000 (+0000)
Subject: Merged revisions 80322 via svnmerge from
X-Git-Tag: v3.2a1~1062
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4c4b078101fcb8502efac17d3f8d335700195337;p=thirdparty%2FPython%2Fcpython.git

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 381ea4e5764b..414f15c676c6 100644
--- 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 ada6ca4f4709..42ef2c0c7136 100644
--- 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')