diff options
| author | joerg <joerg@pkgsrc.org> | 2013-09-10 14:22:29 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2013-09-10 14:22:29 +0000 |
| commit | c813f1100c0c766919e7427b017d70d4d13f3995 (patch) | |
| tree | 16c9b2bb05d2aa3b5f9996730ab61cddf5e3089a /lang/python27 | |
| parent | 29b8e2b19b149eaa52698859c6d3c6ef21f62fdc (diff) | |
| download | pkgsrc-c813f1100c0c766919e7427b017d70d4d13f3995.tar.gz | |
Always pass rpath argument with -Wl prefix, especially if clang is not called
gcc. Bump revision.
Diffstat (limited to 'lang/python27')
| -rw-r--r-- | lang/python27/Makefile | 4 | ||||
| -rw-r--r-- | lang/python27/distinfo | 4 | ||||
| -rw-r--r-- | lang/python27/patches/patch-Lib_distutils_unixccompiler.py | 16 |
3 files changed, 18 insertions, 6 deletions
diff --git a/lang/python27/Makefile b/lang/python27/Makefile index f6f654c2a6a..5400d600adf 100644 --- a/lang/python27/Makefile +++ b/lang/python27/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.27 2013/08/18 13:42:14 spz Exp $ +# $NetBSD: Makefile,v 1.28 2013/09/10 14:22:30 joerg Exp $ .include "dist.mk" PKGNAME= python27-${PY_DISTVERSION} -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= lang python MAINTAINER= pkgsrc-users@NetBSD.org diff --git a/lang/python27/distinfo b/lang/python27/distinfo index eca6afb0427..0a622bc456e 100644 --- a/lang/python27/distinfo +++ b/lang/python27/distinfo @@ -1,11 +1,11 @@ -$NetBSD: distinfo,v 1.25 2013/08/18 13:42:14 spz Exp $ +$NetBSD: distinfo,v 1.26 2013/09/10 14:22:30 joerg Exp $ SHA1 (Python-2.7.5.tar.xz) = b7389791f789625c2ba9d897aa324008ff482daf RMD160 (Python-2.7.5.tar.xz) = baa7ad7d82cb4dc0a70b6a7aded43b7b78b0067e Size (Python-2.7.5.tar.xz) = 10252148 bytes SHA1 (patch-Include_node.h) = 673d148b625711ac47e4bfeb0f5b0d5b31f94d7e SHA1 (patch-Include_pyerrors.h) = 3eba043c83b1d1df4918524f7b53047a6ed372ae -SHA1 (patch-Lib_distutils_unixccompiler.py) = 3964e0c6bd2b3899b24b31892d5ad830ae04d308 +SHA1 (patch-Lib_distutils_unixccompiler.py) = 39b967dc2ae648143d5841f22602a21063b4d5ea SHA1 (patch-Lib_test_nullbytecert.pem) = 22f866c0e00016a0931985f672513c0d533d9db5 SHA1 (patch-Lib_test_test__ssl.py) = 30622803b45db6c081f8a507139ad0ad56b1ba43 SHA1 (patch-Misc_NEWS) = a7871e744f509aca0e3eac7bc3c71d742621ca20 diff --git a/lang/python27/patches/patch-Lib_distutils_unixccompiler.py b/lang/python27/patches/patch-Lib_distutils_unixccompiler.py index 1ad2d80ed43..e2a226ee724 100644 --- a/lang/python27/patches/patch-Lib_distutils_unixccompiler.py +++ b/lang/python27/patches/patch-Lib_distutils_unixccompiler.py @@ -1,8 +1,8 @@ -$NetBSD: patch-Lib_distutils_unixccompiler.py,v 1.1 2013/04/17 13:21:05 obache Exp $ +$NetBSD: patch-Lib_distutils_unixccompiler.py,v 1.2 2013/09/10 14:22:30 joerg Exp $ * from cygport 2.7.3-dylib.patch ---- Lib/distutils/unixccompiler.py.orig 2013-04-06 14:02:26.000000000 +0000 +--- Lib/distutils/unixccompiler.py.orig 2013-05-12 03:32:42.000000000 +0000 +++ Lib/distutils/unixccompiler.py @@ -82,6 +82,7 @@ class UnixCCompiler(CCompiler): static_lib_format = shared_lib_format = dylib_lib_format = "lib%s%s" @@ -12,3 +12,15 @@ $NetBSD: patch-Lib_distutils_unixccompiler.py,v 1.1 2013/04/17 13:21:05 obache E def preprocess(self, source, output_file=None, macros=None, include_dirs=None, +@@ -234,10 +235,8 @@ class UnixCCompiler(CCompiler): + return ["+s", "-L" + dir] + elif sys.platform[:7] == "irix646" or sys.platform[:6] == "osf1V5": + return ["-rpath", dir] +- elif self._is_gcc(compiler): +- return "-Wl,-R" + dir + else: +- return "-R" + dir ++ return "-Wl,-R" + dir + + def library_option(self, lib): + return "-l" + lib |