From b211bc6c30a551639b3b5ab1aeb1a94d6124e5bc Mon Sep 17 00:00:00 2001
From: dholland <dholland@pkgsrc.org>
Date: Sun, 16 Dec 2012 23:22:28 +0000
Subject: Use -Werror=format when checking HAVE_ATTRIBUTE_FORMAT_PARSETUPLE, so
 injecting -Wall -Wno-error does not cause the test to produce the wrong
 answer. (If it does, the wrong information is installed in /usr/include, and
 ultimately provokes PR 47342.)

---
 lang/python27/distinfo         |  4 ++--
 lang/python27/patches/patch-al | 18 +++++++++++++++++-
 2 files changed, 19 insertions(+), 3 deletions(-)

(limited to 'lang/python27')

diff --git a/lang/python27/distinfo b/lang/python27/distinfo
index 17622386573..441136d7f7b 100644
--- a/lang/python27/distinfo
+++ b/lang/python27/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.19 2012/08/14 18:19:01 drochner Exp $
+$NetBSD: distinfo,v 1.20 2012/12/16 23:22:28 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) = 9c6d0837e5c5b4e79285ed83966e6bab9d22d6f8
+SHA1 (patch-al) = f64f58c93c8cfb9ee3f4f7b726527e5c95441f9f
 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 ac36a423af8..dd90acae577 100644
--- a/lang/python27/patches/patch-al
+++ b/lang/python27/patches/patch-al
@@ -1,4 +1,11 @@
-$NetBSD: patch-al,v 1.7 2012/04/13 18:47:31 adam Exp $
+$NetBSD: patch-al,v 1.8 2012/12/16 23:22:29 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)
 
 --- configure.orig	2012-04-09 23:07:36.000000000 +0000
 +++ configure
@@ -28,6 +35,15 @@ $NetBSD: patch-al,v 1.7 2012/04/13 18:47:31 adam 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
-- 
cgit v1.2.3