Update of /cvsroot/fink/dists/10.7/stable/main/finkinfo/languages
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv8385
Modified Files:
python27.info python27.patch python32.info python32.patch
Log Message:
Incorporate patch from http://bugs.python.org/issue15477 to fix building with
Xcode 4.6.
Index: python27.patch
===================================================================
RCS file:
/cvsroot/fink/dists/10.7/stable/main/finkinfo/languages/python27.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- python27.patch 14 Apr 2012 01:58:43 -0000 1.3
+++ python27.patch 30 Jan 2013 00:54:24 -0000 1.4
@@ -402,3 +402,57 @@
self.extensions.extend([ext, ext_test])
if not '--with-system-ffi' in sysconfig.get_config_var("CONFIG_ARGS"):
+diff --git a/Modules/_math.c b/Modules/_math.c
+--- a/Modules/_math.c
++++ b/Modules/_math.c
+@@ -189,6 +189,27 @@ double
+ significant loss of precision that arises from direct evaluation when x is
+ small. */
+
++#ifdef HAVE_LOG1P
++
++double
++_Py_log1p(double x)
++{
++ /* Some platforms supply a log1p function but don't respect the sign of
++ zero: log1p(-0.0) gives 0.0 instead of the correct result of -0.0.
++
++ To save fiddling with configure tests and platform checks, we handle
the
++ special case of zero input directly on all platforms.
++ */
++ if (x == 0.0) {
++ return x;
++ }
++ else {
++ return log1p(x);
++ }
++}
++
++#else
++
+ double
+ _Py_log1p(double x)
+ {
+@@ -230,3 +251,5 @@ double
+ return log(1.+x);
+ }
+ }
++
++#endif /* ifdef HAVE_LOG1P */
+diff --git a/Modules/_math.h b/Modules/_math.h
+--- a/Modules/_math.h
++++ b/Modules/_math.h
+@@ -36,10 +36,6 @@ double _Py_log1p(double x);
+ #define m_expm1 _Py_expm1
+ #endif
+
+-#ifdef HAVE_LOG1P
+-#define m_log1p log1p
+-#else
+-/* if the system doesn't have log1p, use the substitute
+- function defined in Modules/_math.c. */
++/* Use the substitute from _math.c on all platforms:
++ it includes workarounds for buggy handling of zeros. */
+ #define m_log1p _Py_log1p
+-#endif
+
Index: python32.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.7/stable/main/finkinfo/languages/python32.info,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- python32.info 7 May 2012 01:52:46 -0000 1.6
+++ python32.info 30 Jan 2013 00:54:24 -0000 1.7
@@ -1,7 +1,7 @@
Info2: <<
Package: python%type_pkg[python]
Version: 3.2.3
-Revision: 2
+Revision: 3
Type: python 3.2
Maintainer: Daniel Johnson <dan...@daniel-johnson.org>
Depends: <<
@@ -39,7 +39,7 @@
Source2: http://www.python.org/ftp/python/doc/%v/python-%v-docs-html.tar.bz2
Source2-MD5: c970e7bcbc3268a3dbc2de5c15b5a3d3
PatchFile: %n.patch
-PatchFile-MD5: 5f71e6073af75b59107f5153be15593f
+PatchFile-MD5: fdfdcbdfd7e33d8ac35e3ad7eb9db0c8
PatchScript: sed 's|@PREFIX@|%p|g' < %{PatchFile} | patch -p1
UseMaxBuildJobs: true
@@ -61,7 +61,7 @@
InfoTest: <<
TestScript: <<
- LANG=en_US.UTF-8 make -k test EXTRATESTOPTS='-w -x
test_distutils test_argparse test_httpservers test_import' || exit 2
+ LANG=en_US.UTF-8 make -k test EXTRATESTOPTS='-w -x
test_distutils test_argparse test_httpservers test_import test_urllib' || exit 2
<<
<<
Index: python27.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.7/stable/main/finkinfo/languages/python27.info,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- python27.info 22 Apr 2012 14:16:55 -0000 1.4
+++ python27.info 30 Jan 2013 00:54:24 -0000 1.5
@@ -1,7 +1,7 @@
Info2: <<
Package: python%type_pkg[python]
Version: 2.7.3
-Revision: 1
+Revision: 2
Epoch: 1
Type: python 2.7
Maintainer: Daniel Johnson <dan...@daniel-johnson.org>
@@ -42,7 +42,7 @@
Source2: http://www.python.org/ftp/python/doc/%v/python-%v-docs-html.tar.bz2
Source2-MD5: 101c13d39f76fd6706aac3a9196b2f01
PatchFile: %n.patch
-PatchFile-MD5: 6c7ff1d6749a92be166f8b8cf9d1c29b
+PatchFile-MD5: fa848f2e65a867a3eda68c5fc308fe8e
PatchScript: <<
sed 's|@PREFIX@|%p|g' < %{PatchFile} | patch -p1
<<
Index: python32.patch
===================================================================
RCS file:
/cvsroot/fink/dists/10.7/stable/main/finkinfo/languages/python32.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- python32.patch 14 Apr 2012 02:47:48 -0000 1.3
+++ python32.patch 30 Jan 2013 00:54:24 -0000 1.4
@@ -325,3 +325,75 @@
self.extensions.extend([ext, ext_test])
if not '--with-system-ffi' in sysconfig.get_config_var("CONFIG_ARGS"):
+diff --git a/Lib/test/test_cmath.py b/Lib/test/test_cmath.py
+--- a/Lib/test/test_cmath.py
++++ b/Lib/test/test_cmath.py
+@@ -519,15 +519,11 @@ class CMathTests(unittest.TestCase):
+ # of zero, then atan and atanh will also have difficulties with
+ # the sign of complex zeros.
+ @requires_IEEE_754
+- @unittest.skipIf(sysconfig.get_config_var('LOG1P_DROPS_ZERO_SIGN'),
+- "system log1p() function doesn't preserve the sign")
+ def testAtanSign(self):
+ for z in complex_zeros:
+ self.assertComplexIdentical(cmath.atan(z), z)
+
+ @requires_IEEE_754
+- @unittest.skipIf(sysconfig.get_config_var('LOG1P_DROPS_ZERO_SIGN'),
+- "system log1p() function doesn't preserve the sign")
+ def testAtanhSign(self):
+ for z in complex_zeros:
+ self.assertComplexIdentical(cmath.atanh(z), z)
+diff --git a/Modules/_math.c b/Modules/_math.c
+--- a/Modules/_math.c
++++ b/Modules/_math.c
+@@ -189,6 +189,27 @@ double
+ significant loss of precision that arises from direct evaluation when x is
+ small. */
+
++#ifdef HAVE_LOG1P
++
++double
++_Py_log1p(double x)
++{
++ /* Some platforms supply a log1p function but don't respect the sign of
++ zero: log1p(-0.0) gives 0.0 instead of the correct result of -0.0.
++
++ To save fiddling with configure tests and platform checks, we handle
the
++ special case of zero input directly on all platforms.
++ */
++ if (x == 0.0) {
++ return x;
++ }
++ else {
++ return log1p(x);
++ }
++}
++
++#else
++
+ double
+ _Py_log1p(double x)
+ {
+@@ -230,3 +251,5 @@ double
+ return log(1.+x);
+ }
+ }
++
++#endif /* ifdef HAVE_LOG1P */
+diff --git a/Modules/_math.h b/Modules/_math.h
+--- a/Modules/_math.h
++++ b/Modules/_math.h
+@@ -36,10 +36,6 @@ double _Py_log1p(double x);
+ #define m_expm1 _Py_expm1
+ #endif
+
+-#ifdef HAVE_LOG1P
+-#define m_log1p log1p
+-#else
+-/* if the system doesn't have log1p, use the substitute
+- function defined in Modules/_math.c. */
++/* Use the substitute from _math.c on all platforms:
++ it includes workarounds for buggy handling of zeros. */
+ #define m_log1p _Py_log1p
+-#endif
------------------------------------------------------------------------------
Everyone hates slow websites. So do we.
Make your web apps faster with AppDynamics
Download AppDynamics Lite for free today:
http://p.sf.net/sfu/appdyn_d2d_jan
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
