ports/138600: [PATCH] lang/python26: install problem on
FreeBSD 8.0
Dmitry Marakasov
amdmi3 at amdmi3.ru
Fri Sep 11 02:10:03 UTC 2009
The following reply was made to PR ports/138600; it has been noted by GNATS.
From: Dmitry Marakasov <amdmi3 at amdmi3.ru>
To: "Bjoern A. Zeeb" <bzeeb+freebsd+ports at zabbadoz.net>
Cc: bug-followup at FreeBSD.org
Subject: Re: ports/138600: [PATCH] lang/python26: install problem on
FreeBSD 8.0
Date: Fri, 11 Sep 2009 06:06:12 +0400
* Bjoern A. Zeeb (bzeeb+freebsd+ports at zabbadoz.net) wrote:
> as I cannot see a patch even though it's in the Synopsis and as later
> clarified that the problem is on 9.0 and not 8.0, here is the patch:
There was no patch.
> You can also temporary fetch it from
> http://people.freebsd.org/~bz/lang-python26-freebsd9.diff
This (with corresponding plist update) fixes the port on 9.0, but
breaks on other versions, on which python still does not install
plat-freebsd9/ stuff.
--- python26.patch begins here ---
Index: pkg-plist
===================================================================
RCS file: /home/amdmi3/projects/freebsd/FreeBSD.cvs/ports/lang/python26/pkg-plist,v
retrieving revision 1.77
diff -u -r1.77 pkg-plist
--- pkg-plist 13 Aug 2009 12:12:20 -0000 1.77
+++ pkg-plist 11 Sep 2009 00:56:07 -0000
@@ -911,6 +911,8 @@
%%PYTHON_LIBDIR%%/plat-freebsd7/regen
%%PYTHON_LIBDIR%%/plat-freebsd8/IN.py
%%PYTHON_LIBDIR%%/plat-freebsd8/regen
+%%PYTHON_LIBDIR%%/plat-freebsd9/IN.py
+%%PYTHON_LIBDIR%%/plat-freebsd9/regen
%%PYTHON_LIBDIR%%/platform.py
%%PYTHON_LIBDIR%%/plistlib.py
%%PYTHON_LIBDIR%%/popen2.py
@@ -2205,6 +2207,7 @@
@dirrm %%PYTHON_LIBDIR%%/sqlite3/test
@dirrm %%PYTHON_LIBDIR%%/sqlite3
@dirrm %%PYTHON_LIBDIR%%/site-packages
+ at dirrm %%PYTHON_LIBDIR%%/plat-freebsd9
@dirrm %%PYTHON_LIBDIR%%/plat-freebsd8
@dirrm %%PYTHON_LIBDIR%%/plat-freebsd7
@dirrm %%PYTHON_LIBDIR%%/plat-freebsd6
Index: files/patch-setup.py
===================================================================
RCS file: /home/amdmi3/projects/freebsd/FreeBSD.cvs/ports/lang/python26/files/patch-setup.py,v
retrieving revision 1.18
diff -u -r1.18 patch-setup.py
--- files/patch-setup.py 13 Oct 2008 08:22:58 -0000 1.18
+++ files/patch-setup.py 10 Sep 2009 19:01:55 -0000
@@ -1,6 +1,6 @@
---- setup.py.orig 2008-09-30 09:15:45.000000000 +0900
-+++ setup.py 2008-10-09 20:34:35.000000000 +0900
-@@ -17,7 +17,7 @@
+--- setup.py.orig 2009-03-31 18:20:48.000000000 +0000
++++ setup.py 2009-09-10 05:27:01.000000000 +0000
+@@ -17,7 +17,7 @@ from distutils.command.install import in
from distutils.command.install_lib import install_lib
# This global variable is used to hold the list of modules to be disabled.
@@ -9,7 +9,7 @@
def add_dir_to_list(dirlist, dir):
"""Add the directory 'dir' to the list 'dirlist' (at the front) if
-@@ -575,7 +575,7 @@
+@@ -577,7 +577,7 @@ class PyBuildExt(build_ext):
readline_libs = ['readline']
if self.compiler.find_library_file(lib_dirs,
@@ -18,7 +18,7 @@
readline_libs.append('ncursesw')
elif self.compiler.find_library_file(lib_dirs,
'ncurses'):
-@@ -587,7 +587,7 @@
+@@ -589,7 +589,7 @@ class PyBuildExt(build_ext):
'termcap'):
readline_libs.append('termcap')
exts.append( Extension('readline', ['readline.c'],
@@ -27,7 +27,7 @@
extra_link_args=readline_extra_link_args,
libraries=readline_libs) )
else:
-@@ -687,6 +687,8 @@
+@@ -689,6 +689,8 @@ class PyBuildExt(build_ext):
# OpenSSL doesn't do these until 0.9.8 so we'll bring our own hash
exts.append( Extension('_sha256', ['sha256module.c']) )
exts.append( Extension('_sha512', ['sha512module.c']) )
@@ -36,7 +36,7 @@
# Modules that provide persistent dictionary-like semantics. You will
# probably want to arrange for at least one of them to be available on
-@@ -987,7 +989,7 @@
+@@ -990,7 +992,7 @@ class PyBuildExt(build_ext):
# the more recent berkeleydb's db.h file first in the include path
# when attempting to compile and it will fail.
f = "/usr/include/db.h"
@@ -45,7 +45,7 @@
data = open(f).read()
m = re.search(r"#s*define\s+HASHVERSION\s+2\s*", data)
if m is not None:
-@@ -1066,7 +1068,7 @@
+@@ -1080,7 +1082,7 @@ class PyBuildExt(build_ext):
# Curses support, requiring the System V version of curses, often
# provided by the ncurses library.
panel_library = 'panel'
@@ -54,7 +54,7 @@
curses_libs = ['ncursesw']
# Bug 1464056: If _curses.so links with ncursesw,
# _curses_panel.so must link with panelw.
-@@ -1076,6 +1078,7 @@
+@@ -1090,6 +1092,7 @@ class PyBuildExt(build_ext):
elif (self.compiler.find_library_file(lib_dirs, 'ncurses')):
curses_libs = ['ncurses']
exts.append( Extension('_curses', ['_cursesmodule.c'],
@@ -62,7 +62,7 @@
libraries = curses_libs) )
elif (self.compiler.find_library_file(lib_dirs, 'curses')
and platform != 'darwin'):
-@@ -1097,6 +1100,7 @@
+@@ -1111,6 +1114,7 @@ class PyBuildExt(build_ext):
if (module_enabled(exts, '_curses') and
self.compiler.find_library_file(lib_dirs, panel_library)):
exts.append( Extension('_curses_panel', ['_curses_panel.c'],
@@ -70,7 +70,25 @@
libraries = [panel_library] + curses_libs) )
else:
missing.append('_curses_panel')
-@@ -1869,9 +1873,7 @@
+@@ -1273,7 +1277,7 @@ class PyBuildExt(build_ext):
+ )
+ libraries = []
+
+- elif platform in ('freebsd4', 'freebsd5', 'freebsd6', 'freebsd7', 'freebsd8'):
++ elif platform in ('freebsd4', 'freebsd5', 'freebsd6', 'freebsd7', 'freebsd8', 'freebsd9'):
+ # FreeBSD's P1003.1b semaphore support is very experimental
+ # and has many known problems. (as of June 2008)
+ macros = dict( # FreeBSD
+@@ -1338,7 +1342,7 @@ class PyBuildExt(build_ext):
+ missing.append('linuxaudiodev')
+
+ if platform in ('linux2', 'freebsd4', 'freebsd5', 'freebsd6',
+- 'freebsd7', 'freebsd8'):
++ 'freebsd7', 'freebsd8', 'freebsd9'):
+ exts.append( Extension('ossaudiodev', ['ossaudiodev.c']) )
+ else:
+ missing.append('ossaudiodev')
+@@ -1891,9 +1895,7 @@ def main():
ext_modules=[Extension('_struct', ['_struct.c'])],
# Scripts to install
--- python26.patch ends here ---
--
Dmitry Marakasov . 55B5 0596 FF1E 8D84 5F56 9510 D35A 80DD F9D2 F77D
amdmi3 at amdmi3.ru ..: jabber: amdmi3 at jabber.ru http://www.amdmi3.ru
More information about the freebsd-python
mailing list