Update of /cvsroot/fink/experimental/danielj
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv26835
Modified Files:
python32.info python32.patch
Log Message:
Update to 3.2a4. Fixed dbmmodule to actually work. Looks like it's been
non-working in all python versions. Woot for working test suite.
Index: python32.info
===================================================================
RCS file: /cvsroot/fink/experimental/danielj/python32.info,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- python32.info 15 Oct 2010 20:12:25 -0000 1.4
+++ python32.info 25 Nov 2010 04:05:20 -0000 1.5
@@ -1,7 +1,7 @@
Info2: <<
Package: python%type_pkg[python]
Version: 3.2
-Revision: 0.a3.1
+Revision: 0.a4.1
Type: python 3.2
Maintainer: Daniel Johnson <dan...@daniel-johnson.org>
Depends: <<
@@ -34,16 +34,17 @@
<<
Provides: argparse-py%type_pkg[python]
#Source: http://python.org/ftp/python/%v/Python-%v.tar.bz2
-Source: http://python.org/ftp/python/%v/Python-%{v}a3.tar.bz2
-Source-MD5: 2c7f690e6de62691a0427328a9654290
+Source: http://python.org/ftp/python/%v/Python-%{v}a4.tar.bz2
+Source-MD5: 1f94db4c5e56454e3eec26eafae43e6e
# No html docs yet.
#Source2: http://www.python.org/ftp/python/doc/%v/python-%v-docs-html.tar.bz2
#Source2-MD5: c9ccf8e9fc4d046c168af313706f159b
PatchFile: %n.patch
-PatchFile-MD5: 0ec4b5242d4913b529fc38b13f559f31
+PatchFile-MD5: 4f5531d505734402c9e0a4baa93e98cd
PatchScript: sed 's|@PREFIX@|%p|g' < %{PatchFile} | patch -p1
+
SetLDFLAGS: -L%p/lib/system-openssl/lib
-ConfigureParams: --enable-shared
+ConfigureParams: --enable-shared --with-dbmliborder=gdbm
CompileScript: <<
#!/bin/sh -ex
if [ "%m" = "x86_64" ]; then
@@ -53,7 +54,9 @@
fi
%{default_script}
<<
-InfoTest: TestScript: ./runtests.sh || exit 2
+
+InfoTest: TestScript: make test EXTRATESTOPTS='-w -x test_distutils'
+
InstallScript: <<
#!/bin/sh -ex
make install DESTDIR=%d
@@ -86,8 +89,8 @@
SplitOff: <<
Package: %N-shlibs
Depends: libgettext8-shlibs
- Files: lib/python%type_raw[python]/config/libpython%type_raw[python].dylib
- Shlibs: %p/lib/python3.2/config/libpython3.2.dylib 3.2.0 %n (>= 3.2-0.a1.1)
+ Files: lib/python%type_raw[python]/config/libpython%type_raw[python]m.dylib
+ Shlibs: %p/lib/python3.2/config/libpython3.2m.dylib 3.2.0 %n (>= 3.2-0.a4.1)
DocFiles: README LICENSE
<<
SplitOff2: <<
Index: python32.patch
===================================================================
RCS file: /cvsroot/fink/experimental/danielj/python32.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- python32.patch 15 Oct 2010 20:12:25 -0000 1.2
+++ python32.patch 25 Nov 2010 04:05:20 -0000 1.3
@@ -1,17 +1,19 @@
-diff -ru Python-3.2a3.orig/Makefile.pre.in Python-3.2a3/Makefile.pre.in
---- Python-3.2a3.orig/Makefile.pre.in 2010-10-10 05:37:12.000000000 -0400
-+++ Python-3.2a3/Makefile.pre.in 2010-10-15 16:02:17.000000000 -0400
-@@ -454,8 +454,7 @@
+diff -ru Python-3.2a4.orig/Makefile.pre.in Python-3.2a4/Makefile.pre.in
+--- Python-3.2a4.orig/Makefile.pre.in 2010-11-06 12:06:37.000000000 -0400
++++ Python-3.2a4/Makefile.pre.in 2010-11-24 22:52:55.000000000 -0500
+@@ -455,9 +455,8 @@
+ $(BLDSHARED) -o $@ $(LIBRARY_OBJS) $(MODLIBS) $(SHLIBS) $(LIBC)
$(LIBM) $(LDLAST); \
fi
- libpython$(VERSION).dylib: $(LIBRARY_OBJS)
+-libpython$(VERSION).dylib: $(LIBRARY_OBJS)
- $(CC) -dynamiclib -Wl,-single_module $(PY_LDFLAGS) -undefined
dynamic_lookup -Wl,-install_name,$(prefix)/lib/libpython$(VERSION).dylib
-Wl,-compatibility_version,$(VERSION) -Wl,-current_version,$(VERSION) -o $@
$(LIBRARY_OBJS) $(SHLIBS) $(LIBC) $(LIBM) $(LDLAST); \
-
++libpython$(LDVERSION).dylib: $(LIBRARY_OBJS)
+ $(CC) -dynamiclib -Wl,-single_module $(LDFLAGS) @LIBTOOL_CRUFT@ -o $@
$(LIBRARY_OBJS) $(SHLIBS) $(LIBC) $(LDLAST)
libpython$(VERSION).sl: $(LIBRARY_OBJS)
$(LDSHARED) -o $@ $(LIBRARY_OBJS) $(MODLIBS) $(SHLIBS) $(LIBC) $(LIBM)
$(LDLAST)
-@@ -819,7 +818,7 @@
+@@ -826,7 +825,7 @@
# Install the interpreter with $(VERSION) affixed
# This goes into $(exec_prefix)
altbininstall: $(BUILDPYTHON)
@@ -20,7 +22,7 @@
do \
if test ! -d $(DESTDIR)$$i; then \
echo "Creating directory $$i"; \
-@@ -832,9 +831,9 @@
+@@ -839,9 +838,9 @@
if test -n "$(DLLLIBRARY)" ; then \
$(INSTALL_SHARED) $(DLLLIBRARY) $(DESTDIR)$(BINDIR); \
else \
@@ -32,7 +34,7 @@
fi \
fi; \
else true; \
-@@ -845,7 +844,7 @@
+@@ -852,7 +851,7 @@
then rm -f $(DESTDIR)$(BINDIR)/$(PYTHON)3$(EXE); \
else true; \
fi
@@ -41,13 +43,13 @@
-rm -f $(DESTDIR)$(BINDIR)/python3-config
(cd $(DESTDIR)$(BINDIR); $(LN) -s python$(VERSION)-config
python3-config)
-rm -f $(DESTDIR)$(LIBPC)/python3.pc
-diff -ru Python-3.2a3.orig/Misc/python-config.in
Python-3.2a3/Misc/python-config.in
---- Python-3.2a3.orig/Misc/python-config.in 2010-09-12 16:58:19.000000000
-0400
-+++ Python-3.2a3/Misc/python-config.in 2010-10-15 16:02:17.000000000 -0400
-@@ -46,11 +46,10 @@
+diff -ru Python-3.2a4.orig/Misc/python-config.in
Python-3.2a4/Misc/python-config.in
+--- Python-3.2a4.orig/Misc/python-config.in 2010-10-18 13:09:07.000000000
-0400
++++ Python-3.2a4/Misc/python-config.in 2010-11-24 22:52:55.000000000 -0500
+@@ -47,11 +47,10 @@
elif opt in ('--libs', '--ldflags'):
libs = getvar('LIBS').split() + getvar('SYSLIBS').split()
- libs.append('-lpython'+pyver)
+ libs.append('-lpython' + pyver + sys.abiflags)
- # add the prefix/lib/pythonX.Y/config dir, but only if there is no
- # shared library in prefix/lib/.
+ # add the prefix/lib/pythonX.Y/config dir (fink keeps shared
@@ -59,9 +61,9 @@
libs.extend(getvar('LINKFORSHARED').split())
print(' '.join(libs))
-diff -ru Python-3.2a3.orig/Misc/python.pc.in Python-3.2a3/Misc/python.pc.in
---- Python-3.2a3.orig/Misc/python.pc.in 2009-05-24 16:39:11.000000000
-0400
-+++ Python-3.2a3/Misc/python.pc.in 2010-10-15 16:02:17.000000000 -0400
+diff -ru Python-3.2a4.orig/Misc/python.pc.in Python-3.2a4/Misc/python.pc.in
+--- Python-3.2a4.orig/Misc/python.pc.in 2010-10-18 13:09:07.000000000
-0400
++++ Python-3.2a4/Misc/python.pc.in 2010-11-24 22:52:55.000000000 -0500
@@ -1,6 +1,6 @@
pref...@prefix@
exec_pref...@exec_prefix@
@@ -70,9 +72,21 @@
included...@includedir@
Name: Python
-diff -ru Python-3.2a3.orig/Modules/posixmodule.c
Python-3.2a3/Modules/posixmodule.c
---- Python-3.2a3.orig/Modules/posixmodule.c 2010-09-23 20:03:39.000000000
-0400
-+++ Python-3.2a3/Modules/posixmodule.c 2010-10-15 16:02:17.000000000 -0400
+diff -ru Python-3.2a4.orig/Modules/_dbmmodule.c
Python-3.2a4/Modules/_dbmmodule.c
+--- Python-3.2a4.orig/Modules/_dbmmodule.c 2010-05-09 11:52:27.000000000
-0400
++++ Python-3.2a4/Modules/_dbmmodule.c 2010-11-24 22:53:44.000000000 -0500
+@@ -20,7 +20,7 @@
+ static char *which_dbm = "GNU gdbm"; /* EMX port of GDBM */
+ #endif
+ #elif defined(HAVE_GDBM_NDBM_H)
+-#include <gdbm/ndbm.h>
++#include <ndbm.h>
+ static char *which_dbm = "GNU gdbm";
+ #elif defined(HAVE_GDBM_DASH_NDBM_H)
+ #include <gdbm-ndbm.h>
+diff -ru Python-3.2a4.orig/Modules/posixmodule.c
Python-3.2a4/Modules/posixmodule.c
+--- Python-3.2a4.orig/Modules/posixmodule.c 2010-10-25 09:02:04.000000000
-0400
++++ Python-3.2a4/Modules/posixmodule.c 2010-11-24 22:52:55.000000000 -0500
@@ -438,7 +438,7 @@
#endif
@@ -91,19 +105,19 @@
if (environ == NULL)
environ = *_NSGetEnviron();
#endif
-diff -ru Python-3.2a3.orig/configure Python-3.2a3/configure
---- Python-3.2a3.orig/configure 2010-10-10 04:10:16.000000000 -0400
-+++ Python-3.2a3/configure 2010-10-15 16:02:17.000000000 -0400
-@@ -4924,7 +4924,7 @@
+diff -ru Python-3.2a4.orig/configure Python-3.2a4/configure
+--- Python-3.2a4.orig/configure 2010-10-31 21:44:30.000000000 -0400
++++ Python-3.2a4/configure 2010-11-24 22:52:55.000000000 -0500
+@@ -4934,7 +4934,7 @@
;;
Darwin*)
- LDLIBRARY='libpython$(VERSION).dylib'
-- BLDLIBRARY='-L. -lpython$(VERSION)'
-+ BLDLIBRARY="$LDLIBRARY"
+ LDLIBRARY='libpython$(LDVERSION).dylib'
+- BLDLIBRARY='-L. -lpython$(LDVERSION)'
++ BLDLIBRARY="`pwd`/$LDLIBRARY"
RUNSHARED='DYLD_LIBRARY_PATH=`pwd`:${DYLD_LIBRARY_PATH}'
;;
AIX*)
-@@ -7424,8 +7424,8 @@
+@@ -7352,8 +7352,8 @@
#ARCH_RUN_32BIT="true"
fi
@@ -114,7 +128,7 @@
LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -compatibility_version $(VERSION)
-current_version $(VERSION)';;
esac
-@@ -7541,15 +7541,6 @@
+@@ -7469,15 +7469,6 @@
# Use -undefined dynamic_lookup whenever possible (10.3 and
later).
# This allows an extension to be used in any Python
@@ -123,14 +137,14 @@
- if test "${enable_universalsdk}"; then
- LDFLAGS="${UNIVERSAL_ARCH_FLAGS} -isysroot
${UNIVERSALSDK} ${LDFLAGS}"
- fi
-- LDSHARED='$(CC) $(LDFLAGS) -bundle -undefined
dynamic_lookup'
-- LDCXXSHARED='$(CXX) $(LDFLAGS) -bundle -undefined
dynamic_lookup'
+- LDSHARED='$(CC) -bundle -undefined dynamic_lookup'
+- LDCXXSHARED='$(CXX) -bundle -undefined dynamic_lookup'
- BLDSHARED="$LDSHARED"
- else
- LDSHARED='$(CC) $(LDFLAGS) -bundle'
- LDCXXSHARED='$(CXX) $(LDFLAGS) -bundle'
+ LDSHARED='$(CC) -bundle'
+ LDCXXSHARED='$(CXX) -bundle'
if test "$enable_framework" ; then
-@@ -7559,11 +7550,10 @@
+@@ -7487,11 +7478,10 @@
LDCXXSHARED="$LDCXXSHARED
"'$(PYTHONFRAMEWORKPREFIX)/$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'
else
# No framework, use the Python app as
bundle-loader
@@ -138,14 +152,14 @@
- LDSHARED="$LDSHARED "'-bundle_loader
$(BINDIR)/python$(VERSION)$(EXE)'
- LDCXXSHARED="$LDCXXSHARED "'-bundle_loader
$(BINDIR)/python$(VERSION)$(EXE)'
+ BLDSHARED="$LDSHARED "'$(BLDLIBRARY)'
-+ LDSHARED="$LDSHARED "'-L$(BINLIBDEST)/config
-lpython$(VERSION)'
-+ LDCXXSHARED="$LDCXXSHARED
"'-L$(BINLIBDEST)/config -lpython$(VERSION)'
++ LDSHARED="$LDSHARED "'-L$(BINLIBDEST)/config
-lpython$(LDVERSION)'
++ LDCXXSHARED="$LDCXXSHARED
"'-L$(BINLIBDEST)/config -lpython$(LDVERSION)'
fi
- fi
;;
Linux*|GNU*|QNX*)
LDSHARED='$(CC) -shared'
-@@ -13508,7 +13498,7 @@
+@@ -13469,7 +13459,7 @@
if test $ac_sys_system = Darwin
then
@@ -154,9 +168,9 @@
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for %zd printf() format
support" >&5
-diff -ru Python-3.2a3.orig/setup.py Python-3.2a3/setup.py
---- Python-3.2a3.orig/setup.py 2010-09-14 15:41:23.000000000 -0400
-+++ Python-3.2a3/setup.py 2010-10-15 16:02:17.000000000 -0400
+diff -ru Python-3.2a4.orig/setup.py Python-3.2a4/setup.py
+--- Python-3.2a4.orig/setup.py 2010-10-31 13:11:02.000000000 -0400
++++ Python-3.2a4/setup.py 2010-11-24 22:53:22.000000000 -0500
@@ -260,13 +260,17 @@
longest, g))
@@ -195,7 +209,7 @@
# Add paths specified in the environment variables LDFLAGS and
# CPPFLAGS for header and library files.
-@@ -631,10 +635,9 @@
+@@ -637,10 +641,9 @@
depends = ['socketmodule.h']) )
# Detect SSL support for the socket module (via _ssl)
search_for_ssl_incs_in = [
@@ -208,7 +222,7 @@
search_for_ssl_incs_in
)
if ssl_incs is not None:
-@@ -642,9 +645,8 @@
+@@ -648,9 +651,8 @@
['/usr/kerberos/include'])
if krb5_h:
ssl_incs += krb5_h
@@ -220,7 +234,7 @@
] )
if (ssl_incs is not None and
-@@ -664,7 +666,7 @@
+@@ -670,7 +672,7 @@
# look for the openssl version header on the compiler search path.
opensslv_h = find_file('openssl/opensslv.h', [],
@@ -229,7 +243,7 @@
if opensslv_h:
name = os.path.join(opensslv_h[0], 'openssl/opensslv.h')
if sys.platform == 'darwin' and is_macosx_sdk_path(name):
-@@ -915,12 +917,7 @@
+@@ -922,12 +924,7 @@
# We hunt for #define SQLITE_VERSION "n.n.n"
# We need to find >= sqlite version 3.0.8
sqlite_incdir = sqlite_libdir = None
@@ -243,7 +257,7 @@
]
MIN_SQLITE_VERSION_NUMBER = (3, 0, 8)
MIN_SQLITE_VERSION = ".".join([str(x)
-@@ -932,7 +929,7 @@
+@@ -939,7 +936,7 @@
if sys.platform == 'darwin':
sysroot = macosx_sdk_root()
@@ -252,7 +266,7 @@
f = os.path.join(d, "sqlite3.h")
if sys.platform == 'darwin' and is_macosx_sdk_path(d):
-@@ -964,11 +961,9 @@
+@@ -972,11 +969,9 @@
sqlite_dirs_to_check = [
os.path.join(sqlite_incdir, '..', 'lib64'),
os.path.join(sqlite_incdir, '..', 'lib'),
@@ -265,7 +279,16 @@
if sqlite_libfile:
sqlite_libdir =
[os.path.abspath(os.path.dirname(sqlite_libfile))]
-@@ -1123,6 +1118,7 @@
+@@ -1058,7 +1053,7 @@
+ if self.compiler.find_library_file(lib_dirs,
+ 'gdbm_compat'):
+ gdbm_libs.append('gdbm_compat')
+- if find_file("gdbm/ndbm.h", inc_dirs, []) is not None:
++ if find_file("ndbm.h", inc_dirs, []) is not None:
+ print("building dbm using gdbm")
+ dbmext = Extension(
+ '_dbm', ['_dbmmodule.c'],
+@@ -1133,6 +1128,7 @@
panel_library = 'panelw'
curses_libs = [curses_library]
exts.append( Extension('_curses', ['_cursesmodule.c'],
@@ -273,7 +296,7 @@
libraries = curses_libs) )
elif curses_library == 'curses' and platform != 'darwin':
# OSX has an old Berkeley curses, not good enough for
-@@ -1143,6 +1139,7 @@
+@@ -1153,6 +1149,7 @@
if (module_enabled(exts, '_curses') and
self.compiler.find_library_file(lib_dirs, panel_library)):
exts.append( Extension('_curses_panel', ['_curses_panel.c'],
@@ -281,7 +304,7 @@
libraries = [panel_library] + curses_libs)
)
else:
missing.append('_curses_panel')
-@@ -1457,16 +1454,12 @@
+@@ -1466,16 +1463,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()
------------------------------------------------------------------------------
Increase Visibility of Your 3D Game App & Earn a Chance To Win $500!
Tap into the largest installed PC base & get more eyes on your game by
optimizing for Intel(R) Graphics Technology. Get started today with the
Intel(R) Software Partner Program. Five $500 cash prizes are up for grabs.
http://p.sf.net/sfu/intelisp-dev2dev
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
