Menu
▾
▴
[cvs] dists/10.4/stable/main/finkinfo/languages python27.info, 1.3, 1.4 python27.patch, 1.3, 1.4 python31.info, 1.3, 1.4 python31.patch, 1.3, 1.4 python32.info, 1.1, 1.2 python32.patch, 1.1, 1.2
|
From: Daniel J. <dan...@us...> - 2011-12-30 00:13:18
|
Update of /cvsroot/fink/dists/10.4/stable/main/finkinfo/languages
In directory vz-cvs-3.sog:/tmp/cvs-serv30307
Modified Files:
python27.info python27.patch python31.info python31.patch
python32.info python32.patch
Log Message:
Teach ctypes to look for libraries in %p/lib.
Index: python27.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/languages/python27.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- python27.patch 23 Oct 2011 21:51:26 -0000 1.3
+++ python27.patch 30 Dec 2011 00:13:14 -0000 1.4
@@ -1,6 +1,17 @@
+diff -ru Python-2.7.2.orig/Lib/ctypes/macholib/dyld.py Python-2.7.2/Lib/ctypes/macholib/dyld.py
+--- Python-2.7.2.orig/Lib/ctypes/macholib/dyld.py 2011-06-11 11:46:24.000000000 -0400
++++ Python-2.7.2/Lib/ctypes/macholib/dyld.py 2011-12-29 18:30:21.000000000 -0500
+@@ -26,6 +26,7 @@
+
+ DEFAULT_LIBRARY_FALLBACK = [
+ os.path.expanduser("~/lib"),
++ "@PREFIX@/lib",
+ "/usr/local/lib",
+ "/lib",
+ "/usr/lib",
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
++++ Python-2.7.2/Lib/platform.py 2011-12-29 18:28:04.000000000 -0500
@@ -810,6 +810,15 @@
if info is not None:
return info
@@ -19,7 +30,7 @@
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
++++ Python-2.7.2/Makefile.pre.in 2011-12-29 18:28:04.000000000 -0500
@@ -432,8 +432,7 @@
fi
@@ -62,7 +73,7 @@
else true; \
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
++++ Python-2.7.2/Misc/python-config.in 2011-12-29 18:28:04.000000000 -0500
@@ -46,11 +46,10 @@
elif opt in ('--libs', '--ldflags'):
libs = getvar('LIBS').split() + getvar('SYSLIBS').split()
@@ -80,7 +91,7 @@
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
++++ Python-2.7.2/Misc/python.pc.in 2011-12-29 18:28:04.000000000 -0500
@@ -1,6 +1,6 @@
prefix=@prefix@
exec_prefix=@exec_prefix@
@@ -91,7 +102,7 @@
Name: Python
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
++++ Python-2.7.2/Modules/_bsddb.c 2011-12-29 18:28:04.000000000 -0500
@@ -9766,7 +9766,13 @@
ADD_INT(d, DB_REP_PERMANENT);
@@ -108,7 +119,7 @@
ADD_INT(d, DB_REP_CONF_NOWAIT);
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
++++ Python-2.7.2/Modules/dbmmodule.c 2011-12-29 18:28:04.000000000 -0500
@@ -19,7 +19,7 @@
static char *which_dbm = "GNU gdbm"; /* EMX port of GDBM */
#endif
@@ -120,7 +131,7 @@
#include <gdbm-ndbm.h>
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
++++ Python-2.7.2/Modules/posixmodule.c 2011-12-29 18:28:04.000000000 -0500
@@ -457,7 +457,7 @@
#endif
@@ -141,7 +152,7 @@
#endif
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
++++ Python-2.7.2/configure 2011-12-29 18:28:04.000000000 -0500
@@ -4962,7 +4962,7 @@
;;
Darwin*)
@@ -211,7 +222,7 @@
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
++++ Python-2.7.2/setup.py 2011-12-29 18:28:04.000000000 -0500
@@ -250,13 +250,17 @@
longest, g)
Index: python31.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/languages/python31.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- python31.patch 23 Oct 2011 21:51:26 -0000 1.3
+++ python31.patch 30 Dec 2011 00:13:14 -0000 1.4
@@ -1,6 +1,17 @@
+diff -ru Python-3.1.4.orig/Lib/ctypes/macholib/dyld.py Python-3.1.4/Lib/ctypes/macholib/dyld.py
+--- Python-3.1.4.orig/Lib/ctypes/macholib/dyld.py 2011-06-11 11:48:49.000000000 -0400
++++ Python-3.1.4/Lib/ctypes/macholib/dyld.py 2011-12-29 18:55:36.000000000 -0500
+@@ -23,6 +23,7 @@
+
+ DEFAULT_LIBRARY_FALLBACK = [
+ os.path.expanduser("~/lib"),
++ "@PREFIX@/lib",
+ "/usr/local/lib",
+ "/lib",
+ "/usr/lib",
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-07-12 13:14:42.000000000 -0400
++++ Python-3.1.4/Makefile.pre.in 2011-12-29 18:54:50.000000000 -0500
@@ -445,8 +445,7 @@
fi
@@ -43,7 +54,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-07-12 13:14:42.000000000 -0400
++++ Python-3.1.4/Misc/python-config.in 2011-12-29 18:54:50.000000000 -0500
@@ -45,9 +45,9 @@
elif opt in ('--libs', '--ldflags'):
libs = getvar('LIBS').split() + getvar('SYSLIBS').split()
@@ -59,7 +70,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-07-12 13:14:42.000000000 -0400
++++ Python-3.1.4/Misc/python.pc.in 2011-12-29 18:54:50.000000000 -0500
@@ -1,6 +1,6 @@
prefix=@prefix@
exec_prefix=@exec_prefix@
@@ -70,7 +81,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-07-12 13:14:42.000000000 -0400
++++ Python-3.1.4/Modules/_dbmmodule.c 2011-12-29 18:54:50.000000000 -0500
@@ -20,7 +20,7 @@
static char *which_dbm = "GNU gdbm"; /* EMX port of GDBM */
#endif
@@ -82,7 +93,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-07-12 13:14:42.000000000 -0400
++++ Python-3.1.4/Modules/posixmodule.c 2011-12-29 18:54:50.000000000 -0500
@@ -445,7 +445,7 @@
#endif
@@ -103,7 +114,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-07-12 13:14:42.000000000 -0400
++++ Python-3.1.4/configure 2011-12-29 18:54:50.000000000 -0500
@@ -4883,7 +4883,7 @@
;;
Darwin*)
@@ -163,7 +174,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-07-12 13:15:43.000000000 -0400
++++ Python-3.1.4/setup.py 2011-12-29 18:54:50.000000000 -0500
@@ -238,13 +238,17 @@
longest, g))
Index: python31.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/languages/python31.info,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- python31.info 23 Oct 2011 21:51:26 -0000 1.3
+++ python31.info 30 Dec 2011 00:13:14 -0000 1.4
@@ -1,7 +1,7 @@
Info2: <<
Package: python%type_pkg[python]
Version: 3.1.4
-Revision: 2
+Revision: 3
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: c5cb925836eca9f48750e1800c04d196
+PatchFile-MD5: 6d514a77c4d20a5485d5c563424abd97
PatchScript: sed 's|@PREFIX@|%p|g' < %{PatchFile} | patch -p1
UseMaxBuildJobs: true
@@ -178,6 +178,8 @@
test_ctypes fails with clang unless _ctypes/_ctypes_test.c is built
with -O0 so force that in setup.py.
+
+ Patch ctypes to look in %p/lib for libraries.
<<
License: OSI-Approved
Homepage: http://www.python.org
Index: python32.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/languages/python32.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- python32.patch 23 Oct 2011 21:51:26 -0000 1.1
+++ python32.patch 30 Dec 2011 00:13:14 -0000 1.2
@@ -1,6 +1,17 @@
-diff -ru Python-3.2.1.orig/Makefile.pre.in Python-3.2.1/Makefile.pre.in
---- Python-3.2.1.orig/Makefile.pre.in 2011-07-09 02:58:52.000000000 -0400
-+++ Python-3.2.1/Makefile.pre.in 2011-07-12 12:16:01.000000000 -0400
+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
+@@ -23,6 +23,7 @@
+
+ DEFAULT_LIBRARY_FALLBACK = [
+ os.path.expanduser("~/lib"),
++ "@PREFIX@/lib",
+ "/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 @@
$(BLDSHARED) $(NO_AS_NEEDED) -o $@ -Wl,-h$@ $^
@@ -48,9 +59,9 @@
-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.1.orig/Misc/python-config.in Python-3.2.1/Misc/python-config.in
---- Python-3.2.1.orig/Misc/python-config.in 2011-07-09 02:58:52.000000000 -0400
-+++ Python-3.2.1/Misc/python-config.in 2011-07-12 12:16:01.000000000 -0400
+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 @@
elif opt in ('--libs', '--ldflags'):
libs = getvar('LIBS').split() + getvar('SYSLIBS').split()
@@ -67,9 +78,9 @@
print(' '.join(libs))
elif opt == '--extension-suffix':
-diff -ru Python-3.2.1.orig/Misc/python.pc.in Python-3.2.1/Misc/python.pc.in
---- Python-3.2.1.orig/Misc/python.pc.in 2011-07-09 02:58:52.000000000 -0400
-+++ Python-3.2.1/Misc/python.pc.in 2011-07-12 12:16:01.000000000 -0400
+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
@@ -1,7 +1,7 @@
# See: man pkg-config
prefix=@prefix@
@@ -79,9 +90,9 @@
includedir=@includedir@
Name: Python
-diff -ru Python-3.2.1.orig/Modules/_dbmmodule.c Python-3.2.1/Modules/_dbmmodule.c
---- Python-3.2.1.orig/Modules/_dbmmodule.c 2011-07-09 02:58:53.000000000 -0400
-+++ Python-3.2.1/Modules/_dbmmodule.c 2011-07-12 12:16:01.000000000 -0400
+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
@@ -20,7 +20,7 @@
static char *which_dbm = "GNU gdbm"; /* EMX port of GDBM */
#endif
@@ -91,10 +102,10 @@
static char *which_dbm = "GNU gdbm";
#elif defined(HAVE_GDBM_DASH_NDBM_H)
#include <gdbm-ndbm.h>
-diff -ru Python-3.2.1.orig/Modules/posixmodule.c Python-3.2.1/Modules/posixmodule.c
---- Python-3.2.1.orig/Modules/posixmodule.c 2011-07-09 02:58:54.000000000 -0400
-+++ Python-3.2.1/Modules/posixmodule.c 2011-07-12 12:16:01.000000000 -0400
-@@ -503,7 +503,7 @@
+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 */
@@ -103,7 +114,7 @@
/* On Darwin/MacOSX a shared library or framework has no access to
** environ directly, we must obtain it with _NSGetEnviron().
*/
-@@ -530,7 +530,7 @@
+@@ -528,7 +528,7 @@
d = PyDict_New();
if (d == NULL)
return NULL;
@@ -112,10 +123,10 @@
if (environ == NULL)
environ = *_NSGetEnviron();
#endif
-diff -ru Python-3.2.1.orig/configure Python-3.2.1/configure
---- Python-3.2.1.orig/configure 2011-07-09 02:58:56.000000000 -0400
-+++ Python-3.2.1/configure 2011-07-12 12:16:01.000000000 -0400
-@@ -4992,7 +4992,7 @@
+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 @@
;;
Darwin*)
LDLIBRARY='libpython$(LDVERSION).dylib'
@@ -124,7 +135,7 @@
RUNSHARED='DYLD_LIBRARY_PATH=`pwd`:${DYLD_LIBRARY_PATH}'
;;
AIX*)
-@@ -7509,8 +7509,8 @@
+@@ -7510,8 +7510,8 @@
#ARCH_RUN_32BIT="true"
fi
@@ -135,7 +146,7 @@
LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -compatibility_version $(VERSION) -current_version $(VERSION)';;
esac
-@@ -7626,15 +7626,6 @@
+@@ -7627,15 +7627,6 @@
# Use -undefined dynamic_lookup whenever possible (10.3 and later).
# This allows an extension to be used in any Python
@@ -151,7 +162,7 @@
LDSHARED='$(CC) -bundle'
LDCXXSHARED='$(CXX) -bundle'
if test "$enable_framework" ; then
-@@ -7644,11 +7635,10 @@
+@@ -7645,11 +7636,10 @@
LDCXXSHARED="$LDCXXSHARED "'$(PYTHONFRAMEWORKPREFIX)/$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'
else
# No framework, use the Python app as bundle-loader
@@ -166,7 +177,7 @@
;;
Linux*|GNU*|QNX*)
LDSHARED='$(CC) -shared'
-@@ -7757,7 +7747,7 @@
+@@ -7758,7 +7748,7 @@
Linux*|GNU*) LINKFORSHARED="-Xlinker -export-dynamic";;
# -u libsys_s pulls in all symbols in libsys
Darwin/*)
@@ -175,7 +186,7 @@
if test "$enable_framework"
then
LINKFORSHARED="$LINKFORSHARED "'$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'
-@@ -13689,7 +13679,7 @@
+@@ -13686,7 +13676,7 @@
if test $ac_sys_system = Darwin
then
@@ -184,9 +195,9 @@
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for %zd printf() format support" >&5
-diff -ru Python-3.2.1.orig/setup.py Python-3.2.1/setup.py
---- Python-3.2.1.orig/setup.py 2011-07-09 02:58:56.000000000 -0400
-+++ Python-3.2.1/setup.py 2011-07-12 12:44:09.000000000 -0400
+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.0 |