From 474abc82cc5133aedc46b9b7a78d9fbfa5fd2e9f Mon Sep 17 00:00:00 2001 From: Russell Owen Date: Thu, 1 Mar 2012 14:12:55 -0800 Subject: [PATCH 1/2] Change setupext.py to be compatible with Mac OS X (darwin); include instructions for users of packaging systems (e.g. MacPorts). --- setupext.py | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/setupext.py b/setupext.py index a0c9adc6c21a..ed19f30569e2 100644 --- a/setupext.py +++ b/setupext.py @@ -58,15 +58,13 @@ 'linux3' : ['/usr/local', '/usr'], 'linux' : ['/usr/local', '/usr',], 'cygwin' : ['/usr/local', '/usr',], - '_darwin' : ['/sw/lib/freetype2', '/sw/lib/freetype219', '/usr/local', - '/usr', '/sw'], - # it appears builds with darwin are broken because of all the - # different flags the deps can be compile with, so I am pushing - # people to : - # make -f make.osx fetch deps mpl_build mpl_install - - 'darwin' : [], + + # darwin is Mac OS X. + # The default configuration works for Apple's built-in python, python.org python and Homebrew python + # If you use Fink python then prepend '/sw' + # If you use MacPorts python then prepend '/opt/local' + 'darwin' : ['/usr/local/', '/usr', '/usr/X11'], 'freebsd4' : ['/usr/local', '/usr'], 'freebsd5' : ['/usr/local', '/usr'], 'freebsd6' : ['/usr/local', '/usr'], From 17a82f9f339e5bc4e2d77819e61e4e5445a11a1c Mon Sep 17 00:00:00 2001 From: Russell Owen Date: Tue, 26 Jun 2012 15:19:11 -0700 Subject: [PATCH 2/2] Minor cleanup --- setupext.py | 6 ------ 1 file changed, 6 deletions(-) diff --git a/setupext.py b/setupext.py index ed19f30569e2..c6c2fa7d0d9f 100644 --- a/setupext.py +++ b/setupext.py @@ -58,12 +58,6 @@ 'linux3' : ['/usr/local', '/usr'], 'linux' : ['/usr/local', '/usr',], 'cygwin' : ['/usr/local', '/usr',], - - # darwin is Mac OS X. - # The default configuration works for Apple's built-in python, python.org python and Homebrew python - # If you use Fink python then prepend '/sw' - # If you use MacPorts python then prepend '/opt/local' - 'darwin' : ['/usr/local/', '/usr', '/usr/X11'], 'freebsd4' : ['/usr/local', '/usr'], 'freebsd5' : ['/usr/local', '/usr'],