diff options
| author | dholland <dholland> | 2012-12-21 20:28:36 +0000 |
|---|---|---|
| committer | dholland <dholland> | 2012-12-21 20:28:36 +0000 |
| commit | 6f32676c8c0affc19e187b2c60ce4bbb74a68f93 (patch) | |
| tree | 2adce882617831d2a7122b229aec2f76d54b6491 | |
| parent | e69f850a9d3176e0a7ed685c411ae34cd017a4c6 (diff) | |
| download | pkgsrc-6f32676c8c0affc19e187b2c60ce4bbb74a68f93.tar.gz | |
Revert previous as it breaks clang. PR 47342
| -rw-r--r-- | lang/python26/distinfo | 4 | ||||
| -rw-r--r-- | lang/python26/patches/patch-al | 17 |
2 files changed, 5 insertions, 16 deletions
diff --git a/lang/python26/distinfo b/lang/python26/distinfo index 6159992c024..17787d0f886 100644 --- a/lang/python26/distinfo +++ b/lang/python26/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.48 2012/12/16 23:32:46 dholland Exp $ +$NetBSD: distinfo,v 1.49 2012/12/21 20:28:36 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) = f5a762eb56692cb5b2724cf3f5f3d85edfdff7d9 +SHA1 (patch-al) = 8425c119a64d67701e2b94aa9db3359150e0d7c0 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 010468f7eec..63d2a9859ec 100644 --- a/lang/python26/patches/patch-al +++ b/lang/python26/patches/patch-al @@ -1,14 +1,12 @@ -$NetBSD: patch-al,v 1.10 2012/12/16 23:32:46 dholland Exp $ +$NetBSD: patch-al,v 1.11 2012/12/21 20:28:36 dholland Exp $ - 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 +--- configure.orig 2010-05-25 02:27:03.000000000 +0000 ++++ configure 2011-09-06 18:58:15.336443123 +0200 @@ -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 @@ -61,15 +59,6 @@ $NetBSD: patch-al,v 1.10 2012/12/16 23:32:46 dholland 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 |