Apply patch by Brian de Alwis to fix build problems under Mac OS X Leopard. Tested under Leopard and NetBSD-i386 4.0_STABLE. This fixes PR pkg/39042 by myself.diff -r1.5 -r1.6 pkgsrc/lang/python25/Makefile
(tron)
@@ -1,14 +1,14 @@ | @@ -1,14 +1,14 @@ | |||
1 | # $NetBSD: Makefile,v 1.5 2008/04/25 12:04:44 tnn Exp $ | 1 | # $NetBSD: Makefile,v 1.6 2008/06/27 19:57:49 tron Exp $ | |
2 | 2 | |||
3 | DISTNAME= Python-2.5.2 | 3 | DISTNAME= Python-2.5.2 | |
4 | PKGNAME= python25-2.5.2 | 4 | PKGNAME= python25-2.5.2 | |
5 | PKGREVISION= 1 | 5 | PKGREVISION= 1 | |
6 | CATEGORIES= lang python | 6 | CATEGORIES= lang python | |
7 | MASTER_SITES= ftp://ftp.python.org/pub/python/2.5.2/ \ | 7 | MASTER_SITES= ftp://ftp.python.org/pub/python/2.5.2/ \ | |
8 | http://www.python.org/ftp/python/2.5.2/ | 8 | http://www.python.org/ftp/python/2.5.2/ | |
9 | EXTRACT_SUFX= .tar.bz2 | 9 | EXTRACT_SUFX= .tar.bz2 | |
10 | 10 | |||
11 | MAINTAINER= recht@NetBSD.org | 11 | MAINTAINER= recht@NetBSD.org | |
12 | HOMEPAGE= http://www.python.org/ | 12 | HOMEPAGE= http://www.python.org/ | |
13 | COMMENT= Interpreted, interactive, object-oriented programming language | 13 | COMMENT= Interpreted, interactive, object-oriented programming language | |
14 | 14 | |||
@@ -62,29 +62,29 @@ PY_PLATNAME= hp-ux11 | @@ -62,29 +62,29 @@ PY_PLATNAME= hp-ux11 | |||
62 | .else | 62 | .else | |
63 | PY_PLATNAME= ${LOWER_OPSYS}${OS_VERSION:C/\..*//} | 63 | PY_PLATNAME= ${LOWER_OPSYS}${OS_VERSION:C/\..*//} | |
64 | .endif | 64 | .endif | |
65 | PLIST_SUBST+= PY_PLATNAME=${PY_PLATNAME:Q} | 65 | PLIST_SUBST+= PY_PLATNAME=${PY_PLATNAME:Q} | |
66 | 66 | |||
67 | .if (${MACHINE_ARCH} == "alpha") || (${MACHINE_ARCH} == "amd64") || \ | 67 | .if (${MACHINE_ARCH} == "alpha") || (${MACHINE_ARCH} == "amd64") || \ | |
68 | (${MACHINE_ARCH} == "sparc64") || (${MACHINE_ARCH} == "x86_64") || \ | 68 | (${MACHINE_ARCH} == "sparc64") || (${MACHINE_ARCH} == "x86_64") || \ | |
69 | (defined(ABI) && ${ABI} == "64") | 69 | (defined(ABI) && ${ABI} == "64") | |
70 | IS_64BIT_PLATFORM?= yes | 70 | IS_64BIT_PLATFORM?= yes | |
71 | .else | 71 | .else | |
72 | IS_64BIT_PLATFORM?= no | 72 | IS_64BIT_PLATFORM?= no | |
73 | .endif | 73 | .endif | |
74 | 74 | |||
75 | # the dl module isn't built for 64 bit archs and Darwin | 75 | # the dl module isn't built for 64 bit archs | |
76 | PLIST_VARS+= dl | 76 | PLIST_VARS+= dl | |
77 | .if empty(IS_64BIT_PLATFORM:M[yY][eE][sS]) && (${OPSYS} != "Darwin") | 77 | .if empty(IS_64BIT_PLATFORM:M[yY][eE][sS]) | |
78 | PLIST.dl= yes | 78 | PLIST.dl= yes | |
79 | .endif | 79 | .endif | |
80 | 80 | |||
81 | # builds additional modules if OpenSSL < 0.9.8 | 81 | # builds additional modules if OpenSSL < 0.9.8 | |
82 | PLIST_VARS+= openssl097 | 82 | PLIST_VARS+= openssl097 | |
83 | CHECK_BUILTIN.openssl:= no | 83 | CHECK_BUILTIN.openssl:= no | |
84 | .include "../../security/openssl/builtin.mk" | 84 | .include "../../security/openssl/builtin.mk" | |
85 | CHECK_BUILTIN.openssl:= yes | 85 | CHECK_BUILTIN.openssl:= yes | |
86 | .if !empty(USE_BUILTIN.openssl:M[yY][eE][sS]) && \ | 86 | .if !empty(USE_BUILTIN.openssl:M[yY][eE][sS]) && \ | |
87 | !empty(BUILTIN_PKG.openssl:Mopenssl-0.9.[67]*) | 87 | !empty(BUILTIN_PKG.openssl:Mopenssl-0.9.[67]*) | |
88 | PLIST.openssl097= yes | 88 | PLIST.openssl097= yes | |
89 | .endif | 89 | .endif | |
90 | 90 | |||
@@ -140,36 +140,26 @@ TEST_TARGET= test | @@ -140,36 +140,26 @@ TEST_TARGET= test | |||
140 | INSTALL_TARGET= altinstall | 140 | INSTALL_TARGET= altinstall | |
141 | 141 | |||
142 | REPLACE_INTERPRETER+= py25 | 142 | REPLACE_INTERPRETER+= py25 | |
143 | REPLACE.py25.old= .*python[^ ]* | 143 | REPLACE.py25.old= .*python[^ ]* | |
144 | REPLACE.py25.new= ${PREFIX}/bin/python${PY_VER_SUFFIX} | 144 | REPLACE.py25.new= ${PREFIX}/bin/python${PY_VER_SUFFIX} | |
145 | REPLACE_FILES.py25= Lib/cgi.py # explicitly demanded to be patched | 145 | REPLACE_FILES.py25= Lib/cgi.py # explicitly demanded to be patched | |
146 | REPLACE_FILES.py25+= Lib/bsddb/dbshelve.py Lib/test/test_bz2.py | 146 | REPLACE_FILES.py25+= Lib/bsddb/dbshelve.py Lib/test/test_bz2.py | |
147 | REPLACE_FILES.py25+= Lib/test/test_largefile.py Lib/test/test_optparse.py | 147 | REPLACE_FILES.py25+= Lib/test/test_largefile.py Lib/test/test_optparse.py | |
148 | 148 | |||
149 | post-extract: | 149 | post-extract: | |
150 | ${MV} ${WRKSRC}/Lib/smtpd.py ${WRKSRC}/Lib/smtpd${PY_VER_SUFFIX}.py | 150 | ${MV} ${WRKSRC}/Lib/smtpd.py ${WRKSRC}/Lib/smtpd${PY_VER_SUFFIX}.py | |
151 | ${MV} ${WRKSRC}/Tools/scripts/pydoc ${WRKSRC}/Tools/scripts/pydoc${PY_VER_SUFFIX} | 151 | ${MV} ${WRKSRC}/Tools/scripts/pydoc ${WRKSRC}/Tools/scripts/pydoc${PY_VER_SUFFIX} | |
152 | 152 | |||
153 | .if ${OPSYS} == "Darwin" | |||
154 | post-build: | |||
155 | cd ${WRKSRC} && \ | |||
156 | ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} libpython2.5.2.dylib | |||
157 | ||||
158 | post-install: | |||
159 | ${LN} -fs ${DESTDIR}${PREFIX}/lib/libpython2.5.2.dylib \ | |||
160 | ${DESTDIR}${PREFIX}/lib/libpython2.5.dylib | |||
161 | .endif | |||
162 | ||||
163 | .if ${OPSYS} == "HPUX" | 153 | .if ${OPSYS} == "HPUX" | |
164 | post-install: | 154 | post-install: | |
165 | ${LN} -fs ${DESTDIR}${PREFIX}/lib/libpython2.5.sl \ | 155 | ${LN} -fs ${DESTDIR}${PREFIX}/lib/libpython2.5.sl \ | |
166 | ${DESTDIR}${PREFIX}/lib/libpython2.5.sl.1.0 | 156 | ${DESTDIR}${PREFIX}/lib/libpython2.5.sl.1.0 | |
167 | .endif | 157 | .endif | |
168 | 158 | |||
169 | .include "../../archivers/bzip2/buildlink3.mk" | 159 | .include "../../archivers/bzip2/buildlink3.mk" | |
170 | .include "../../devel/gettext-lib/buildlink3.mk" | 160 | .include "../../devel/gettext-lib/buildlink3.mk" | |
171 | .include "../../devel/zlib/buildlink3.mk" | 161 | .include "../../devel/zlib/buildlink3.mk" | |
172 | .include "../../security/openssl/buildlink3.mk" | 162 | .include "../../security/openssl/buildlink3.mk" | |
173 | .include "../../mk/dlopen.buildlink3.mk" | 163 | .include "../../mk/dlopen.buildlink3.mk" | |
174 | .include "../../mk/oss.buildlink3.mk" | 164 | .include "../../mk/oss.buildlink3.mk" | |
175 | .include "../../mk/bsd.pkg.mk" | 165 | .include "../../mk/bsd.pkg.mk" |
@@ -1,15 +1,15 @@ | @@ -1,15 +1,15 @@ | |||
1 | @comment $NetBSD: PLIST.Darwin,v 1.1.1.1 2008/04/24 01:50:58 tnn Exp $ | 1 | @comment $NetBSD: PLIST.Darwin,v 1.2 2008/06/27 19:57:49 tron Exp $ | |
2 | lib/libpython2.5.2.dylib | 2 | lib/libpython${PY_VER_SUFFIX}.dylib | |
3 | lib/python${PY_VER_SUFFIX}/lib-dynload/ColorPicker.so | 3 | lib/python${PY_VER_SUFFIX}/lib-dynload/ColorPicker.so | |
4 | lib/python${PY_VER_SUFFIX}/lib-dynload/MacOS.so | 4 | lib/python${PY_VER_SUFFIX}/lib-dynload/MacOS.so | |
5 | lib/python${PY_VER_SUFFIX}/lib-dynload/Nav.so | 5 | lib/python${PY_VER_SUFFIX}/lib-dynload/Nav.so | |
6 | lib/python${PY_VER_SUFFIX}/lib-dynload/OSATerminology.so | 6 | lib/python${PY_VER_SUFFIX}/lib-dynload/OSATerminology.so | |
7 | lib/python${PY_VER_SUFFIX}/lib-dynload/_AE.so | 7 | lib/python${PY_VER_SUFFIX}/lib-dynload/_AE.so | |
8 | lib/python${PY_VER_SUFFIX}/lib-dynload/_AH.so | 8 | lib/python${PY_VER_SUFFIX}/lib-dynload/_AH.so | |
9 | lib/python${PY_VER_SUFFIX}/lib-dynload/_App.so | 9 | lib/python${PY_VER_SUFFIX}/lib-dynload/_App.so | |
10 | lib/python${PY_VER_SUFFIX}/lib-dynload/_CF.so | 10 | lib/python${PY_VER_SUFFIX}/lib-dynload/_CF.so | |
11 | lib/python${PY_VER_SUFFIX}/lib-dynload/_CG.so | 11 | lib/python${PY_VER_SUFFIX}/lib-dynload/_CG.so | |
12 | lib/python${PY_VER_SUFFIX}/lib-dynload/_CarbonEvt.so | 12 | lib/python${PY_VER_SUFFIX}/lib-dynload/_CarbonEvt.so | |
13 | lib/python${PY_VER_SUFFIX}/lib-dynload/_Cm.so | 13 | lib/python${PY_VER_SUFFIX}/lib-dynload/_Cm.so | |
14 | lib/python${PY_VER_SUFFIX}/lib-dynload/_Ctl.so | 14 | lib/python${PY_VER_SUFFIX}/lib-dynload/_Ctl.so | |
15 | lib/python${PY_VER_SUFFIX}/lib-dynload/_Dlg.so | 15 | lib/python${PY_VER_SUFFIX}/lib-dynload/_Dlg.so | |
@@ -225,53 +225,47 @@ lib/python${PY_VER_SUFFIX}/plat-mac/Carb | @@ -225,53 +225,47 @@ lib/python${PY_VER_SUFFIX}/plat-mac/Carb | |||
225 | lib/python${PY_VER_SUFFIX}/plat-mac/Carbon/Snd.pyo | 225 | lib/python${PY_VER_SUFFIX}/plat-mac/Carbon/Snd.pyo | |
226 | lib/python${PY_VER_SUFFIX}/plat-mac/Carbon/Sndihooks.py | 226 | lib/python${PY_VER_SUFFIX}/plat-mac/Carbon/Sndihooks.py | |
227 | lib/python${PY_VER_SUFFIX}/plat-mac/Carbon/Sndihooks.pyc | 227 | lib/python${PY_VER_SUFFIX}/plat-mac/Carbon/Sndihooks.pyc | |
228 | lib/python${PY_VER_SUFFIX}/plat-mac/Carbon/Sndihooks.pyo | 228 | lib/python${PY_VER_SUFFIX}/plat-mac/Carbon/Sndihooks.pyo | |
229 | lib/python${PY_VER_SUFFIX}/plat-mac/Carbon/Sound.py | 229 | lib/python${PY_VER_SUFFIX}/plat-mac/Carbon/Sound.py | |
230 | lib/python${PY_VER_SUFFIX}/plat-mac/Carbon/Sound.pyc | 230 | lib/python${PY_VER_SUFFIX}/plat-mac/Carbon/Sound.pyc | |
231 | lib/python${PY_VER_SUFFIX}/plat-mac/Carbon/Sound.pyo | 231 | lib/python${PY_VER_SUFFIX}/plat-mac/Carbon/Sound.pyo | |
232 | lib/python${PY_VER_SUFFIX}/plat-mac/Carbon/TE.py | 232 | lib/python${PY_VER_SUFFIX}/plat-mac/Carbon/TE.py | |
233 | lib/python${PY_VER_SUFFIX}/plat-mac/Carbon/TE.pyc | 233 | lib/python${PY_VER_SUFFIX}/plat-mac/Carbon/TE.pyc | |
234 | lib/python${PY_VER_SUFFIX}/plat-mac/Carbon/TE.pyo | 234 | lib/python${PY_VER_SUFFIX}/plat-mac/Carbon/TE.pyo | |
235 | lib/python${PY_VER_SUFFIX}/plat-mac/Carbon/TextEdit.py | 235 | lib/python${PY_VER_SUFFIX}/plat-mac/Carbon/TextEdit.py | |
236 | lib/python${PY_VER_SUFFIX}/plat-mac/Carbon/TextEdit.pyc | 236 | lib/python${PY_VER_SUFFIX}/plat-mac/Carbon/TextEdit.pyc | |
237 | lib/python${PY_VER_SUFFIX}/plat-mac/Carbon/TextEdit.pyo | 237 | lib/python${PY_VER_SUFFIX}/plat-mac/Carbon/TextEdit.pyo | |
238 | lib/python${PY_VER_SUFFIX}/plat-mac/Carbon/WASTEconst.py | |||
239 | lib/python${PY_VER_SUFFIX}/plat-mac/Carbon/WASTEconst.pyc | |||
240 | lib/python${PY_VER_SUFFIX}/plat-mac/Carbon/WASTEconst.pyo | |||
241 | lib/python${PY_VER_SUFFIX}/plat-mac/Carbon/Win.py | 238 | lib/python${PY_VER_SUFFIX}/plat-mac/Carbon/Win.py | |
242 | lib/python${PY_VER_SUFFIX}/plat-mac/Carbon/Win.pyc | 239 | lib/python${PY_VER_SUFFIX}/plat-mac/Carbon/Win.pyc | |
243 | lib/python${PY_VER_SUFFIX}/plat-mac/Carbon/Win.pyo | 240 | lib/python${PY_VER_SUFFIX}/plat-mac/Carbon/Win.pyo | |
244 | lib/python${PY_VER_SUFFIX}/plat-mac/Carbon/Windows.py | 241 | lib/python${PY_VER_SUFFIX}/plat-mac/Carbon/Windows.py | |
245 | lib/python${PY_VER_SUFFIX}/plat-mac/Carbon/Windows.pyc | 242 | lib/python${PY_VER_SUFFIX}/plat-mac/Carbon/Windows.pyc | |
246 | lib/python${PY_VER_SUFFIX}/plat-mac/Carbon/Windows.pyo | 243 | lib/python${PY_VER_SUFFIX}/plat-mac/Carbon/Windows.pyo | |
247 | lib/python${PY_VER_SUFFIX}/plat-mac/Carbon/__init__.py | 244 | lib/python${PY_VER_SUFFIX}/plat-mac/Carbon/__init__.py | |
248 | lib/python${PY_VER_SUFFIX}/plat-mac/Carbon/__init__.pyc | 245 | lib/python${PY_VER_SUFFIX}/plat-mac/Carbon/__init__.pyc | |
249 | lib/python${PY_VER_SUFFIX}/plat-mac/Carbon/__init__.pyo | 246 | lib/python${PY_VER_SUFFIX}/plat-mac/Carbon/__init__.pyo | |
250 | lib/python${PY_VER_SUFFIX}/plat-mac/EasyDialogs.py | 247 | lib/python${PY_VER_SUFFIX}/plat-mac/EasyDialogs.py | |
251 | lib/python${PY_VER_SUFFIX}/plat-mac/EasyDialogs.pyc | 248 | lib/python${PY_VER_SUFFIX}/plat-mac/EasyDialogs.pyc | |
252 | lib/python${PY_VER_SUFFIX}/plat-mac/EasyDialogs.pyo | 249 | lib/python${PY_VER_SUFFIX}/plat-mac/EasyDialogs.pyo | |
253 | lib/python${PY_VER_SUFFIX}/plat-mac/FrameWork.py | 250 | lib/python${PY_VER_SUFFIX}/plat-mac/FrameWork.py | |
254 | lib/python${PY_VER_SUFFIX}/plat-mac/FrameWork.pyc | 251 | lib/python${PY_VER_SUFFIX}/plat-mac/FrameWork.pyc | |
255 | lib/python${PY_VER_SUFFIX}/plat-mac/FrameWork.pyo | 252 | lib/python${PY_VER_SUFFIX}/plat-mac/FrameWork.pyo | |
256 | lib/python${PY_VER_SUFFIX}/plat-mac/MiniAEFrame.py | 253 | lib/python${PY_VER_SUFFIX}/plat-mac/MiniAEFrame.py | |
257 | lib/python${PY_VER_SUFFIX}/plat-mac/MiniAEFrame.pyc | 254 | lib/python${PY_VER_SUFFIX}/plat-mac/MiniAEFrame.pyc | |
258 | lib/python${PY_VER_SUFFIX}/plat-mac/MiniAEFrame.pyo | 255 | lib/python${PY_VER_SUFFIX}/plat-mac/MiniAEFrame.pyo | |
259 | lib/python${PY_VER_SUFFIX}/plat-mac/PixMapWrapper.py | 256 | lib/python${PY_VER_SUFFIX}/plat-mac/PixMapWrapper.py | |
260 | lib/python${PY_VER_SUFFIX}/plat-mac/PixMapWrapper.pyc | 257 | lib/python${PY_VER_SUFFIX}/plat-mac/PixMapWrapper.pyc | |
261 | lib/python${PY_VER_SUFFIX}/plat-mac/PixMapWrapper.pyo | 258 | lib/python${PY_VER_SUFFIX}/plat-mac/PixMapWrapper.pyo | |
262 | lib/python${PY_VER_SUFFIX}/plat-mac/WASTEconst.py | |||
263 | lib/python${PY_VER_SUFFIX}/plat-mac/WASTEconst.pyc | |||
264 | lib/python${PY_VER_SUFFIX}/plat-mac/WASTEconst.pyo | |||
265 | lib/python${PY_VER_SUFFIX}/plat-mac/aepack.py | 259 | lib/python${PY_VER_SUFFIX}/plat-mac/aepack.py | |
266 | lib/python${PY_VER_SUFFIX}/plat-mac/aepack.pyc | 260 | lib/python${PY_VER_SUFFIX}/plat-mac/aepack.pyc | |
267 | lib/python${PY_VER_SUFFIX}/plat-mac/aepack.pyo | 261 | lib/python${PY_VER_SUFFIX}/plat-mac/aepack.pyo | |
268 | lib/python${PY_VER_SUFFIX}/plat-mac/aetools.py | 262 | lib/python${PY_VER_SUFFIX}/plat-mac/aetools.py | |
269 | lib/python${PY_VER_SUFFIX}/plat-mac/aetools.pyc | 263 | lib/python${PY_VER_SUFFIX}/plat-mac/aetools.pyc | |
270 | lib/python${PY_VER_SUFFIX}/plat-mac/aetools.pyo | 264 | lib/python${PY_VER_SUFFIX}/plat-mac/aetools.pyo | |
271 | lib/python${PY_VER_SUFFIX}/plat-mac/aetypes.py | 265 | lib/python${PY_VER_SUFFIX}/plat-mac/aetypes.py | |
272 | lib/python${PY_VER_SUFFIX}/plat-mac/aetypes.pyc | 266 | lib/python${PY_VER_SUFFIX}/plat-mac/aetypes.pyc | |
273 | lib/python${PY_VER_SUFFIX}/plat-mac/aetypes.pyo | 267 | lib/python${PY_VER_SUFFIX}/plat-mac/aetypes.pyo | |
274 | lib/python${PY_VER_SUFFIX}/plat-mac/argvemulator.py | 268 | lib/python${PY_VER_SUFFIX}/plat-mac/argvemulator.py | |
275 | lib/python${PY_VER_SUFFIX}/plat-mac/argvemulator.pyc | 269 | lib/python${PY_VER_SUFFIX}/plat-mac/argvemulator.pyc | |
276 | lib/python${PY_VER_SUFFIX}/plat-mac/argvemulator.pyo | 270 | lib/python${PY_VER_SUFFIX}/plat-mac/argvemulator.pyo | |
277 | lib/python${PY_VER_SUFFIX}/plat-mac/bgenlocations.py | 271 | lib/python${PY_VER_SUFFIX}/plat-mac/bgenlocations.py |
@@ -1,25 +1,25 @@ | @@ -1,25 +1,25 @@ | |||
1 | $NetBSD: distinfo,v 1.3 2008/05/09 10:03:16 tnn Exp $ | 1 | $NetBSD: distinfo,v 1.4 2008/06/27 19:57:49 tron Exp $ | |
2 | 2 | |||
3 | SHA1 (Python-2.5.2.tar.bz2) = 4755d212f50af704c20224a6966e23acc5aea60f | 3 | SHA1 (Python-2.5.2.tar.bz2) = 4755d212f50af704c20224a6966e23acc5aea60f | |
4 | RMD160 (Python-2.5.2.tar.bz2) = b23b02739833e6730799c5866e2b77aae884b63f | 4 | RMD160 (Python-2.5.2.tar.bz2) = b23b02739833e6730799c5866e2b77aae884b63f | |
5 | Size (Python-2.5.2.tar.bz2) = 9807597 bytes | 5 | Size (Python-2.5.2.tar.bz2) = 9807597 bytes | |
6 | SHA1 (patch-aa) = d44e67645dc86ff14f5daf5705de02c6f330cc48 | 6 | SHA1 (patch-aa) = d44e67645dc86ff14f5daf5705de02c6f330cc48 | |
7 | SHA1 (patch-ab) = c573f73a2509a63fc269302015a7ff6eaa8fe6ff | 7 | SHA1 (patch-ab) = d35025df83e70d129f9fbcd277652b0eea83b026 | |
8 | SHA1 (patch-ac) = 4de5b8dc20b41dc3bb4acd38011ef59570318d3f | 8 | SHA1 (patch-ac) = 4de5b8dc20b41dc3bb4acd38011ef59570318d3f | |
9 | SHA1 (patch-ad) = 069c2fd6fc0e2e754486941fd9e5743c94668787 | 9 | SHA1 (patch-ad) = 069c2fd6fc0e2e754486941fd9e5743c94668787 | |
10 | SHA1 (patch-ae) = 5425515c6bf130eee204ca2749386f6447eaa35b | 10 | SHA1 (patch-ae) = 5425515c6bf130eee204ca2749386f6447eaa35b | |
11 | SHA1 (patch-ag) = 95be54a4c8fe291cd7edd14a9180bbcb07bba2ce | 11 | SHA1 (patch-ag) = 95be54a4c8fe291cd7edd14a9180bbcb07bba2ce | |
12 | SHA1 (patch-ah) = 98e9fa55c2af38d8032398cae693492c199dc5fa | 12 | SHA1 (patch-ah) = 98e9fa55c2af38d8032398cae693492c199dc5fa | |
13 | SHA1 (patch-ai) = a89bee00860910f53a23b1c670d9c091846a03c1 | 13 | SHA1 (patch-ai) = a89bee00860910f53a23b1c670d9c091846a03c1 | |
14 | SHA1 (patch-aj) = a75d680a6b8b1ad3c9222dcb841f4fb10db6d16d | 14 | SHA1 (patch-aj) = a75d680a6b8b1ad3c9222dcb841f4fb10db6d16d | |
15 | SHA1 (patch-ak) = 948362c15ad59abeef46971f9b870b70655a62c7 | 15 | SHA1 (patch-ak) = 948362c15ad59abeef46971f9b870b70655a62c7 | |
16 | SHA1 (patch-al) = 80b7eab63b7a638674446f297adafdb7f3a44dc9 | 16 | SHA1 (patch-al) = b56bebd10ed66a6149aa55ad1ccd997cf51f7f0d | |
17 | SHA1 (patch-am) = 8968853066d2d1a4f76a7ee4ce328ba372d19666 | 17 | SHA1 (patch-am) = 8968853066d2d1a4f76a7ee4ce328ba372d19666 | |
18 | SHA1 (patch-an) = 17b4e17b3b562c29a050e9bb20447084ce82b8ab | 18 | SHA1 (patch-an) = 17b4e17b3b562c29a050e9bb20447084ce82b8ab | |
19 | SHA1 (patch-ao) = 9bbd5561c010e0a1ab8e0a70d27a5f77fd2089d2 | 19 | SHA1 (patch-ao) = 9bbd5561c010e0a1ab8e0a70d27a5f77fd2089d2 | |
20 | SHA1 (patch-ap) = b864db92761c843a91374663bd2dbcfa57b317cf | 20 | SHA1 (patch-ap) = b864db92761c843a91374663bd2dbcfa57b317cf | |
21 | SHA1 (patch-aq) = e1fb02560e95ce4d37e2894b4299c3eb3a1167d8 | 21 | SHA1 (patch-aq) = e1fb02560e95ce4d37e2894b4299c3eb3a1167d8 | |
22 | SHA1 (patch-ar) = 2a0c3f9a798afdfda7af4823e67579b2e000c072 | 22 | SHA1 (patch-ar) = 2a0c3f9a798afdfda7af4823e67579b2e000c072 | |
23 | SHA1 (patch-at) = 200646b0b0292fd3c3517f10eda24b4e94dca7c4 | 23 | SHA1 (patch-at) = 200646b0b0292fd3c3517f10eda24b4e94dca7c4 | |
24 | SHA1 (patch-au) = c51d25c6def18c7ef0de2122b807de4cc1e3f729 | 24 | SHA1 (patch-au) = e3babf3537ed8cbed1720f1afe964914f4ae289f | |
25 | SHA1 (patch-av) = a1d41cb3a93879d54f0964ff84a63a297c333156 | 25 | SHA1 (patch-av) = a1d41cb3a93879d54f0964ff84a63a297c333156 |
@@ -1,23 +1,24 @@ | @@ -1,23 +1,24 @@ | |||
1 | $NetBSD: patch-ab,v 1.1.1.1 2008/04/24 01:50:58 tnn Exp $ | 1 | $NetBSD: patch-ab,v 1.2 2008/06/27 19:57:49 tron Exp $ | |
2 | 2 | |||
3 | --- Lib/distutils/command/build_ext.py.orig 2007-03-13 06:19:35.000000000 -0400 | 3 | --- Lib/distutils/command/build_ext.py.orig 2007-04-24 09:27:25.000000000 -0600 | |
4 | +++ Lib/distutils/command/build_ext.py | 4 | +++ Lib/distutils/command/build_ext.py | |
5 | @@ -496,8 +496,18 @@ class build_ext (Command): | 5 | @@ -496,8 +496,19 @@ class build_ext (Command): | |
6 | # that go into the mix. | 6 | # that go into the mix. | |
7 | if ext.extra_objects: | 7 | if ext.extra_objects: | |
8 | objects.extend(ext.extra_objects) | 8 | objects.extend(ext.extra_objects) | |
9 | + | 9 | + | |
10 | + # Two possible sources for extra linker arguments: | 10 | + # Two possible sources for extra linker arguments: | |
11 | + # - 'extra_link_args' in Extension object | 11 | + # - 'extra_link_args' in Extension object | |
12 | + # - LDFLAGS environment variable | 12 | + # - LDFLAGS environment variable | |
13 | + # The environment variable should take precedence, and | 13 | + # The environment variable should take precedence, and | |
14 | + # any sensible compiler will give precedence to later | 14 | + # any sensible compiler will give precedence to later | |
15 | + # command line args. Hence we combine them in order: | 15 | + # command line args. Hence we combine them in order: | |
16 | extra_args = ext.extra_link_args or [] | 16 | extra_args = ext.extra_link_args or [] | |
17 | 17 | |||
18 | + if os.environ.has_key('LDFLAGS'): | 18 | + if os.environ.has_key('LDFLAGS'): | |
19 | + extra_args = list(extra_args) | |||
19 | + extra_args.extend(string.split(os.environ['LDFLAGS'])) | 20 | + extra_args.extend(string.split(os.environ['LDFLAGS'])) | |
20 | + | 21 | + | |
21 | # Detect target language, if not provided | 22 | # Detect target language, if not provided | |
22 | language = ext.language or self.compiler.detect_language(sources) | 23 | language = ext.language or self.compiler.detect_language(sources) | |
23 | 24 |
@@ -1,84 +1,101 @@ | @@ -1,84 +1,101 @@ | |||
1 | $NetBSD: patch-al,v 1.1.1.1 2008/04/24 01:50:58 tnn Exp $ | 1 | $NetBSD: patch-al,v 1.2 2008/06/27 19:57:49 tron Exp $ | |
2 | 2 | |||
3 | --- configure.orig 2007-03-12 06:50:51.000000000 -0400 | 3 | --- configure.orig 2008-02-13 13:17:17.000000000 -0600 | |
4 | +++ configure | 4 | +++ configure | |
5 | @@ -1560,6 +1560,8 @@ case $ac_sys_system/$ac_sys_release in | 5 | @@ -2019,6 +2019,8 @@ _ACEOF | |
6 | # Marc Recht | 6 | # Marc Recht | |
7 | NetBSD/1.5 | NetBSD/1.5.* | NetBSD/1.6 | NetBSD/1.6.* | NetBSD/1.6A-S) | 7 | NetBSD/1.5 | NetBSD/1.5.* | NetBSD/1.6 | NetBSD/1.6.* | NetBSD/1.6A-S) | |
8 | define_xopen_source=no;; | 8 | define_xopen_source=no;; | |
9 | + NetBSD/1.5 | NetBSD/1.5.* | NetBSD/1.6 | NetBSD/1.6.* | NetBSD/1.6[A-S]) | 9 | + NetBSD/1.5 | NetBSD/1.5.* | NetBSD/1.6 | NetBSD/1.6.* | NetBSD/1.6[A-S]) | |
10 | + define_xopen_source=no;; | 10 | + define_xopen_source=no;; | |
11 | # On Solaris 2.6, sys/wait.h is inconsistent in the usage | 11 | # On Solaris 2.6, sys/wait.h is inconsistent in the usage | |
12 | # of union __?sigval. Reported by Stuart Bishop. | 12 | # of union __?sigval. Reported by Stuart Bishop. | |
13 | SunOS/5.6) | 13 | SunOS/5.6) | |
14 | @@ -3412,15 +3414,10 @@ _ACEOF | 14 | @@ -4018,17 +4020,18 @@ _ACEOF | |
15 | RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH} | 15 | RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH} | |
16 | INSTSONAME="$LDLIBRARY".$SOVERSION | 16 | INSTSONAME="$LDLIBRARY".$SOVERSION | |
17 | ;; | 17 | ;; | |
18 | - Linux*|GNU*|NetBSD*|FreeBSD*|DragonFly*) | 18 | - Linux*|GNU*|NetBSD*|FreeBSD*|DragonFly*) | |
19 | + Linux*|GNU*|NetBSD*|FreeBSD*|Interix*|DragonFly*) | 19 | + Linux*|GNU*|NetBSD*|FreeBSD*|Interix*|DragonFly*) | |
20 | LDLIBRARY='libpython$(VERSION).so' | 20 | LDLIBRARY='libpython$(VERSION).so' | |
21 | BLDLIBRARY='-L. -lpython$(VERSION)' | 21 | BLDLIBRARY='-L. -lpython$(VERSION)' | |
22 | RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH} | 22 | RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH} | |
23 | - case $ac_sys_system in | 23 | - case $ac_sys_system in | |
24 | - FreeBSD*) | 24 | - FreeBSD*) | |
25 | - SOVERSION=`echo $SOVERSION|cut -d "." -f 1` | 25 | - SOVERSION=`echo $SOVERSION|cut -d "." -f 1` | |
26 | - ;; | 26 | - ;; | |
27 | - esac | 27 | - esac | |
28 | INSTSONAME="$LDLIBRARY".$SOVERSION | 28 | INSTSONAME="$LDLIBRARY".$SOVERSION | |
29 | ;; | 29 | ;; | |
30 | + Darwin*) | |||
31 | + LDLIBRARY='libpython$(VERSION).dylib' | |||
32 | + BLDLIBRARY='-L. -lpython$(VERSION)' | |||
33 | + RUNSHARED=DYLD_FALLBACK_LIBRARY_PATH=`pwd`:${DYLD_FALLBACK_LIBRARY_PATH} | |||
34 | + INSTSONAME="$LDLIBRARY" | |||
35 | + ;; | |||
30 | hp*|HP*) | 36 | hp*|HP*) | |
31 | @@ -3890,7 +3887,12 @@ echo "${ECHO_T}$ac_cv_no_strict_aliasing | 37 | case `uname -m` in | |
38 | ia64) | |||
39 | @@ -4538,7 +4541,12 @@ echo "${ECHO_T}$ac_cv_no_strict_aliasing | |||
32 | ;; | 40 | ;; | |
33 | # is there any other compiler on Darwin besides gcc? | 41 | # is there any other compiler on Darwin besides gcc? | |
34 | Darwin*) | 42 | Darwin*) | |
35 | - BASECFLAGS="$BASECFLAGS -Wno-long-double -no-cpp-precomp -mno-fused-madd" | 43 | - BASECFLAGS="$BASECFLAGS -Wno-long-double -no-cpp-precomp -mno-fused-madd" | |
36 | + if [[ `/usr/bin/arch` = 'ppc' ]] | 44 | + if [[ `/usr/bin/arch` = 'ppc' ]] | |
37 | + then | 45 | + then | |
38 | + BASECFLAGS="$BASECFLAGS -Wno-long-double -no-cpp-precomp -mno-fused-madd -fno-common" | 46 | + BASECFLAGS="$BASECFLAGS -Wno-long-double -no-cpp-precomp -mno-fused-madd -fno-common" | |
39 | + else | 47 | + else | |
40 | + BASECFLAGS="$BASECFLAGS -Wno-long-double -no-cpp-precomp -fno-common" | 48 | + BASECFLAGS="$BASECFLAGS -Wno-long-double -no-cpp-precomp -fno-common" | |
41 | + fi | 49 | + fi | |
42 | if test "${enable_universalsdk}"; then | 50 | if test "${enable_universalsdk}"; then | |
43 | BASECFLAGS="-arch ppc -arch i386 -isysroot ${UNIVERSALSDK} ${BASECFLAGS}" | 51 | BASECFLAGS="-arch ppc -arch i386 -isysroot ${UNIVERSALSDK} ${BASECFLAGS}" | |
44 | fi | 52 | fi | |
45 | @@ -11033,12 +11035,12 @@ then | 53 | @@ -11540,12 +11548,12 @@ then | |
46 | LDSHARED="$LDSHARED "'$(PYTHONFRAMEWORKPREFIX)/$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)' | 54 | LDSHARED="$LDSHARED "'$(PYTHONFRAMEWORKPREFIX)/$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)' | |
47 | else | 55 | else | |
48 | # No framework, use the Python app as bundle-loader | 56 | # No framework, use the Python app as bundle-loader | |
49 | - BLDSHARED="$LDSHARED "'-bundle_loader $(BUILDPYTHON)' | 57 | - BLDSHARED="$LDSHARED "'-bundle_loader $(BUILDPYTHON)' | |
50 | - LDSHARED="$LDSHARED "'-bundle_loader $(BINDIR)/python$(VERSION)$(EXE)' | 58 | - LDSHARED="$LDSHARED "'-bundle_loader $(BINDIR)/python$(VERSION)$(EXE)' | |
51 | + BLDSHARED="$LDSHARED "'-flat_namespace -undefined suppress -bundle_loader $(BUILDPYTHON)' | 59 | + BLDSHARED="$LDSHARED "'-flat_namespace -undefined suppress -bundle_loader $(BUILDPYTHON)' | |
52 | + LDSHARED="$LDSHARED "'-flat_namespace -undefined suppress -bundle_loader $(BINDIR)/python$(VERSION)$(EXE)' | 60 | + LDSHARED="$LDSHARED "'-flat_namespace -undefined suppress -bundle_loader $(BINDIR)/python$(VERSION)$(EXE)' | |
53 | fi | 61 | fi | |
54 | fi | 62 | fi | |
55 | ;; | 63 | ;; | |
56 | - Linux*|GNU*) LDSHARED='$(CC) -shared';; | 64 | - Linux*|GNU*) LDSHARED='$(CC) -shared';; | |
57 | + Linux*|GNU*) LDSHARED='$(CC) -shared'" ${LDFLAGS}";; | 65 | + Linux*|GNU*) LDSHARED='$(CC) -shared'" ${LDFLAGS}";; | |
58 | BSD/OS*/4*) LDSHARED="gcc -shared";; | 66 | BSD/OS*/4*) LDSHARED="gcc -shared";; | |
59 | FreeBSD*) | 67 | FreeBSD*) | |
60 | if [ "`$CC -dM -E - </dev/null | grep __ELF__`" != "" ] | 68 | if [ "`$CC -dM -E - </dev/null | grep __ELF__`" != "" ] | |
61 | @@ -11062,6 +11064,7 @@ then | 69 | @@ -11569,6 +11577,7 @@ then | |
62 | esac | 70 | esac | |
63 | fi;; | 71 | fi;; | |
64 | NetBSD*|DragonFly*) LDSHARED="cc -shared ${LDFLAGS}";; | 72 | NetBSD*|DragonFly*) LDSHARED="cc -shared ${LDFLAGS}";; | |
65 | + Interix*) LDSHARED='$(CC) -shared'" ${LDFLAGS}";; # XXX tv needs image-base hack | 73 | + Interix*) LDSHARED='$(CC) -shared'" ${LDFLAGS}";; # XXX tv needs image-base hack | |
66 | OpenUNIX*|UnixWare*) | 74 | OpenUNIX*|UnixWare*) | |
67 | if test "$GCC" = "yes" | 75 | if test "$GCC" = "yes" | |
68 | then LDSHARED='$(CC) -shared' | 76 | then LDSHARED='$(CC) -shared' | |
69 | @@ -11097,6 +11100,7 @@ then | 77 | @@ -11604,6 +11613,7 @@ then | |
70 | Linux*|GNU*) CCSHARED="-fPIC";; | 78 | Linux*|GNU*) CCSHARED="-fPIC";; | |
71 | BSD/OS*/4*) CCSHARED="-fpic";; | 79 | BSD/OS*/4*) CCSHARED="-fpic";; | |
72 | FreeBSD*|NetBSD*|OpenBSD*|DragonFly*) CCSHARED="-fPIC";; | 80 | FreeBSD*|NetBSD*|OpenBSD*|DragonFly*) CCSHARED="-fPIC";; | |
73 | + Interix*) CCSHARED="";; | 81 | + Interix*) CCSHARED="";; | |
74 | OpenUNIX*|UnixWare*) | 82 | OpenUNIX*|UnixWare*) | |
75 | if test "$GCC" = "yes" | 83 | if test "$GCC" = "yes" | |
76 | then CCSHARED="-fPIC" | 84 | then CCSHARED="-fPIC" | |
77 | @@ -11154,6 +11158,7 @@ then | 85 | @@ -11661,6 +11671,7 @@ then | |
78 | then | 86 | then | |
79 | LINKFORSHARED="-Wl,--export-dynamic" | 87 | LINKFORSHARED="-Wl,--export-dynamic" | |
80 | fi;; | 88 | fi;; | |
81 | + Interix*) LINKFORSHARED="-Wl,-E";; | 89 | + Interix*) LINKFORSHARED="-Wl,-E";; | |
82 | SunOS/5*) case $CC in | 90 | SunOS/5*) case $CC in | |
83 | *gcc*) | 91 | *gcc*) | |
84 | if $CC -Xlinker --help 2>&1 | grep export-dynamic >/dev/null | 92 | if $CC -Xlinker --help 2>&1 | grep export-dynamic >/dev/null | |
93 | @@ -23158,6 +23169,8 @@ do | |||
94 | case $ac_option in | |||
95 | # Handling of the options. | |||
96 | -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) | |||
97 | + : Avoid regenerating within pkgsrc | |||
98 | + exit 0 | |||
99 | ac_cs_recheck=: ;; | |||
100 | --version | --versio | --versi | --vers | --ver | --ve | --v | -V ) | |||
101 | echo "$ac_cs_version"; exit ;; |
@@ -1,13 +1,36 @@ | @@ -1,13 +1,36 @@ | |||
1 | $NetBSD: patch-au,v 1.1.1.1 2008/04/24 01:50:58 tnn Exp $ | 1 | $NetBSD: patch-au,v 1.2 2008/06/27 19:57:49 tron Exp $ | |
2 | 2 | |||
3 | --- Makefile.pre.in.orig 2007-12-05 21:43:57.000000000 +0100 | 3 | --- Makefile.pre.in.orig 2007-12-05 14:43:57.000000000 -0600 | |
4 | +++ Makefile.pre.in | 4 | +++ Makefile.pre.in | |
5 | @@ -806,7 +806,7 @@ $(srcdir)/Lib/$(PLATDIR): | 5 | @@ -376,6 +376,12 @@ libpython$(VERSION).so: $(LIBRARY_OBJS) | |
6 | libpython$(VERSION).sl: $(LIBRARY_OBJS) | |||
7 | $(LDSHARED) -o $@ $(LIBRARY_OBJS) $(SHLIBS) $(LIBC) $(LIBM) | |||
8 | ||||
9 | +libpython$(VERSION).dylib: $(LIBRARY_OBJS) | |||
10 | + $(LINKCC) -dynamiclib -install_name $(LIBDIR)/$@ \ | |||
11 | + -current_version 2.5.2 -compatibility_version $(VERSION) \ | |||
12 | + -o $@ -flat_namespace -undefined suppress $(LDFLAGS) \ | |||
13 | + $(LIBRARY_OBJS) $(SHLIBS) $(LIBC) $(LIBM) | |||
14 | + | |||
15 | # This rule is here for OPENSTEP/Rhapsody/MacOSX. It builds a temporary | |||
16 | # minimal framework (not including the Lib directory and such) in the current | |||
17 | # directory. | |||
18 | @@ -683,7 +689,8 @@ altbininstall: $(BUILDPYTHON) | |||
19 | (cd $(DESTDIR)$(LIBDIR); $(LN) -sf $(INSTSONAME) libpython$(VERSION)$(SO)); \ | |||
20 | fi \ | |||
21 | fi; \ | |||
22 | - else true; \ | |||
23 | + elif test -f $(INSTSONAME); then \ | |||
24 | + $(INSTALL_SHARED) $(INSTSONAME) $(DESTDIR)$(LIBDIR); \ | |||
25 | fi | |||
26 | ||||
27 | # Install the manual page | |||
28 | @@ -806,7 +813,7 @@ $(srcdir)/Lib/$(PLATDIR): | |||
6 | export PYTHONPATH; PYTHONPATH="`pwd`/Lib"; \ | 29 | export PYTHONPATH; PYTHONPATH="`pwd`/Lib"; \ | |
7 | export DYLD_FRAMEWORK_PATH; DYLD_FRAMEWORK_PATH="`pwd`"; \ | 30 | export DYLD_FRAMEWORK_PATH; DYLD_FRAMEWORK_PATH="`pwd`"; \ | |
8 | export EXE; EXE="$(BUILDEXE)"; \ | 31 | export EXE; EXE="$(BUILDEXE)"; \ | |
9 | - cd $(srcdir)/Lib/$(PLATDIR); ./regen | 32 | - cd $(srcdir)/Lib/$(PLATDIR); ./regen | |
10 | + cd $(srcdir)/Lib/$(PLATDIR); $(RUNSHARED) ./regen | 33 | + cd $(srcdir)/Lib/$(PLATDIR); $(RUNSHARED) ./regen | |
11 | 34 | |||
12 | # Install the include files | 35 | # Install the include files | |
13 | INCLDIRSTOMAKE=$(INCLUDEDIR) $(CONFINCLUDEDIR) $(INCLUDEPY) $(CONFINCLUDEPY) | 36 | INCLDIRSTOMAKE=$(INCLUDEDIR) $(CONFINCLUDEDIR) $(INCLUDEPY) $(CONFINCLUDEPY) |