diff options
| author | adam <adam@pkgsrc.org> | 2011-09-16 08:50:44 +0000 |
|---|---|---|
| committer | adam <adam@pkgsrc.org> | 2011-09-16 08:50:44 +0000 |
| commit | 192511774afaef3623b7474debb9804083f05828 (patch) | |
| tree | 3fdd31704a0a7e8c5d98860187bbd7d010acdc46 /lang/python27 | |
| parent | 4cb0886ed92cadd5ed02877181e1bb14c357accd (diff) | |
| download | pkgsrc-192511774afaef3623b7474debb9804083f05828.tar.gz | |
One again, fix for Clang and interger overflow, this time is should be correct
Diffstat (limited to 'lang/python27')
| -rw-r--r-- | lang/python27/Makefile | 9 | ||||
| -rw-r--r-- | lang/python27/distinfo | 4 | ||||
| -rw-r--r-- | lang/python27/patches/patch-al | 13 |
3 files changed, 11 insertions, 15 deletions
diff --git a/lang/python27/Makefile b/lang/python27/Makefile index ee862549b2a..115bdf96fbb 100644 --- a/lang/python27/Makefile +++ b/lang/python27/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2011/06/13 11:31:13 obache Exp $ +# $NetBSD: Makefile,v 1.6 2011/09/16 08:50:44 adam Exp $ .include "dist.mk" @@ -34,6 +34,13 @@ PTHREAD_OPTS+= require CONFIGURE_ARGS+= --with-pth .endif +.include "../../mk/compiler.mk" + +# Clang needs -fwrapv +.if !empty(PKGSRC_COMPILER:Mclang) +CFLAGS+= -fwrapv +.endif + .include "../../mk/bsd.prefs.mk" # fdatasync() diff --git a/lang/python27/distinfo b/lang/python27/distinfo index 86e289edaa8..5765f0ce8fd 100644 --- a/lang/python27/distinfo +++ b/lang/python27/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.6 2011/09/14 06:59:54 adam Exp $ +$NetBSD: distinfo,v 1.7 2011/09/16 08:50:44 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) = e67d7bac37d9e3199e1ca0735cf2cd73c51ebfd7 +SHA1 (patch-al) = 01cd5a1c29f03d6ad13bfb0584b95f85b4761dba 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 e515ee5e0d1..c0ec5c124c7 100644 --- a/lang/python27/patches/patch-al +++ b/lang/python27/patches/patch-al @@ -1,4 +1,4 @@ -$NetBSD: patch-al,v 1.3 2011/09/14 06:59:54 adam Exp $ +$NetBSD: patch-al,v 1.4 2011/09/16 08:50:44 adam Exp $ --- configure.orig 2011-06-11 15:46:28.000000000 +0000 +++ configure @@ -19,17 +19,6 @@ $NetBSD: patch-al,v 1.3 2011/09/14 06:59:54 adam Exp $ INSTSONAME="$LDLIBRARY".$SOVERSION ;; hp*|HP*) -@@ -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 |