diff options
| author | adam <adam> | 2013-08-02 07:03:49 +0000 |
|---|---|---|
| committer | adam <adam> | 2013-08-02 07:03:49 +0000 |
| commit | adb92317feaa03876317f91cbd23ad2f6eafe214 (patch) | |
| tree | dbd37088c0912a72e7e5995882aa06fc4c620d63 /lang | |
| parent | a6aef452241d0996ab8593c2a9129881a7353944 (diff) | |
| download | pkgsrc-adb92317feaa03876317f91cbd23ad2f6eafe214.tar.gz | |
Fixes:
* building some modules (lzma) on Darwin (use PREFIX, instead of /usr/local, to look for libraries)
* building decimal module on certain enviroments (use relative path to look for includes, as absolute path might get rejected by a wrapper)
Diffstat (limited to 'lang')
| -rw-r--r-- | lang/python33/Makefile | 8 | ||||
| -rw-r--r-- | lang/python33/distinfo | 4 | ||||
| -rw-r--r-- | lang/python33/patches/patch-am | 16 |
3 files changed, 23 insertions, 5 deletions
diff --git a/lang/python33/Makefile b/lang/python33/Makefile index b0adf9380f6..3f9491cbabf 100644 --- a/lang/python33/Makefile +++ b/lang/python33/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2013/07/15 02:02:24 ryoon Exp $ +# $NetBSD: Makefile,v 1.9 2013/08/02 07:03:49 adam Exp $ .include "dist.mk" @@ -99,6 +99,12 @@ REPLACE.py33.old= .*python[^ ]* REPLACE.py33.new= ${PREFIX}/bin/python${PY_VER_SUFFIX} REPLACE_FILES.py33= Lib/*.py Lib/*/*.py Lib/*/*/*.py Lib/*/*/*/*.py +SUBST_CLASSES+= findlib +SUBST_MESSAGE.findlib= Fixing find_library_file on Darwin. +SUBST_STAGE.findlib= pre-configure +SUBST_FILES.findlib= Lib/distutils/unixccompiler.py +SUBST_SED.findlib= -e 's,/usr/local,${PREFIX},' + CHECK_INTERPRETER_SKIP= lib/python${PY_VER_SUFFIX}/venv/scripts/posix/pydoc .if ${OPSYS} == "HPUX" diff --git a/lang/python33/distinfo b/lang/python33/distinfo index 5f85d3c9605..6533cec7731 100644 --- a/lang/python33/distinfo +++ b/lang/python33/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.3 2013/05/26 17:56:09 wiz Exp $ +$NetBSD: distinfo,v 1.4 2013/08/02 07:03:49 adam Exp $ SHA1 (Python-3.3.2.tar.bz2) = b28c36a9752b690059dc6df4fb9b4ec9d6c5708a RMD160 (Python-3.3.2.tar.bz2) = 7383734cbbd9e15b5d883063e1266abf368fd8e4 @@ -7,7 +7,7 @@ SHA1 (patch-aa) = 99ebcbbfc53b855a32b424dec27012e1e969c3d0 SHA1 (patch-ab) = 1c0a25bf7ec6ee76e84c799619ec7cd8910f16e1 SHA1 (patch-ah) = bb43aaab260935a5a0d5e7ce1ccc30f4832cab1d SHA1 (patch-al) = e5438d1bbc20cc85521b3570710846cf4a070ae1 -SHA1 (patch-am) = a0ed54881b1fbb17fdf7483ef484486aebc2c016 +SHA1 (patch-am) = 9712e33cf8e3c04a9bc0e89be4fb571790e26e4e SHA1 (patch-an) = 933acde107b735931d26ace4eef251000b9f07ba SHA1 (patch-ao) = dc524b08634c23c25227bd03e221dab0ff2a03f3 SHA1 (patch-au) = c892f1004eb32e9608f93c08ec6f94e16bdca182 diff --git a/lang/python33/patches/patch-am b/lang/python33/patches/patch-am index 512fa8de92a..7a0c9db5473 100644 --- a/lang/python33/patches/patch-am +++ b/lang/python33/patches/patch-am @@ -1,4 +1,4 @@ -$NetBSD: patch-am,v 1.3 2013/05/26 17:56:09 wiz Exp $ +$NetBSD: patch-am,v 1.4 2013/08/02 07:03:50 adam Exp $ --- setup.py.orig 2013-05-15 16:33:00.000000000 +0000 +++ setup.py @@ -103,7 +103,19 @@ $NetBSD: patch-am,v 1.3 2013/05/26 17:56:09 wiz Exp $ else: # Linux and other unices macros = dict() libraries = ['rt'] -@@ -2155,7 +2186,7 @@ def main(): +@@ -1906,10 +1937,7 @@ class PyBuildExt(build_ext): + depends = ['_decimal/docstrings.h'] + else: + srcdir = sysconfig.get_config_var('srcdir') +- include_dirs = [os.path.abspath(os.path.join(srcdir, +- 'Modules', +- '_decimal', +- 'libmpdec'))] ++ include_dirs = ['Modules/_decimal/libmpdec'] + libraries = [] + sources = [ + '_decimal/_decimal.c', +@@ -2155,7 +2183,7 @@ def main(): # If you change the scripts installed here, you also need to # check the PyBuildScripts command above, and change the links # created by the bininstall target in Makefile.pre.in |