Menu
▾
▴
[Collective-checkins] r96312 - in buildout/python: . src src/docs
|
From: Florian S. <svn...@pl...> - 2009-08-31 23:16:48
|
Author: fschulze
Date: Mon Aug 31 23:16:37 2009
New Revision: 96312
Added:
buildout/python/src/docs/BUGS.txt
- copied, changed from r96308, buildout/python/BUGS.txt
Removed:
buildout/python/BUGS.txt
Modified:
buildout/python/src/libjpeg.cfg
buildout/python/src/python-2.4-darwin-10.6.patch
buildout/python/src/python-2.5-darwin-10.6.patch
buildout/python/src/python24.cfg
buildout/python/src/python25.cfg
buildout/python/src/python26.cfg
buildout/python/src/snowleopard.cfg
Log:
Hopefully nailed most issues in Snö Labbar'd, see BUGS.txt.
Copied: buildout/python/src/docs/BUGS.txt (from r96308, buildout/python/BUGS.txt)
==============================================================================
--- buildout/python/BUGS.txt (original)
+++ buildout/python/src/docs/BUGS.txt Mon Aug 31 23:16:37 2009
@@ -1,5 +1,12 @@
In lieu of an issue tracker...
+2009-09-01: Python 2.6 is currently disabled.
+ [fschulze]
+
+2009-09-01: There are several issues on Snow Leopard when things like zlib or
+ libjpeg are installed with MacPorts.
+ [fschulze]
+
2009-08-24: PIL does not get linked with the included libjpeg (Mac OS X 10.5)
[lrowe]
Modified: buildout/python/src/libjpeg.cfg
==============================================================================
--- buildout/python/src/libjpeg.cfg (original)
+++ buildout/python/src/libjpeg.cfg Mon Aug 31 23:16:37 2009
@@ -2,6 +2,7 @@
extends = base.cfg
parts = ${buildout:libjpeg-parts}
libjpeg-parts =
+ zlib
libjpeg
[libjpeg]
@@ -10,3 +11,8 @@
extra_options =
--prefix=${opt:location}
+[zlib]
+recipe = zc.recipe.cmmi
+url = http://www.zlib.net/zlib-1.2.3.tar.bz2
+extra_options =
+ --prefix=${opt:location}
Modified: buildout/python/src/python-2.4-darwin-10.6.patch
==============================================================================
--- buildout/python/src/python-2.4-darwin-10.6.patch (original)
+++ buildout/python/src/python-2.4-darwin-10.6.patch Mon Aug 31 23:16:37 2009
@@ -1,13 +1,3 @@
---- configure.orig 2009-08-26 10:08:27.000000000 +0200
-+++ configure 2009-08-26 21:52:19.000000000 +0200
-@@ -3907,7 +3907,6 @@
- ;;
- # is there any other compiler on Darwin besides gcc?
- Darwin*)
-- BASECFLAGS="$BASECFLAGS -Wno-long-double -no-cpp-precomp -mno-fused-madd"
- if test "${enable_universalsdk}"; then
- BASECFLAGS="-arch ppc -arch i386 -isysroot ${UNIVERSALSDK} ${BASECFLAGS}"
- fi
--- pyconfig.h.in.orig 2006-10-08 19:41:25.000000000 +0200
+++ pyconfig.h.in 2009-08-31 15:28:31.000000000 +0200
@@ -329,9 +329,6 @@
Modified: buildout/python/src/python-2.5-darwin-10.6.patch
==============================================================================
--- buildout/python/src/python-2.5-darwin-10.6.patch (original)
+++ buildout/python/src/python-2.5-darwin-10.6.patch Mon Aug 31 23:16:37 2009
@@ -1,13 +1,3 @@
---- configure.orig 2009-08-26 21:43:42.000000000 +0200
-+++ configure 2009-08-26 21:52:26.000000000 +0200
-@@ -4534,7 +4534,6 @@
- ;;
- # is there any other compiler on Darwin besides gcc?
- Darwin*)
-- BASECFLAGS="$BASECFLAGS -Wno-long-double -no-cpp-precomp -mno-fused-madd"
- if test "${enable_universalsdk}"; then
- BASECFLAGS="-arch ppc -arch i386 -isysroot ${UNIVERSALSDK} ${BASECFLAGS}"
- fi
--- Include/pyport.h.orig 2008-02-14 12:26:18.000000000 +0100
+++ Include/pyport.h 2009-08-31 17:55:02.000000000 +0200
@@ -293,11 +293,23 @@
Modified: buildout/python/src/python24.cfg
==============================================================================
--- buildout/python/src/python24.cfg (original)
+++ buildout/python/src/python24.cfg Mon Aug 31 23:16:37 2009
@@ -6,7 +6,7 @@
python-2.4-virtualenv
python-2.4
python-2.4-PIL
- python-2.4-buildout
+# python-2.4-buildout
[python-2.4-build]
recipe = zc.recipe.cmmi
@@ -16,7 +16,6 @@
extra_options =
${:macosx-opt}
--disable-tk
- --disable-toolbox-glue
--prefix=${opt:location}
[python-2.4-virtualenv]
@@ -42,6 +41,7 @@
command =
for i in ${opt:location}/include/j*.h; do ln -fs $i ${:location}/include; done
for i in ${opt:location}/lib/libjpeg*; do ln -fs $i ${:location}/lib; done
+ for i in ${opt:location}/lib/libz*; do ln -fs $i ${:location}/lib; done
${:location}/bin/easy_install -f http://dist.repoze.org/plone/latest -U PIL
update-command = ${:command}
Modified: buildout/python/src/python25.cfg
==============================================================================
--- buildout/python/src/python25.cfg (original)
+++ buildout/python/src/python25.cfg Mon Aug 31 23:16:37 2009
@@ -6,7 +6,7 @@
python-2.5-virtualenv
python-2.5
python-2.5-PIL
- python-2.5-buildout
+# python-2.5-buildout
[python-2.5-build]
recipe = zc.recipe.cmmi
@@ -14,7 +14,6 @@
url = http://www.python.org/ftp/python/2.5.4/Python-2.5.4.tar.bz2
extra_options =
--disable-tk
- --disable-toolbox-glue
--prefix=${opt:location}
[python-2.5-virtualenv]
@@ -40,6 +39,7 @@
command =
for i in ${opt:location}/include/j*.h; do ln -fs $i ${:location}/include; done
for i in ${opt:location}/lib/libjpeg*; do ln -fs $i ${:location}/lib; done
+ for i in ${opt:location}/lib/libz*; do ln -fs $i ${:location}/lib; done
${:location}/bin/easy_install -f http://dist.repoze.org/plone/latest -U PIL
update-command = ${:command}
Modified: buildout/python/src/python26.cfg
==============================================================================
--- buildout/python/src/python26.cfg (original)
+++ buildout/python/src/python26.cfg Mon Aug 31 23:16:37 2009
@@ -6,7 +6,7 @@
python-2.6-virtualenv
python-2.6
python-2.6-PIL
- python-2.6-buildout
+# python-2.6-buildout
[python-2.6-build]
recipe = zc.recipe.cmmi
@@ -14,7 +14,6 @@
url = http://www.python.org/ftp/python/2.6.2/Python-2.6.2.tar.bz2
extra_options =
--disable-tk
- --disable-toolbox-glue
--prefix=${opt:location}
[python-2.6-virtualenv]
@@ -39,6 +38,7 @@
command =
for i in ${opt:location}/include/j*.h; do ln -fs $i ${:location}/include; done
for i in ${opt:location}/lib/libjpeg*; do ln -fs $i ${:location}/lib; done
+ for i in ${opt:location}/lib/libz*; do ln -fs $i ${:location}/lib; done
${:location}/bin/easy_install -f http://dist.repoze.org/plone/latest -U PIL
update-command = ${:command}
Modified: buildout/python/src/snowleopard.cfg
==============================================================================
--- buildout/python/src/snowleopard.cfg (original)
+++ buildout/python/src/snowleopard.cfg Mon Aug 31 23:16:37 2009
@@ -1,9 +1,37 @@
[buildout]
extends = macosx.cfg
+parts -=
+ ${buildout:python26-parts}
[python-2.4-build]
+environment =
+ CC=gcc-4.0
+ CPP=cpp-4.0
+ CXX=c++-4.0
macosx-opt = MACOSX_DEPLOYMENT_TARGET=10.6
patch = ${buildout:python-buildout-root}/python-2.4-darwin-10.6.patch
[python-2.5-build]
+environment =
+ CC=gcc-4.0
+ CPP=cpp-4.0
+ CXX=c++-4.0
patch = ${buildout:python-buildout-root}/python-2.5-darwin-10.6.patch
+
+[readline]
+environment =
+ CC=gcc-4.0
+ CPP=cpp-4.0
+ CXX=c++-4.0
+
+[zlib]
+environment =
+ CC=gcc-4.0
+ CPP=cpp-4.0
+ CXX=c++-4.0
+
+[libjpeg]
+environment =
+ CC=gcc-4.0
+ CPP=cpp-4.0
+ CXX=c++-4.0
|