Menu
▾
▴
[cvs] dists/10.4/unstable/main/finkinfo/languages python27.info, 1.14, 1.15 python27.patch, 1.4, 1.5 python31.info, 1.11, 1.12 python31.patch, 1.5, 1.6
|
From: Daniel J. <dan...@us...> - 2011-07-12 18:07:37
|
Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/languages In directory vz-cvs-3.sog:/tmp/cvs-serv7921 Modified Files: python27.info python27.patch python31.info python31.patch Log Message: Enable clang on 10.7. Index: python31.info =================================================================== RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/languages/python31.info,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- python31.info 6 Jul 2011 23:21:23 -0000 1.11 +++ python31.info 12 Jul 2011 18:07:34 -0000 1.12 @@ -1,7 +1,7 @@ Info2: << Package: python%type_pkg[python] Version: 3.1.4 -Revision: 1 +Revision: 2 Type: python 3.1 Maintainer: Daniel Johnson <da...@da...> Depends: << @@ -37,7 +37,7 @@ Source2: http://www.python.org/ftp/python/doc/%v/python-%v-docs-html.tar.bz2 Source2-MD5: 0a4a56361005966cc38d1068dfd52a54 PatchFile: %n.patch -PatchFile-MD5: 3a7a5e57983326d43ee476cf96b7f84b +PatchFile-MD5: c5cb925836eca9f48750e1800c04d196 PatchScript: sed 's|@PREFIX@|%p|g' < %{PatchFile} | patch -p1 UseMaxBuildJobs: true @@ -47,8 +47,6 @@ #!/bin/sh -ex darwin_vers=`uname -r | cut -d. -f1` if [ "$darwin_vers" = 11 ]; then - export CC=gcc-4.2 - export CXX=g++-4.2 perl -pi -e 's/ -lSystemStubs//' ./configure perl -pi -e 's/-O3/-fwrapv -O3/' ./configure fi @@ -177,6 +175,9 @@ %p/include/gdbm/ndbm.h so python ends up using /usr/include/ndbm.h but the lib from gdbm3 which is, shall we say, bad. Force it to find %p/include/ndbm.h instead. + + test_ctypes fails with clang unless _ctypes/_ctypes_test.c is built + with -O0 so force that in setup.py. << License: OSI-Approved Homepage: http://www.python.org Index: python31.patch =================================================================== RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/languages/python31.patch,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- python31.patch 12 Jun 2011 22:24:12 -0000 1.5 +++ python31.patch 12 Jul 2011 18:07:34 -0000 1.6 @@ -1,6 +1,6 @@ diff -ru Python-3.1.4.orig/Makefile.pre.in Python-3.1.4/Makefile.pre.in --- Python-3.1.4.orig/Makefile.pre.in 2011-06-11 11:48:51.000000000 -0400 -+++ Python-3.1.4/Makefile.pre.in 2011-06-11 19:47:11.000000000 -0400 ++++ Python-3.1.4/Makefile.pre.in 2011-07-12 13:14:42.000000000 -0400 @@ -445,8 +445,7 @@ fi @@ -43,7 +43,7 @@ -rm -f $(DESTDIR)$(LIBPC)/python3.pc diff -ru Python-3.1.4.orig/Misc/python-config.in Python-3.1.4/Misc/python-config.in --- Python-3.1.4.orig/Misc/python-config.in 2011-06-11 11:48:51.000000000 -0400 -+++ Python-3.1.4/Misc/python-config.in 2011-06-11 19:47:11.000000000 -0400 ++++ Python-3.1.4/Misc/python-config.in 2011-07-12 13:14:42.000000000 -0400 @@ -45,9 +45,9 @@ elif opt in ('--libs', '--ldflags'): libs = getvar('LIBS').split() + getvar('SYSLIBS').split() @@ -59,7 +59,7 @@ diff -ru Python-3.1.4.orig/Misc/python.pc.in Python-3.1.4/Misc/python.pc.in --- Python-3.1.4.orig/Misc/python.pc.in 2011-06-11 11:48:51.000000000 -0400 -+++ Python-3.1.4/Misc/python.pc.in 2011-06-11 19:47:11.000000000 -0400 ++++ Python-3.1.4/Misc/python.pc.in 2011-07-12 13:14:42.000000000 -0400 @@ -1,6 +1,6 @@ prefix=@prefix@ exec_prefix=@exec_prefix@ @@ -70,7 +70,7 @@ Name: Python diff -ru Python-3.1.4.orig/Modules/_dbmmodule.c Python-3.1.4/Modules/_dbmmodule.c --- Python-3.1.4.orig/Modules/_dbmmodule.c 2011-06-11 11:48:51.000000000 -0400 -+++ Python-3.1.4/Modules/_dbmmodule.c 2011-06-11 19:47:11.000000000 -0400 ++++ Python-3.1.4/Modules/_dbmmodule.c 2011-07-12 13:14:42.000000000 -0400 @@ -20,7 +20,7 @@ static char *which_dbm = "GNU gdbm"; /* EMX port of GDBM */ #endif @@ -82,7 +82,7 @@ #include <gdbm-ndbm.h> diff -ru Python-3.1.4.orig/Modules/posixmodule.c Python-3.1.4/Modules/posixmodule.c --- Python-3.1.4.orig/Modules/posixmodule.c 2011-06-11 11:48:52.000000000 -0400 -+++ Python-3.1.4/Modules/posixmodule.c 2011-06-11 19:47:11.000000000 -0400 ++++ Python-3.1.4/Modules/posixmodule.c 2011-07-12 13:14:42.000000000 -0400 @@ -445,7 +445,7 @@ #endif @@ -103,7 +103,7 @@ #endif diff -ru Python-3.1.4.orig/configure Python-3.1.4/configure --- Python-3.1.4.orig/configure 2011-06-11 11:48:52.000000000 -0400 -+++ Python-3.1.4/configure 2011-06-11 19:47:11.000000000 -0400 ++++ Python-3.1.4/configure 2011-07-12 13:14:42.000000000 -0400 @@ -4883,7 +4883,7 @@ ;; Darwin*) @@ -163,7 +163,7 @@ diff -ru Python-3.1.4.orig/setup.py Python-3.1.4/setup.py --- Python-3.1.4.orig/setup.py 2011-06-11 11:48:52.000000000 -0400 -+++ Python-3.1.4/setup.py 2011-06-11 19:50:41.000000000 -0400 ++++ Python-3.1.4/setup.py 2011-07-12 13:15:43.000000000 -0400 @@ -238,13 +238,17 @@ longest, g)) @@ -316,3 +316,13 @@ tklib = self.compiler.find_library_file(lib_dirs, 'tk' + version) tcllib = self.compiler.find_library_file(lib_dirs, 'tcl' + version) if tklib and tcllib: +@@ -1701,7 +1693,8 @@ + sources=sources, + depends=depends) + ext_test = Extension('_ctypes_test', +- sources=['_ctypes/_ctypes_test.c']) ++ sources=['_ctypes/_ctypes_test.c'], ++ extra_compile_args=['-O0']) + self.extensions.extend([ext, ext_test]) + + if not '--with-system-ffi' in sysconfig.get_config_var("CONFIG_ARGS"): Index: python27.info =================================================================== RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/languages/python27.info,v retrieving revision 1.14 retrieving revision 1.15 diff -u -d -r1.14 -r1.15 --- python27.info 6 Jul 2011 23:21:23 -0000 1.14 +++ python27.info 12 Jul 2011 18:07:34 -0000 1.15 @@ -1,7 +1,7 @@ Info2: << Package: python%type_pkg[python] Version: 2.7.2 -Revision: 3 +Revision: 4 Epoch: 1 Type: python 2.7 Maintainer: Daniel Johnson <da...@da...> @@ -41,7 +41,7 @@ Source2: http://www.python.org/ftp/python/doc/%v/python-%v-docs-html.tar.bz2 Source2-MD5: 40f0bd51b221662cae14fb0c6b6f622b PatchFile: %n.patch -PatchFile-MD5: ba06c354a2ffe1d94ab41f386add2898 +PatchFile-MD5: 3a5d07b5d43fcf018d2d75ca05e63451 PatchScript: << sed 's|@PREFIX@|%p|g' < %{PatchFile} | patch -p1 perl -pi -e 's/\$Revision/$&: 81008 /' Lib/lib-tk/Tkinter.py @@ -54,8 +54,6 @@ #!/bin/sh -ex darwin_vers=`uname -r | cut -d. -f1` if [ "$darwin_vers" = 11 ]; then - export CC=gcc-4.2 - export CXX=g++-4.2 perl -pi -e 's/ -lSystemStubs//' ./configure perl -pi -e 's/-O3/-fwrapv -O3/' ./configure fi @@ -183,6 +181,9 @@ %p/include/gdbm/ndbm.h so python ends up using /usr/include/ndbm.h but the lib from gdbm3 which is, shall we say, bad. Force it to find %p/include/ndbm.h instead. + + test_ctypes fails with clang unless _ctypes/_ctypes_test.c is built + with -O0 so force that in setup.py. << License: OSI-Approved Homepage: http://www.python.org Index: python27.patch =================================================================== RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/languages/python27.patch,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- python27.patch 11 Jun 2011 23:46:05 -0000 1.4 +++ python27.patch 12 Jul 2011 18:07:34 -0000 1.5 @@ -1,6 +1,6 @@ -diff -ru Python-2.7.2rc1.orig/Lib/platform.py Python-2.7.2rc1/Lib/platform.py ---- Python-2.7.2rc1.orig/Lib/platform.py 2011-05-29 17:54:42.000000000 -0400 -+++ Python-2.7.2rc1/Lib/platform.py 2011-06-10 16:17:00.000000000 -0400 +diff -ru Python-2.7.2.orig/Lib/platform.py Python-2.7.2/Lib/platform.py +--- Python-2.7.2.orig/Lib/platform.py 2011-06-11 11:46:25.000000000 -0400 ++++ Python-2.7.2/Lib/platform.py 2011-07-12 13:45:18.000000000 -0400 @@ -810,6 +810,15 @@ if info is not None: return info @@ -17,9 +17,9 @@ # If that also doesn't work return the default values return release,versioninfo,machine -diff -ru Python-2.7.2rc1.orig/Makefile.pre.in Python-2.7.2rc1/Makefile.pre.in ---- Python-2.7.2rc1.orig/Makefile.pre.in 2011-05-29 17:54:47.000000000 -0400 -+++ Python-2.7.2rc1/Makefile.pre.in 2011-06-10 16:17:00.000000000 -0400 +diff -ru Python-2.7.2.orig/Makefile.pre.in Python-2.7.2/Makefile.pre.in +--- Python-2.7.2.orig/Makefile.pre.in 2011-06-11 11:46:26.000000000 -0400 ++++ Python-2.7.2/Makefile.pre.in 2011-07-12 13:45:18.000000000 -0400 @@ -432,8 +432,7 @@ fi @@ -60,9 +60,9 @@ fi \ fi; \ else true; \ -diff -ru Python-2.7.2rc1.orig/Misc/python-config.in Python-2.7.2rc1/Misc/python-config.in ---- Python-2.7.2rc1.orig/Misc/python-config.in 2011-05-29 17:54:47.000000000 -0400 -+++ Python-2.7.2rc1/Misc/python-config.in 2011-06-10 16:17:00.000000000 -0400 +diff -ru Python-2.7.2.orig/Misc/python-config.in Python-2.7.2/Misc/python-config.in +--- Python-2.7.2.orig/Misc/python-config.in 2011-06-11 11:46:26.000000000 -0400 ++++ Python-2.7.2/Misc/python-config.in 2011-07-12 13:45:18.000000000 -0400 @@ -46,11 +46,10 @@ elif opt in ('--libs', '--ldflags'): libs = getvar('LIBS').split() + getvar('SYSLIBS').split() @@ -78,9 +78,9 @@ libs.extend(getvar('LINKFORSHARED').split()) print ' '.join(libs) -diff -ru Python-2.7.2rc1.orig/Misc/python.pc.in Python-2.7.2rc1/Misc/python.pc.in ---- Python-2.7.2rc1.orig/Misc/python.pc.in 2011-05-29 17:54:47.000000000 -0400 -+++ Python-2.7.2rc1/Misc/python.pc.in 2011-06-10 16:17:00.000000000 -0400 +diff -ru Python-2.7.2.orig/Misc/python.pc.in Python-2.7.2/Misc/python.pc.in +--- Python-2.7.2.orig/Misc/python.pc.in 2011-06-11 11:46:26.000000000 -0400 ++++ Python-2.7.2/Misc/python.pc.in 2011-07-12 13:45:18.000000000 -0400 @@ -1,6 +1,6 @@ prefix=@prefix@ exec_prefix=@exec_prefix@ @@ -89,9 +89,9 @@ includedir=@includedir@ Name: Python -diff -ru Python-2.7.2rc1.orig/Modules/_bsddb.c Python-2.7.2rc1/Modules/_bsddb.c ---- Python-2.7.2rc1.orig/Modules/_bsddb.c 2011-05-29 17:54:47.000000000 -0400 -+++ Python-2.7.2rc1/Modules/_bsddb.c 2011-06-10 16:17:00.000000000 -0400 +diff -ru Python-2.7.2.orig/Modules/_bsddb.c Python-2.7.2/Modules/_bsddb.c +--- Python-2.7.2.orig/Modules/_bsddb.c 2011-06-11 11:46:26.000000000 -0400 ++++ Python-2.7.2/Modules/_bsddb.c 2011-07-12 13:45:18.000000000 -0400 @@ -9766,7 +9766,13 @@ ADD_INT(d, DB_REP_PERMANENT); @@ -106,9 +106,9 @@ ADD_INT(d, DB_REP_CONF_DELAYCLIENT); ADD_INT(d, DB_REP_CONF_BULK); ADD_INT(d, DB_REP_CONF_NOWAIT); -diff -ru Python-2.7.2rc1.orig/Modules/dbmmodule.c Python-2.7.2rc1/Modules/dbmmodule.c ---- Python-2.7.2rc1.orig/Modules/dbmmodule.c 2011-05-29 17:54:48.000000000 -0400 -+++ Python-2.7.2rc1/Modules/dbmmodule.c 2011-06-10 16:17:00.000000000 -0400 +diff -ru Python-2.7.2.orig/Modules/dbmmodule.c Python-2.7.2/Modules/dbmmodule.c +--- Python-2.7.2.orig/Modules/dbmmodule.c 2011-06-11 11:46:27.000000000 -0400 ++++ Python-2.7.2/Modules/dbmmodule.c 2011-07-12 13:45:18.000000000 -0400 @@ -19,7 +19,7 @@ static char *which_dbm = "GNU gdbm"; /* EMX port of GDBM */ #endif @@ -118,9 +118,9 @@ static char *which_dbm = "GNU gdbm"; #elif defined(HAVE_GDBM_DASH_NDBM_H) #include <gdbm-ndbm.h> -diff -ru Python-2.7.2rc1.orig/Modules/posixmodule.c Python-2.7.2rc1/Modules/posixmodule.c ---- Python-2.7.2rc1.orig/Modules/posixmodule.c 2011-05-29 17:54:50.000000000 -0400 -+++ Python-2.7.2rc1/Modules/posixmodule.c 2011-06-10 16:17:00.000000000 -0400 +diff -ru Python-2.7.2.orig/Modules/posixmodule.c Python-2.7.2/Modules/posixmodule.c +--- Python-2.7.2.orig/Modules/posixmodule.c 2011-06-11 11:46:27.000000000 -0400 ++++ Python-2.7.2/Modules/posixmodule.c 2011-07-12 13:45:18.000000000 -0400 @@ -457,7 +457,7 @@ #endif @@ -139,9 +139,9 @@ if (environ == NULL) environ = *_NSGetEnviron(); #endif -diff -ru Python-2.7.2rc1.orig/configure Python-2.7.2rc1/configure ---- Python-2.7.2rc1.orig/configure 2011-05-29 17:54:52.000000000 -0400 -+++ Python-2.7.2rc1/configure 2011-06-10 16:36:18.000000000 -0400 +diff -ru Python-2.7.2.orig/configure Python-2.7.2/configure +--- Python-2.7.2.orig/configure 2011-06-11 11:46:28.000000000 -0400 ++++ Python-2.7.2/configure 2011-07-12 13:45:18.000000000 -0400 @@ -4962,7 +4962,7 @@ ;; Darwin*) @@ -209,9 +209,9 @@ fi -diff -ru Python-2.7.2rc1.orig/setup.py Python-2.7.2rc1/setup.py ---- Python-2.7.2rc1.orig/setup.py 2011-05-29 17:54:52.000000000 -0400 -+++ Python-2.7.2rc1/setup.py 2011-06-10 16:29:20.000000000 -0400 +diff -ru Python-2.7.2.orig/setup.py Python-2.7.2/setup.py +--- Python-2.7.2.orig/setup.py 2011-06-11 11:46:28.000000000 -0400 ++++ Python-2.7.2/setup.py 2011-07-12 13:46:06.000000000 -0400 @@ -250,13 +250,17 @@ longest, g) @@ -424,3 +424,13 @@ tklib = self.compiler.find_library_file(lib_dirs, 'tk' + version) tcllib = self.compiler.find_library_file(lib_dirs, +@@ -1932,7 +1883,8 @@ + sources=sources, + depends=depends) + ext_test = Extension('_ctypes_test', +- sources=['_ctypes/_ctypes_test.c']) ++ sources=['_ctypes/_ctypes_test.c'], ++ extra_compile_args=['-O0']) + self.extensions.extend([ext, ext_test]) + + if not '--with-system-ffi' in sysconfig.get_config_var("CONFIG_ARGS"): |