Update of /cvsroot/fink/dists/10.4/stable/main/finkinfo/10.4-EOL/languages
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv30554
Modified Files:
python32.info python32.patch
Log Message:
sync. w/ 10.!4/stable, validated on powerpc-darwin8
Index: python32.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/stable/main/finkinfo/10.4-EOL/languages/python32.info,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- python32.info 18 Feb 2013 21:34:43 -0000 1.3
+++ python32.info 30 May 2013 02:04:09 -0000 1.4
@@ -1,7 +1,7 @@
Info2: <<
Package: python%type_pkg[python]
-Version: 3.2.3
-Revision: 3
+Version: 3.2.5
+Revision: 1
Type: python 3.2
Maintainer: Daniel Johnson <[email protected]>
Depends: <<
@@ -11,8 +11,8 @@
gdbm3-shlibs,
libgettext8-shlibs,
libncursesw5-shlibs,
- openssl100-shlibs (>= 1.0.1-1),
- readline5-shlibs,
+ openssl100-shlibs (>= 1.0.1e-1),
+ readline6-shlibs,
sqlite3-shlibs (>= 3.7.2-2),
tcltk (>= 8.4.1-1),
x11
@@ -27,22 +27,26 @@
gettext-tools,
libgettext8-dev,
libncursesw5,
- readline5,
+ readline6,
sqlite3-dev (>= 3.7.2-2),
- openssl100-dev (>= 1.0.1-1),
+ openssl100-dev (>= 1.0.1e-1),
tcltk-dev (>= 8.4.1-1),
x11-dev
<<
Provides: argparse-py%type_pkg[python], futures-py%type_pkg[python]
Source: http://python.org/ftp/python/%v/Python-%v.tar.bz2
-Source-MD5: cea34079aeb2e21e7b60ee82a0ac286b
+Source-MD5: 99e7de6abd96185480f819c5029709d2
Source2: http://www.python.org/ftp/python/doc/%v/python-%v-docs-html.tar.bz2
-Source2-MD5: c970e7bcbc3268a3dbc2de5c15b5a3d3
+Source2-MD5: a57c3e74ae2fd1014fca2688b10291e9
PatchFile: %n.patch
-PatchFile-MD5: fdfdcbdfd7e33d8ac35e3ad7eb9db0c8
+PatchFile-MD5: be661025c2d99c41493c31706b1e8805
PatchScript: sed 's|@PREFIX@|%p|g' < %{PatchFile} | patch -p1
UseMaxBuildJobs: true
+
+SetCC: gcc
+SetCXX: g++
+
ConfigureParams: --enable-shared --with-dbmliborder=gdbm
--enable-loadable-sqlite-extensions
CompileScript: <<
#!/bin/sh -ex
@@ -62,6 +66,9 @@
InfoTest: <<
TestScript: <<
LANG=en_US.UTF-8 make -k test EXTRATESTOPTS='-w -x
test_distutils test_argparse test_httpservers test_import test_urllib' || exit 2
+ # Remove stray .pyc that get made during tests to keep
validator happy.
+ find ./Tools -name "*.pyc" -delete
+ find ./Tools -name "__pycache__" -delete
<<
<<
@@ -85,8 +92,6 @@
rm 2to3
popd
- ln -s python%type_raw[python].1 %i/share/man/man1/python3.1
-
# install some docs and other useful tidbits
rm -rf Misc/RPM
/bin/cp -R Misc Tools %i/lib/python%type_raw[python]
Index: python32.patch
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/stable/main/finkinfo/10.4-EOL/languages/python32.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- python32.patch 18 Feb 2013 21:34:44 -0000 1.3
+++ python32.patch 30 May 2013 02:04:09 -0000 1.4
@@ -1,6 +1,6 @@
-diff -ru Python-3.2.2.orig/Lib/ctypes/macholib/dyld.py
Python-3.2.2/Lib/ctypes/macholib/dyld.py
---- Python-3.2.2.orig/Lib/ctypes/macholib/dyld.py 2011-09-03
12:16:40.000000000 -0400
-+++ Python-3.2.2/Lib/ctypes/macholib/dyld.py 2011-12-29 19:02:03.000000000
-0500
+diff --git a/Lib/ctypes/macholib/dyld.py b/Lib/ctypes/macholib/dyld.py
+--- a/Lib/ctypes/macholib/dyld.py
++++ b/Lib/ctypes/macholib/dyld.py
@@ -23,6 +23,7 @@
DEFAULT_LIBRARY_FALLBACK = [
@@ -9,10 +9,29 @@
"/usr/local/lib",
"/lib",
"/usr/lib",
-diff -ru Python-3.2.2.orig/Makefile.pre.in Python-3.2.2/Makefile.pre.in
---- Python-3.2.2.orig/Makefile.pre.in 2011-09-03 12:16:45.000000000 -0400
-+++ Python-3.2.2/Makefile.pre.in 2011-12-29 19:00:45.000000000 -0500
-@@ -463,8 +463,7 @@
+diff --git a/Lib/distutils/sysconfig.py b/Lib/distutils/sysconfig.py
+--- a/Lib/distutils/sysconfig.py
++++ b/Lib/distutils/sysconfig.py
+@@ -176,7 +176,14 @@
+
+ newcc = None
+ if 'CC' in os.environ:
+- cc = os.environ['CC']
++ newcc = os.environ['CC']
++ # On OS X, if CC is overridden, use that as the default
++ # command for LDSHARED as well
++ if (sys.platform == 'darwin'
++ and 'LDSHARED' not in os.environ
++ and ldshared.startswith(cc)):
++ ldshared = newcc + ldshared[len(cc):]
++ cc = newcc
+ if 'CXX' in os.environ:
+ cxx = os.environ['CXX']
+ if 'LDSHARED' in os.environ:
+diff --git a/Makefile.pre.in b/Makefile.pre.in
+--- a/Makefile.pre.in
++++ b/Makefile.pre.in
+@@ -481,8 +481,7 @@
$(BLDSHARED) $(NO_AS_NEEDED) -o $@ -Wl,-h$@ $^
libpython$(LDVERSION).dylib: $(LIBRARY_OBJS)
@@ -22,7 +41,7 @@
libpython$(VERSION).sl: $(LIBRARY_OBJS)
$(LDSHARED) -o $@ $(LIBRARY_OBJS) $(MODLIBS) $(SHLIBS) $(LIBC) $(LIBM)
$(LDLAST)
-@@ -837,7 +836,7 @@
+@@ -872,7 +871,7 @@
# Install the interpreter with $(VERSION) affixed
# This goes into $(exec_prefix)
altbininstall: $(BUILDPYTHON)
@@ -31,7 +50,7 @@
do \
if test ! -d $(DESTDIR)$$i; then \
echo "Creating directory $$i"; \
-@@ -850,15 +849,15 @@
+@@ -885,15 +884,15 @@
if test -f $(DESTDIR)$(BINDIR)/$(PYTHON)$(VERSION)$(EXE) -o -h
$(DESTDIR)$(BINDIR)/$(PYTHON)$(VERSION)$(EXE); \
then rm -f $(DESTDIR)$(BINDIR)/python$(VERSION)$(EXE); \
fi; \
@@ -50,7 +69,7 @@
fi \
fi; \
if test -n "$(PY3LIBRARY)"; then \
-@@ -872,7 +871,7 @@
+@@ -907,7 +906,7 @@
then rm -f $(DESTDIR)$(BINDIR)/$(PYTHON)3$(EXE); \
else true; \
fi
@@ -59,10 +78,10 @@
-if test "$(VERSION)" != "$(LDVERSION)"; then \
rm -f $(DESTDIR)$(BINDIR)/python$(VERSION)-config; \
(cd $(DESTDIR)$(BINDIR); $(LN) -s python$(LDVERSION)-config
python$(VERSION)-config); \
-diff -ru Python-3.2.2.orig/Misc/python-config.in
Python-3.2.2/Misc/python-config.in
---- Python-3.2.2.orig/Misc/python-config.in 2011-09-03 12:16:45.000000000
-0400
-+++ Python-3.2.2/Misc/python-config.in 2011-12-29 19:00:45.000000000 -0500
-@@ -47,12 +47,10 @@
+diff --git a/Misc/python-config.in b/Misc/python-config.in
+--- a/Misc/python-config.in
++++ b/Misc/python-config.in
+@@ -47,13 +47,10 @@
elif opt in ('--libs', '--ldflags'):
libs = getvar('LIBS').split() + getvar('SYSLIBS').split()
libs.append('-lpython' + pyver + sys.abiflags)
@@ -73,14 +92,15 @@
if opt == '--ldflags':
- if not getvar('Py_ENABLE_SHARED'):
- libs.insert(0, '-L' + getvar('LIBPL'))
-- libs.extend(getvar('LINKFORSHARED').split())
+- if not getvar('PYTHONFRAMEWORK'):
+- libs.extend(getvar('LINKFORSHARED').split())
+ libs.insert(0, '-L' + getvar('LIBPL'))
print(' '.join(libs))
elif opt == '--extension-suffix':
-diff -ru Python-3.2.2.orig/Misc/python.pc.in Python-3.2.2/Misc/python.pc.in
---- Python-3.2.2.orig/Misc/python.pc.in 2011-09-03 12:16:45.000000000
-0400
-+++ Python-3.2.2/Misc/python.pc.in 2011-12-29 19:00:45.000000000 -0500
+diff --git a/Misc/python.pc.in b/Misc/python.pc.in
+--- a/Misc/python.pc.in
++++ b/Misc/python.pc.in
@@ -1,7 +1,7 @@
# See: man pkg-config
prefix=@prefix@
@@ -90,9 +110,9 @@
includedir=@includedir@
Name: Python
-diff -ru Python-3.2.2.orig/Modules/_dbmmodule.c
Python-3.2.2/Modules/_dbmmodule.c
---- Python-3.2.2.orig/Modules/_dbmmodule.c 2011-09-03 12:16:46.000000000
-0400
-+++ Python-3.2.2/Modules/_dbmmodule.c 2011-12-29 19:00:45.000000000 -0500
+diff --git a/Modules/_dbmmodule.c b/Modules/_dbmmodule.c
+--- a/Modules/_dbmmodule.c
++++ b/Modules/_dbmmodule.c
@@ -20,7 +20,7 @@
static char *which_dbm = "GNU gdbm"; /* EMX port of GDBM */
#endif
@@ -102,31 +122,10 @@
static char *which_dbm = "GNU gdbm";
#elif defined(HAVE_GDBM_DASH_NDBM_H)
#include <gdbm-ndbm.h>
-diff -ru Python-3.2.2.orig/Modules/posixmodule.c
Python-3.2.2/Modules/posixmodule.c
---- Python-3.2.2.orig/Modules/posixmodule.c 2011-09-03 12:16:46.000000000
-0400
-+++ Python-3.2.2/Modules/posixmodule.c 2011-12-29 19:00:45.000000000 -0500
-@@ -501,7 +501,7 @@
- #endif /* MS_WINDOWS */
-
- /* Return a dictionary corresponding to the POSIX environment table */
--#ifdef WITH_NEXT_FRAMEWORK
-+#ifdef __APPLE__
- /* On Darwin/MacOSX a shared library or framework has no access to
- ** environ directly, we must obtain it with _NSGetEnviron().
- */
-@@ -528,7 +528,7 @@
- d = PyDict_New();
- if (d == NULL)
- return NULL;
--#ifdef WITH_NEXT_FRAMEWORK
-+#ifdef __APPLE__
- if (environ == NULL)
- environ = *_NSGetEnviron();
- #endif
-diff -ru Python-3.2.2.orig/configure Python-3.2.2/configure
---- Python-3.2.2.orig/configure 2011-09-03 12:16:50.000000000 -0400
-+++ Python-3.2.2/configure 2011-12-29 19:00:45.000000000 -0500
-@@ -4993,7 +4993,7 @@
+diff --git a/configure b/configure
+--- a/configure
++++ b/configure
+@@ -5025,7 +5025,7 @@
;;
Darwin*)
LDLIBRARY='libpython$(LDVERSION).dylib'
@@ -135,7 +134,7 @@
RUNSHARED='DYLD_LIBRARY_PATH=`pwd`:${DYLD_LIBRARY_PATH}'
;;
AIX*)
-@@ -7510,8 +7510,8 @@
+@@ -7652,8 +7652,8 @@
#ARCH_RUN_32BIT="true"
fi
@@ -146,7 +145,7 @@
LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -compatibility_version $(VERSION)
-current_version $(VERSION)';;
esac
-@@ -7627,15 +7627,6 @@
+@@ -7783,15 +7783,6 @@
# Use -undefined dynamic_lookup whenever possible (10.3 and
later).
# This allows an extension to be used in any Python
@@ -162,7 +161,7 @@
LDSHARED='$(CC) -bundle'
LDCXXSHARED='$(CXX) -bundle'
if test "$enable_framework" ; then
-@@ -7645,11 +7636,10 @@
+@@ -7801,11 +7792,10 @@
LDCXXSHARED="$LDCXXSHARED
"'$(PYTHONFRAMEWORKPREFIX)/$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'
else
# No framework, use the Python app as
bundle-loader
@@ -177,7 +176,7 @@
;;
Linux*|GNU*|QNX*)
LDSHARED='$(CC) -shared'
-@@ -7758,7 +7748,7 @@
+@@ -7914,7 +7904,7 @@
Linux*|GNU*) LINKFORSHARED="-Xlinker -export-dynamic";;
# -u libsys_s pulls in all symbols in libsys
Darwin/*)
@@ -186,7 +185,7 @@
if test "$enable_framework"
then
LINKFORSHARED="$LINKFORSHARED
"'$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'
-@@ -13686,7 +13676,7 @@
+@@ -13846,7 +13836,7 @@
if test $ac_sys_system = Darwin
then
@@ -195,10 +194,10 @@
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for %zd printf() format
support" >&5
-diff -ru Python-3.2.2.orig/setup.py Python-3.2.2/setup.py
---- Python-3.2.2.orig/setup.py 2011-09-03 12:16:50.000000000 -0400
-+++ Python-3.2.2/setup.py 2011-12-29 19:00:45.000000000 -0500
-@@ -269,13 +269,17 @@
+diff --git a/setup.py b/setup.py
+--- a/setup.py
++++ b/setup.py
+@@ -265,13 +265,17 @@
longest, g))
if missing:
@@ -216,7 +215,7 @@
if self.failed:
failed = self.failed[:]
-@@ -283,6 +287,7 @@
+@@ -279,6 +283,7 @@
print("Failed to build these modules:")
print_three_column(failed)
print()
@@ -224,7 +223,7 @@
def build_extension(self, ext):
-@@ -396,9 +401,8 @@
+@@ -413,9 +418,8 @@
# Ensure that /usr/local is always used, but the local build
# directories (i.e. '.' and 'Include') must be first. See issue
# 10520.
@@ -236,7 +235,7 @@
# Add paths specified in the environment variables LDFLAGS and
# CPPFLAGS for header and library files.
-@@ -957,12 +959,7 @@
+@@ -978,12 +982,7 @@
# We hunt for #define SQLITE_VERSION "n.n.n"
# We need to find >= sqlite version 3.0.8
sqlite_incdir = sqlite_libdir = None
@@ -250,16 +249,16 @@
]
MIN_SQLITE_VERSION_NUMBER = (3, 0, 8)
MIN_SQLITE_VERSION = ".".join([str(x)
-@@ -974,7 +971,7 @@
+@@ -995,7 +994,7 @@
if sys.platform == 'darwin':
sysroot = macosx_sdk_root()
-- for d in inc_dirs + sqlite_inc_paths:
-+ for d in sqlite_inc_paths:
- f = os.path.join(d, "sqlite3.h")
-
+- for d_ in inc_dirs + sqlite_inc_paths:
++ for d_ in sqlite_inc_paths:
+ d = d_
if sys.platform == 'darwin' and is_macosx_sdk_path(d):
-@@ -1007,11 +1004,9 @@
+ d = os.path.join(sysroot, d[1:])
+@@ -1028,11 +1027,9 @@
sqlite_dirs_to_check = [
os.path.join(sqlite_incdir, '..', 'lib64'),
os.path.join(sqlite_incdir, '..', 'lib'),
@@ -272,7 +271,7 @@
if sqlite_libfile:
sqlite_libdir =
[os.path.abspath(os.path.dirname(sqlite_libfile))]
-@@ -1093,7 +1088,7 @@
+@@ -1118,7 +1115,7 @@
if self.compiler.find_library_file(lib_dirs,
'gdbm_compat'):
gdbm_libs.append('gdbm_compat')
@@ -281,7 +280,7 @@
print("building dbm using gdbm")
dbmext = Extension(
'_dbm', ['_dbmmodule.c'],
-@@ -1168,6 +1163,7 @@
+@@ -1193,6 +1190,7 @@
panel_library = 'panelw'
curses_libs = [curses_library]
exts.append( Extension('_curses', ['_cursesmodule.c'],
@@ -289,7 +288,7 @@
libraries = curses_libs) )
elif curses_library == 'curses' and platform != 'darwin':
# OSX has an old Berkeley curses, not good enough for
-@@ -1188,6 +1184,7 @@
+@@ -1213,6 +1211,7 @@
if (module_enabled(exts, '_curses') and
self.compiler.find_library_file(lib_dirs, panel_library)):
exts.append( Extension('_curses_panel', ['_curses_panel.c'],
@@ -297,7 +296,7 @@
libraries = [panel_library] + curses_libs)
)
else:
missing.append('_curses_panel')
-@@ -1501,16 +1498,12 @@
+@@ -1542,16 +1541,12 @@
# AquaTk is a separate method. Only one Tkinter will be built on
# Darwin - either AquaTk, if it is found, or X11 based Tk.
platform = self.get_platform()
@@ -315,7 +314,7 @@
tklib = self.compiler.find_library_file(lib_dirs,
'tk' + version)
tcllib = self.compiler.find_library_file(lib_dirs,
-@@ -1735,7 +1728,8 @@
+@@ -1778,7 +1773,8 @@
sources=sources,
depends=depends)
ext_test = Extension('_ctypes_test',
@@ -325,75 +324,3 @@
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
------------------------------------------------------------------------------
Introducing AppDynamics Lite, a free troubleshooting tool for Java/.NET
Get 100% visibility into your production application - at no cost.
Code-level diagnostics for performance bottlenecks with <2% overhead
Download for free and get started troubleshooting in minutes.
http://p.sf.net/sfu/appdyn_d2d_ap1
_______________________________________________
Fink-commits mailing list
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs
