diff options
| author | adam <adam@pkgsrc.org> | 2011-09-14 06:59:54 +0000 |
|---|---|---|
| committer | adam <adam@pkgsrc.org> | 2011-09-14 06:59:54 +0000 |
| commit | 429bdcc93e3f62d442ff2b774951a03a57588a91 (patch) | |
| tree | d32a57abcff42c53842dd00e900e3ccad97c9ab6 /lang/python27 | |
| parent | c1128826839edca6d238cd70f09dcde4674846e5 (diff) | |
| download | pkgsrc-429bdcc93e3f62d442ff2b774951a03a57588a91.tar.gz | |
Fix compiling with Clang: Python's issue 11149
Diffstat (limited to 'lang/python27')
| -rw-r--r-- | lang/python27/distinfo | 4 | ||||
| -rw-r--r-- | lang/python27/patches/patch-al | 23 |
2 files changed, 19 insertions, 8 deletions
diff --git a/lang/python27/distinfo b/lang/python27/distinfo index 01448da19d2..86e289edaa8 100644 --- a/lang/python27/distinfo +++ b/lang/python27/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.5 2011/06/13 11:31:13 obache Exp $ +$NetBSD: distinfo,v 1.6 2011/09/14 06:59:54 adam Exp $ SHA1 (Python-2.7.2.tar.bz2) = 417bdeea77abfaf1b9257fc6b4a04aaa209f4547 RMD160 (Python-2.7.2.tar.bz2) = c3bf4f09b7c429a4d9f4cc251c795304cd5232c5 @@ -8,7 +8,7 @@ SHA1 (patch-ab) = 8c44f60d9ed0babb107bc4643b0437e2dd55d03a SHA1 (patch-ad) = de730b9f5a5efb56afa8bed05824b5f6579242ec SHA1 (patch-ae) = ff6d8c6164fe3c6dc4fb33d88eb8a49d5c5442f6 SHA1 (patch-ah) = 8e9ee44c7a054f1387b6d8ef8dbe9c1b8dc8d891 -SHA1 (patch-al) = f1c11a62106a5b5c2346d326525b85039d00f503 +SHA1 (patch-al) = e67d7bac37d9e3199e1ca0735cf2cd73c51ebfd7 SHA1 (patch-am) = 8b546a0eb9b5e6d287b6fead2d0c20fd457b5b66 SHA1 (patch-an) = 6098fbf0fc31422196cc40d3a227934523db11ca SHA1 (patch-ao) = 9996a444fc0034c9f01fd18f4ad7bf714a8c8d04 diff --git a/lang/python27/patches/patch-al b/lang/python27/patches/patch-al index c160d562c07..e515ee5e0d1 100644 --- a/lang/python27/patches/patch-al +++ b/lang/python27/patches/patch-al @@ -1,4 +1,4 @@ -$NetBSD: patch-al,v 1.2 2011/06/13 11:31:13 obache Exp $ +$NetBSD: patch-al,v 1.3 2011/09/14 06:59:54 adam Exp $ --- configure.orig 2011-06-11 15:46:28.000000000 +0000 +++ configure @@ -19,7 +19,18 @@ $NetBSD: patch-al,v 1.2 2011/06/13 11:31:13 obache Exp $ INSTSONAME="$LDLIBRARY".$SOVERSION ;; hp*|HP*) -@@ -7648,9 +7643,9 @@ then +@@ -5418,6 +5413,10 @@ then + if "$CC" -v --help 2>/dev/null |grep -- -fwrapv > /dev/null; then + WRAP="-fwrapv" + fi ++ # Clang also needs -fwrapv ++ if test "$CC" = "clang" ; then ++ WRAP="-fwrapv" ++ fi + case $ac_cv_prog_cc_g in + yes) + if test "$Py_DEBUG" = 'true' ; then +@@ -7648,9 +7647,9 @@ then LDCXXSHARED="$LDCXXSHARED "'$(PYTHONFRAMEWORKPREFIX)/$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)' else # No framework, use the Python app as bundle-loader @@ -32,7 +43,7 @@ $NetBSD: patch-al,v 1.2 2011/06/13 11:31:13 obache Exp $ fi ;; Darwin/*) # Use -undefined dynamic_lookup whenever possible (10.3 and later). -@@ -7674,15 +7669,15 @@ then +@@ -7674,15 +7673,15 @@ then LDCXXSHARED="$LDCXXSHARED "'$(PYTHONFRAMEWORKPREFIX)/$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)' else # No framework, use the Python app as bundle-loader @@ -52,7 +63,7 @@ $NetBSD: patch-al,v 1.2 2011/06/13 11:31:13 obache Exp $ BSD/OS*/4*) LDSHARED="gcc -shared" LDCXXSHARED="g++ -shared";; -@@ -7713,6 +7708,9 @@ then +@@ -7713,6 +7712,9 @@ then NetBSD*|DragonFly*) LDSHARED='$(CC) -shared' LDCXXSHARED='$(CXX) -shared';; @@ -62,7 +73,7 @@ $NetBSD: patch-al,v 1.2 2011/06/13 11:31:13 obache Exp $ OpenUNIX*|UnixWare*) if test "$GCC" = "yes" ; then LDSHARED='$(CC) -shared' -@@ -7757,6 +7755,7 @@ then +@@ -7757,6 +7759,7 @@ then Linux*|GNU*) CCSHARED="-fPIC";; BSD/OS*/4*) CCSHARED="-fpic";; FreeBSD*|NetBSD*|OpenBSD*|DragonFly*) CCSHARED="-fPIC";; @@ -70,7 +81,7 @@ $NetBSD: patch-al,v 1.2 2011/06/13 11:31:13 obache Exp $ OpenUNIX*|UnixWare*) if test "$GCC" = "yes" then CCSHARED="-fPIC" -@@ -7813,6 +7812,7 @@ then +@@ -7813,6 +7816,7 @@ then then LINKFORSHARED="-Wl,--export-dynamic" fi;; |