[cvs] dists/10.4/stable/main/finkinfo/languages python27.info, 1.5, 1.6 python27.patch, 1.5, 1.6 python32.info, 1.4, 1.5 python32.patch, 1.3, 1.4

Tue, 29 Jan 2013 17:02:35 -0800 

Update of /cvsroot/fink/dists/10.4/stable/main/finkinfo/languages
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv8853

Modified Files:
        python27.info python27.patch python32.info python32.patch 
Log Message:
Sync with 10.7.

Index: python27.patch
===================================================================
RCS file: 
/cvsroot/fink/dists/10.4/stable/main/finkinfo/languages/python27.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- python27.patch      14 Apr 2012 01:58:51 -0000      1.5
+++ python27.patch      30 Jan 2013 01:02:26 -0000      1.6
@@ -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.4/stable/main/finkinfo/languages/python32.info,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- python32.info       7 May 2012 01:52:54 -0000       1.4
+++ python32.info       30 Jan 2013 01:02:26 -0000      1.5
@@ -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 <[email protected]>
 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
@@ -47,7 +47,7 @@
 CompileScript: <<
 #!/bin/sh -ex
        darwin_vers=`uname -r | cut -d. -f1`
-       if [ "$darwin_vers" = 11 ]; then
+       if [ "$darwin_vers" -ge 11 ]; then
                perl -pi -e 's/ -lSystemStubs//' ./configure
                perl -pi -e 's/-O3/-fwrapv -O3/' ./configure
        fi
@@ -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
        <<
 <<
 
@@ -97,7 +97,7 @@
  Package: %N-shlibs
  Depends: libgettext8-shlibs
  Files: 
lib/python%type_raw[python]/config-%type_raw[python]m/libpython%type_raw[python]m.dylib
- Shlibs: 
%p/lib/python3.2/confhon]/config-%type_raw[python]m/libpython%type_raw[python]m.dylibs
 test_import test_urllib' || exit 2 Ä\Gÿuzÿ{k+€š|k+• 
|k+’ˆ}k+ Ä\Gÿ€ 
>}k+¹\Gÿ`¸\Gÿkÿ{k+6 
èè!è!0Ä\Gÿ 
Ä\GÿxD}k+º\Gÿ’rÿ{k+†ÿ{k+0Ä\Gÿ`rÿ{k+oÄ\GÿÀ?€}k+uzÿ{k+0€}k+Ø4€}k+¨9€}k+€š|k+xD}k+º\Gÿ`¹\Gÿkÿ{k+à!à!0Ä\Gÿ
 
Ä\GÿHü|k+p»\Gÿ’rÿ{k+†ÿ{k+0Ä\Gÿ`rÿ{k+oÄ\Gÿ`Ä\GÿXÄ\Gÿ8›
 |k+Œp˜ 
Ä\Gÿuzÿ{k+€š|k+p»\Gÿ@º\Gÿkÿ{k+GHIJKMNOP0Ä\Gÿ
 
Ä\GÿHÅÒ|k+½\Gÿ’rÿ{k+†ÿ{k+0Ä\Gÿ0?€}k+uzÿ{k+P}k+
 
ù¯|k+0€}k+Ø4€}k+¨9€}k+€š|k+HÅÒ|k+½\GÿP»\Gÿkÿ{k+8ÅÒ|k+½\Gÿ€»\Gÿkÿ{k+(ÅÒ|k+½\Gÿ°»\Gÿkÿ{k+ÅÒ|k+½\Gÿà»\Gÿkÿ{k+
 
¨>€}k+uzÿ{k+¨9€}k+`¶\GÿŠH°|k+eyÿ{k+Ø4€}k+€¼\GÿyH°|k+eyÿ{k+0€}k+°¼\GÿZH°|k+eyÿ{k+Øô¯|k+P}k+
 ù¯|k+0€}k+ØT}k+Ø4€}k+¨9€}k+€š|k+8› 
|k+½{|k+ 
Ä\Gÿp‹¯|k+`¾\Gÿ0½\Gÿkÿ{k+5678:<=>?@BD0Ä\Gÿ
 Ä\Gÿ Áx|k+ Ä\Gÿuzÿ{k+• 
|k+à¼\Gÿ½{|k+eyÿ{k+• |k+Õ_@fÆS 
Qöl±íìÓG|k+ Ä\Gÿ 
Áx|k+p¿\Gÿ@¾\Gÿkÿ{k+u]ÞÓ     4Q 
÷U^Qʉ§¶uª¹ñìò*ēv0Ä\Gÿ 
Ä\GÿHE|k+€Á\Gÿ’rÿ{k+†ÿ{k+0Ä\Gÿ`rÿ{k+oÄ\Gÿ`Ä\GÿXÄ\Gÿ_}k+uzÿ{k+ØT}k+
 
Y}k+€š|k+€Á\Gÿ0¿\Gÿkÿ{k+8E|k+€Á\Gÿ`¿\Gÿkig-%type_raw[python]m/libpython3.2m.dylib
 3.2.0 %n (>= 3.2-1)
+ Shlibs: 
%p/lib/python%type_raw[python]/config-%type_raw[python]m/libpython3.2m.dylib 
3.2.0 %n (>= 3.2-1)
  DocFiles: README LICENSE 
 <<
 SplitOff2: <<

Index: python27.info
===================================================================
RCS file: 
/cvsroot/fink/dists/10.4/stable/main/finkinfo/languages/python27.info,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- python27.info       14 Apr 2012 01:58:51 -0000      1.5
+++ python27.info       30 Jan 2013 01:02:26 -0000      1.6
@@ -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 <[email protected]>
@@ -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
 <<
@@ -52,7 +52,7 @@
 CompileScript: <<
 #!/bin/sh -ex
        darwin_vers=`uname -r | cut -d. -f1`
-       if [ "$darwin_vers" = 11 ]; then
+       if [ "$darwin_vers" -ge 11 ]; then
                perl -pi -e 's/ -lSystemStubs//' ./configure
                perl -pi -e 's/-O3/-fwrapv -O3/' ./configure
        fi

Index: python32.patch
===================================================================
RCS file: 
/cvsroot/fink/dists/10.4/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:59 -0000      1.3
+++ python32.patch      30 Jan 2013 01:02:26 -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
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs

Reply via email to