Revision: 8183
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8183&view=rev
Author: jdh2358
Date: 2010-03-09 14:19:49 +0000 (Tue, 09 Mar 2010)
Log Message:
-----------
update make.osx to build on 10.6
Modified Paths:
--------------
trunk/matplotlib/make.osx
trunk/matplotlib/release/osx/Makefile
Modified: trunk/matplotlib/make.osx
===================================================================
--- trunk/matplotlib/make.osx 2010-03-08 18:33:04 UTC (rev 8182)
+++ trunk/matplotlib/make.osx 2010-03-09 14:19:49 UTC (rev 8183)
@@ -4,17 +4,22 @@
PYVERSION=2.6
PYTHON=python${PYVERSION}
ZLIBVERSION=1.2.3
-PNGVERSION=1.2.40
+PNGVERSION=1.2.39
FREETYPEVERSION=2.3.11
-MACOSX_DEPLOYMENT_TARGET=10.4
-OSX_SDK_VER=10.4u
-ARCH_FLAGS="-arch i386 -arch ppc -arch x86_64"
+MACOSX_DEPLOYMENT_TARGET=10.6
+OSX_SDK_VER=10.6
+ARCH_FLAGS="-arch i386-arch x86_64"
## You shouldn't need to configure past this point
+#PKG_CONFIG_PATH="${PREFIX}/lib/pkgconfig"
+#CFLAGS="${ARCH_FLAGS} -I${PREFIX}/include -I${PREFIX}/include/freetype2
-isysroot /Developer/SDKs/MacOSX${OSX_SDK_VER}.sdk"
+#LDFLAGS="${ARCH_FLAGS} -L${PREFIX}/lib
-syslibroot,/Developer/SDKs/MacOSX${OSX_SDK_VER}.sdk"
+
PKG_CONFIG_PATH="${PREFIX}/lib/pkgconfig"
-CFLAGS="${ARCH_FLAGS} -I${PREFIX}/include -I${PREFIX}/include/freetype2
-isysroot /Developer/SDKs/MacOSX${OSX_SDK_VER}.sdk"
-LDFLAGS="${ARCH_FLAGS} -L${PREFIX}/lib
-syslibroot,/Developer/SDKs/MacOSX${OSX_SDK_VER}.sdk"
+CFLAGS="-arch i386 -arch x86_64 -I${PREFIX}/include
-I${PREFIX}/include/freetype2 -isysroot
/Developer/SDKs/MacOSX${OSX_SDK_VER}.sdk"
+LDFLAGS="-arch i386 -arch x86_64 -L${PREFIX}/lib
-syslibroot,/Developer/SDKs/MacOSX${OSX_SDK_VER}.sdk"
+FFLAGS="-arch i386 -arch x86_64"
clean:
rm -rf zlib-${ZLIBVERSION}.tar.gz libpng-${PNGVERSION}.tar.bz2 \
@@ -23,9 +28,10 @@
zlib-${ZLIBVERSION} libpng-${PNGVERSION} freetype-${FREETYPEVERSION} \
build
+
fetch:
${PYTHON} -c 'import urllib;
urllib.urlretrieve("http://www.zlib.net/zlib-${ZLIBVERSION}.tar.gz";,
"zlib-${ZLIBVERSION}.tar.gz")' &&\
- ${PYTHON} -c 'import urllib;
urllib.urlretrieve("http://download.sourceforge.net/libpng/libpng-${PNGVERSION}.tar.gz";,
"libpng-${PNGVERSION}.tar.bz2")' &&\
+ ${PYTHON} -c 'import urllib;
urllib.urlretrieve("http://downloads.sourceforge.net/project/libpng/libpng-stable/${PNGVERSION}/libpng-${PNGVERSION}.tar.gz";,
"libpng-${PNGVERSION}.tar.gz")' &&\
${PYTHON} -c 'import urllib;
urllib.urlretrieve("http://download.savannah.gnu.org/releases/freetype/freetype-${FREETYPEVERSION}.tar.bz2";,
"freetype-${FREETYPEVERSION}.tar.bz2")'
@@ -34,7 +40,7 @@
zlib:
export PKG_CONFIG_PATH=${PKG_CONFIG_PATH} &&\
rm -rf zlib-${ZLIBVERSION} &&\
- tar xvfz zlib-${ZLIBVERSION}.tar.gz &&\
+ tar xvfj zlib-${ZLIBVERSION}.tar.gz &&\
cd zlib-${ZLIBVERSION} &&\
export MACOSX_DEPLOYMENT_TARGET=${MACOSX_DEPLOYMENT_TARGET} &&\
export CFLAGS=${CFLAGS} &&\
@@ -46,7 +52,7 @@
png: zlib
export PKG_CONFIG_PATH=${PKG_CONFIG_PATH} &&\
rm -rf libpng-${PNGVERSION} &&\
- tar xvfz libpng-${PNGVERSION}.tar.gz
+ tar xvfz libpng-${PNGVERSION}.tar.gz && \
cd libpng-${PNGVERSION} &&\
export MACOSX_DEPLOYMENT_TARGET=${MACOSX_DEPLOYMENT_TARGET} &&\
export CFLAGS=${CFLAGS} &&\
Modified: trunk/matplotlib/release/osx/Makefile
===================================================================
--- trunk/matplotlib/release/osx/Makefile 2010-03-08 18:33:04 UTC (rev
8182)
+++ trunk/matplotlib/release/osx/Makefile 2010-03-09 14:19:49 UTC (rev
8183)
@@ -4,7 +4,7 @@
ZLIBVERSION=1.2.3
PNGVERSION=1.2.33
FREETYPEVERSION=2.3.7
-MPLVERSION=0.99.0
+MPLVERSION=1.0
BDISTMPKGVERSION=0.4.4
MPLSRC=matplotlib-${MPLVERSION}
MACOSX_DEPLOYMENT_TARGET=10.4
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Download Intel® Parallel Studio Eval
Try the new software tools for yourself. Speed compiling, find bugs
proactively, and fine-tune applications for parallel performance.
See why Intel Parallel Studio got high marks during beta.
http://p.sf.net/sfu/intel-sw-dev
_______________________________________________
Matplotlib-checkins mailing list
Matplotlib-checkins@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/matplotlib-checkins
