summaryrefslogtreecommitdiff
path: root/lang/python26/patches
diff options
context:
space:
mode:
authordholland <dholland>2012-12-16 23:32:46 +0000
committerdholland <dholland>2012-12-16 23:32:46 +0000
commit65b2c1d318940aaeb871d5bd43777e6545e1f4b5 (patch)
treea5f98861212fcd63430ffc30f4caf7111eee0f1d /lang/python26/patches
parent674a8f384ea1b4a856e7c7548d4807e7e1e7429d (diff)
downloadpkgsrc-65b2c1d318940aaeb871d5bd43777e6545e1f4b5.tar.gz
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.) Same as -r1.8 of python27's patch-al.
Diffstat (limited to 'lang/python26/patches')
-rw-r--r--lang/python26/patches/patch-al22
1 files changed, 19 insertions, 3 deletions
diff --git a/lang/python26/patches/patch-al b/lang/python26/patches/patch-al
index e12c3102550..010468f7eec 100644
--- a/lang/python26/patches/patch-al
+++ b/lang/python26/patches/patch-al
@@ -1,7 +1,14 @@
-$NetBSD: patch-al,v 1.9 2011/09/14 17:07:01 hans Exp $
+$NetBSD: patch-al,v 1.10 2012/12/16 23:32:46 dholland Exp $
---- configure.orig 2010-05-25 02:27:03.000000000 +0000
-+++ configure 2011-09-06 18:58:15.336443123 +0200
+- recognize OpenBSD, MirBSD, Interix, Solaris 11
+- 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-10 15:32:11.000000000 +0000
++++ configure
@@ -2833,7 +2833,7 @@ case $ac_sys_system/$ac_sys_release in
# Reconfirmed for OpenBSD 3.3 by Zachary Hamm, for 3.4 by Jason Ish.
# In addition, Stefan Krah confirms that issue #1244610 exists through
@@ -54,6 +61,15 @@ $NetBSD: patch-al,v 1.9 2011/09/14 17:07:01 hans Exp $
INSTSONAME="$LDLIBRARY".$SOVERSION
;;
hp*|HP*)
+@@ -5470,7 +5465,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. */
+
@@ -7359,8 +7354,8 @@ then
LDSHARED="$LDSHARED "'$(PYTHONFRAMEWORKPREFIX)/$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'
else