summaryrefslogtreecommitdiff
path: root/lang
diff options
context:
space:
mode:
authordholland <dholland@pkgsrc.org>2012-12-21 20:26:42 +0000
committerdholland <dholland@pkgsrc.org>2012-12-21 20:26:42 +0000
commit0446e796550e507728a97803dfd4be8946b8f23c (patch)
tree589819c13602a16eae6051ef4e8176fccf0dffdf /lang
parent7d8d3afb033025d7e773d30537f07beac2b1b685 (diff)
downloadpkgsrc-0446e796550e507728a97803dfd4be8946b8f23c.tar.gz
Revert previous; Joerg says it breaks on clang. (It would be nice if
clang didn't masquerade as gcc and then turn out to be incompatible.) Reopens PR 47342, but I'll deal.
Diffstat (limited to 'lang')
-rw-r--r--lang/python27/distinfo4
-rw-r--r--lang/python27/patches/patch-al13
2 files changed, 3 insertions, 14 deletions
diff --git a/lang/python27/distinfo b/lang/python27/distinfo
index 441136d7f7b..80d5ca21063 100644
--- a/lang/python27/distinfo
+++ b/lang/python27/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.20 2012/12/16 23:22:28 dholland Exp $
+$NetBSD: distinfo,v 1.21 2012/12/21 20:26:42 dholland Exp $
SHA1 (Python-2.7.3.tar.bz2) = 842c4e2aff3f016feea3c6e992c7fa96e49c9aa0
RMD160 (Python-2.7.3.tar.bz2) = bfc511d54080898d7008d4b84d49f957859d66c3
@@ -11,7 +11,7 @@ SHA1 (patch-ab) = 0d0ae9802dfe3b85659adb16793affd8c4ffce43
SHA1 (patch-ad) = de730b9f5a5efb56afa8bed05824b5f6579242ec
SHA1 (patch-ae) = ff6d8c6164fe3c6dc4fb33d88eb8a49d5c5442f6
SHA1 (patch-ah) = 8e9ee44c7a054f1387b6d8ef8dbe9c1b8dc8d891
-SHA1 (patch-al) = f64f58c93c8cfb9ee3f4f7b726527e5c95441f9f
+SHA1 (patch-al) = e28c7b31560523528a824241e6782b7561223aa7
SHA1 (patch-am) = f56a53eb9f4694913d317c09e162bdd413f8f38f
SHA1 (patch-an) = 6098fbf0fc31422196cc40d3a227934523db11ca
SHA1 (patch-ao) = e14c3ddb136611835905fbe13c0b7ea2df8b6709
diff --git a/lang/python27/patches/patch-al b/lang/python27/patches/patch-al
index dd90acae577..14e2fddeff5 100644
--- a/lang/python27/patches/patch-al
+++ b/lang/python27/patches/patch-al
@@ -1,9 +1,7 @@
-$NetBSD: patch-al,v 1.8 2012/12/16 23:22:29 dholland Exp $
+$NetBSD: patch-al,v 1.9 2012/12/21 20:26:42 dholland Exp $
- recognize MirBSD, Interix
- remove special-case library version hack for FreeBSD
-- use -Werror=format when testing HAVE_ATTRIBUTE_FORMAT_PARSETUPLE,
- so injecting -Wno-error does not break the test
- honor pkgsrc LDFLAGS
- other stuff not previously commented (XXX)
@@ -35,15 +33,6 @@ $NetBSD: patch-al,v 1.8 2012/12/16 23:22:29 dholland Exp $
INSTSONAME="$LDLIBRARY".$SOVERSION
;;
hp*|HP*)
-@@ -5731,7 +5726,7 @@ then
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether gcc supports ParseTuple __format__" >&5
- $as_echo_n "checking whether gcc supports ParseTuple __format__... " >&6; }
- save_CFLAGS=$CFLAGS
-- CFLAGS="$CFLAGS -Werror"
-+ CFLAGS="$CFLAGS -Werror=format"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
-
@@ -7648,9 +7643,9 @@ then
LDCXXSHARED="$LDCXXSHARED "'$(PYTHONFRAMEWORKPREFIX)/$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'
else