summaryrefslogtreecommitdiff
path: root/lang/python26
diff options
context:
space:
mode:
authorjoerg <joerg>2013-09-10 14:22:29 +0000
committerjoerg <joerg>2013-09-10 14:22:29 +0000
commit3f2a0fb38da616d56f394c58f47d6e02fde73ca2 (patch)
tree16c9b2bb05d2aa3b5f9996730ab61cddf5e3089a /lang/python26
parent9f0b8f1a025e33d92d88954729c283cff0343592 (diff)
downloadpkgsrc-3f2a0fb38da616d56f394c58f47d6e02fde73ca2.tar.gz
Always pass rpath argument with -Wl prefix, especially if clang is not called
gcc. Bump revision.
Diffstat (limited to 'lang/python26')
-rw-r--r--lang/python26/Makefile4
-rw-r--r--lang/python26/distinfo3
-rw-r--r--lang/python26/patches/patch-Lib_distutils_unixccompiler.py16
3 files changed, 20 insertions, 3 deletions
diff --git a/lang/python26/Makefile b/lang/python26/Makefile
index c96ff97ab1f..38ad714468e 100644
--- a/lang/python26/Makefile
+++ b/lang/python26/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.54 2013/08/27 18:00:32 tez Exp $
+# $NetBSD: Makefile,v 1.55 2013/09/10 14:22:29 joerg Exp $
.include "dist.mk"
PKGNAME= python26-${PY_DISTVERSION}
-PKGREVISION= 4
+PKGREVISION= 5
CATEGORIES= lang python
MAINTAINER= pkgsrc-users@NetBSD.org
diff --git a/lang/python26/distinfo b/lang/python26/distinfo
index 707171481c5..0bd65377a30 100644
--- a/lang/python26/distinfo
+++ b/lang/python26/distinfo
@@ -1,9 +1,10 @@
-$NetBSD: distinfo,v 1.50 2013/08/27 18:00:32 tez Exp $
+$NetBSD: distinfo,v 1.51 2013/09/10 14:22:29 joerg Exp $
SHA1 (Python-2.6.8.tar.bz2) = 348b727a9818146a57aa43203f37d8c6b462fe79
RMD160 (Python-2.6.8.tar.bz2) = fcfa3554af415cbddd3e8d68aead46f1e7b8e616
Size (Python-2.6.8.tar.bz2) = 11127915 bytes
SHA1 (patch-CVE-2013-4238) = faaed25653b80c971bbd588f11fb8f38a6ff9c77
+SHA1 (patch-Lib_distutils_unixccompiler.py) = 1ce01fbe2d36cf0c7ce347c878cfe2d290ec8490
SHA1 (patch-Mac_Modules_fm___Fmmodule.c) = b9314bccb51b4fe672b81559068f7a79d2965f94
SHA1 (patch-Mac_Modules_qd___Qdmodule.c) = 45c748b15b9436d45ba137460389638aa7108c8d
SHA1 (patch-Mac_Modules_qdoffs___Qdoffsmodule.c) = 9994f0c1a908f18f1f3df3f05b184f082c018365
diff --git a/lang/python26/patches/patch-Lib_distutils_unixccompiler.py b/lang/python26/patches/patch-Lib_distutils_unixccompiler.py
new file mode 100644
index 00000000000..5fdab68fce0
--- /dev/null
+++ b/lang/python26/patches/patch-Lib_distutils_unixccompiler.py
@@ -0,0 +1,16 @@
+$NetBSD: patch-Lib_distutils_unixccompiler.py,v 1.1 2013/09/10 14:22:30 joerg Exp $
+
+--- Lib/distutils/unixccompiler.py.orig 2012-04-10 15:32:04.000000000 +0000
++++ Lib/distutils/unixccompiler.py
+@@ -292,10 +292,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