diff options
| author | dholland <dholland@pkgsrc.org> | 2012-12-16 23:32:46 +0000 |
|---|---|---|
| committer | dholland <dholland@pkgsrc.org> | 2012-12-16 23:32:46 +0000 |
| commit | 0c354312d1c7b70fb0c103159ee58a059e405ecc (patch) | |
| tree | a5f98861212fcd63430ffc30f4caf7111eee0f1d | |
| parent | b211bc6c30a551639b3b5ab1aeb1a94d6124e5bc (diff) | |
| download | pkgsrc-0c354312d1c7b70fb0c103159ee58a059e405ecc.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.
| -rw-r--r-- | lang/python26/distinfo | 4 | ||||
| -rw-r--r-- | lang/python26/patches/patch-al | 22 |
2 files changed, 21 insertions, 5 deletions
diff --git a/lang/python26/distinfo b/lang/python26/distinfo index b418452d7d5..6159992c024 100644 --- a/lang/python26/distinfo +++ b/lang/python26/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.47 2012/08/14 18:41:19 drochner Exp $ +$NetBSD: distinfo,v 1.48 2012/12/16 23:32:46 dholland Exp $ SHA1 (Python-2.6.8.tar.bz2) = 348b727a9818146a57aa43203f37d8c6b462fe79 RMD160 (Python-2.6.8.tar.bz2) = fcfa3554af415cbddd3e8d68aead46f1e7b8e616 @@ -14,7 +14,7 @@ SHA1 (patch-ac) = 57c88d47f82630e67bcd27ab61bf4362035da2f2 SHA1 (patch-ad) = a997e39d16a8f0023125362b180d19ee97ab519b SHA1 (patch-ae) = a6d578b5f12eb42fbbcc11791576d2686a4807d9 SHA1 (patch-ah) = 501d220b41e578402f3400fe88e582aa2408a147 -SHA1 (patch-al) = e18800d53de022e4c24055f7d03b69af2837b089 +SHA1 (patch-al) = f5a762eb56692cb5b2724cf3f5f3d85edfdff7d9 SHA1 (patch-am) = 380dfaa8ca90532a52dcca972e34965f6e64fce1 SHA1 (patch-an) = 17b4e17b3b562c29a050e9bb20447084ce82b8ab SHA1 (patch-ao) = 8c6a156b0f0c2a6d319658477fff348e6a0c3603 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 |