Update of /cvsroot/fink/dists/10.4/stable/main/finkinfo/languages In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv25417
Modified Files: python27.info python27.patch python32.info python33.info Log Message: New upstream python 2.7.5, 3.2.5, 3.3.2. Index: python27.patch =================================================================== RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/languages/python27.patch,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- python27.patch 22 Apr 2013 23:42:09 -0000 1.9 +++ python27.patch 16 May 2013 01:24:03 -0000 1.10 @@ -50,7 +50,7 @@ diff --git a/Makefile.pre.in b/Makefile.pre.in --- a/Makefile.pre.in +++ b/Makefile.pre.in -@@ -474,7 +474,7 @@ +@@ -479,7 +479,7 @@ fi libpython$(VERSION).dylib: $(LIBRARY_OBJS) @@ -59,7 +59,7 @@ libpython$(VERSION).sl: $(LIBRARY_OBJS) -@@ -861,7 +861,7 @@ +@@ -866,7 +866,7 @@ # Install the interpreter with $(VERSION) affixed # This goes into $(exec_prefix) altbininstall: $(BUILDPYTHON) @@ -68,7 +68,7 @@ do \ if test ! -d $(DESTDIR)$$i; then \ echo "Creating directory $$i"; \ -@@ -874,9 +874,9 @@ +@@ -879,9 +879,9 @@ if test -n "$(DLLLIBRARY)" ; then \ $(INSTALL_SHARED) $(DLLLIBRARY) $(DESTDIR)$(BINDIR); \ else \ @@ -231,19 +231,20 @@ def build_extension(self, ext): -@@ -437,9 +442,8 @@ +@@ -437,10 +442,8 @@ def detect_modules(self): # Ensure that /usr/local is always used - add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib') - add_dir_to_list(self.compiler.include_dirs, '/usr/local/include') +- self.add_gcc_paths() - self.add_multiarch_paths() + add_dir_to_list(self.compiler.library_dirs, '@PREFIX@/lib') + add_dir_to_list(self.compiler.include_dirs, '@PREFIX@/include') # Add paths specified in the environment variables LDFLAGS and # CPPFLAGS for header and library files. -@@ -918,53 +922,8 @@ +@@ -919,53 +922,8 @@ # construct a list of paths to look for the header file in on # top of the normal inc_dirs. db_inc_paths = [ @@ -298,7 +299,7 @@ db_inc_paths = [p for p in db_inc_paths if os.path.exists(p)] db_ver_inc_map = {} -@@ -1090,12 +1049,7 @@ +@@ -1091,12 +1049,7 @@ # We hunt for #define SQLITE_VERSION "n.n.n" # We need to find >= sqlite version 3.0.8 sqlite_incdir = sqlite_libdir = None @@ -312,7 +313,7 @@ ] if cross_compiling: sqlite_inc_paths = [] -@@ -1109,7 +1063,7 @@ +@@ -1110,7 +1063,7 @@ if host_platform == 'darwin': sysroot = macosx_sdk_root() @@ -321,7 +322,7 @@ d = d_ if host_platform == 'darwin' and is_macosx_sdk_path(d): d = os.path.join(sysroot, d[1:]) -@@ -1141,11 +1095,9 @@ +@@ -1142,11 +1095,9 @@ sqlite_dirs_to_check = [ os.path.join(sqlite_incdir, '..', 'lib64'), os.path.join(sqlite_incdir, '..', 'lib'), @@ -334,7 +335,7 @@ if sqlite_libfile: sqlite_libdir = [os.path.abspath(os.path.dirname(sqlite_libfile))] -@@ -1266,7 +1218,7 @@ +@@ -1267,7 +1218,7 @@ if self.compiler.find_library_file(lib_dirs, 'gdbm_compat'): gdbm_libs.append('gdbm_compat') @@ -343,7 +344,7 @@ print "building dbm using gdbm" dbmext = Extension( 'dbm', ['dbmmodule.c'], -@@ -1344,6 +1296,7 @@ +@@ -1345 6 +1296,7 @@ 'dbm', ['dbmmodule.c'], m"