Anaconda fixes (aka using sys.prefix).

pelson · pelson · commit 3d6a21e00463 · 2015-02-01T22:37:29.000Z
diff --git a/setupext.py b/setupext.py
@@ -147,7 +147,7 @@ def get_base_dirs():
 
     basedir_map = {
         'win32': ['win32_static', ],
-        'darwin': ['/usr/local/', '/usr', '/usr/X11',
+        'darwin': [sys.prefix, '/usr/local/', '/usr', '/usr/X11',
                    '/opt/X11', '/opt/local'],
         'sunos5': [os.getenv('MPLIB_BASE') or '/usr/local', ],
         'gnu0': ['/usr'],
@@ -203,6 +203,13 @@ def print_line(*args, **kwargs):
 customize_compiler = sysconfig.customize_compiler
 def my_customize_compiler(compiler):
     retval = customize_compiler(compiler)
+    print(compiler.compiler_so)
+    print(compiler.linker_so)
+    dl_kwd_index = compiler.linker_so.index('dynamic_lookup')
+    compiler.linker_so.pop(dl_kwd_index)
+    compiler.linker_so.pop(dl_kwd_index - 1)
+    compiler.linker_so.extend(['-Bstatic', '-lstdc++', '-lpython2.7'])
+    print(compiler.linker_so)
     try:
         compiler.compiler_so.remove('-Wstrict-prototypes')
     except (ValueError, AttributeError):
@@ -1467,6 +1474,12 @@ def add_flags(self, ext):
             ext.library_dirs.extend([os.path.join(sys.prefix, 'dlls')])
 
         elif sys.platform == 'darwin':
+            if os.path.exists(os.path.join(sys.prefix, 'include', 'tcl.h')):
+                ext.libraries.extend(['tk8.5'])
+                ext.libraries.extend(['tcl8.5'])
+#                 ext.include_dirs.append(os.path.join(sys.prefix, 'include'))
+                return
+            
             # this config section lifted directly from Imaging - thanks to
             # the effbot!
 
@@ -1492,6 +1505,7 @@ def add_flags(self, ext):
                     tk_framework_found = 1
                     break
             if tk_framework_found:
+                print('FRAMEWORK FOUND')
                 # For 8.4a2, we must add -I options that point inside
                 # the Tcl and Tk frameworks. In later release we
                 # should hopefully be able to pass the -F option to
diff --git a/src/ft2font.cpp b/src/ft2font.cpp
@@ -2,8 +2,6 @@
 
 #define NO_IMPORT_ARRAY
 
-#include <string>
-
 #include "ft2font.h"
 #include "mplutils.h"
 
diff --git a/src/ft2font.h b/src/ft2font.h
@@ -5,6 +5,7 @@
 #define _FT2FONT_H
 #include <vector>
 #include <stdint.h>
+#include <string>
 
 extern "C" {
 #include <ft2build.h>
