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 <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 @@ -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/conf hon]/config-%type_raw[python]m/libpython%type_raw[python]m.dylib s 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+ G H I J K M N O P 0Ä\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+ 5 6 7 8 : <