setupinfo.py

 - Backed out previos change to add "librt"

lib/cpy_distutils.py
 - Use more specialized variables 'include_dirs', 'library_dirs' and
   'libraries' when adding information to the compiler and linker
   objects.
 - Add "librt" after adding "libmysqlclient". GCC 4.6 ignore "-lrt" if
   given before "-lmysqlclient", and how distutils and the old code
   worked the order was always "-lrt" before "-lmysqlclient"

Author: kboortz

lib/cpy_distutils.py

@@ -37,6 +37,7 @@
 import struct
 from subprocess import Popen, PIPE, STDOUT
 import sys
+import platform
 
 ARCH_64BIT = sys.maxsize > 2**32  # Works with Python 2.6 and greater
 
@@ -429,35 +430,33 @@ def _finalize_connector_c(self, connc_loc):
         copy_tree(os.path.join(connc_loc, 'lib'), self.connc_lib)
         copy_tree(os.path.join(connc_loc, 'include'), self.connc_include)
 
+        # Remove all but static libraries to force static linking
         for lib_file in os.listdir(self.connc_lib):
             if os.name == 'posix' and not lib_file.endswith('.a'):
                 os.unlink(os.path.join(self.connc_lib, lib_file))
 
     def fix_compiler(self):
         BuildExtDynamic.fix_compiler(self)
 
-        extra_compile_args = []
-        extra_link_args = []
+        include_dirs = []
+        library_dirs = []
+        libraries = []
 
         if os.name == 'posix':
-            extra_compile_args = [
-                '-I%s' % self.connc_include
-            ]
-            extra_link_args = [
-                #'-lstdc++',
-                '-L%s' % self.connc_lib,
-                '-lmysqlclient',
-            ]
-
-        if not extra_compile_args and not extra_link_args:
-            return
+            include_dirs.append(self.connc_include)
+            library_dirs.append(self.connc_lib)
+            libraries.append("mysqlclient")
 
-        for ext in self.extensions:
-            if extra_compile_args:
-                ext.extra_compile_args.extend(extra_compile_args)
-            if extra_link_args:
-                ext.extra_link_args.extend(extra_link_args)
+            # As we statically link and the "libmysqlclient.a" library
+            # carry no information what it depends on, we need to
+            # manually add library dependencies here.
+            if platform.system() not in ["Darwin", "Windows"]:
+                libraries.append("rt")
 
+        for ext in self.extensions:
+            ext.include_dirs.extend(include_dirs)
+            ext.library_dirs.extend(library_dirs)
+            ext.libraries.extend(libraries)
 
 
 class InstallLib(install_lib):

setupinfo.py

@@ -24,7 +24,6 @@
 from distutils.core import Extension
 import os
 import sys
-import platform
 
 from lib.cpy_distutils import (
     Install, InstallLib, BuildExtDynamic, BuildExtStatic
@@ -61,10 +60,6 @@
 name = 'mysql-connector-python'
 version = '{0}.{1}.{2}'.format(*VERSION[0:3])
 
-extra_libraries = ['rt']
-if platform.system() in ["Darwin", "Windows"]:
-    extra_libraries = []
-
 extensions = [
     Extension("_mysql_connector",
               sources=[
@@ -75,7 +70,6 @@
                   "src/force_cpp_linkage.cc",
               ],
               include_dirs=['src/include'],
-              libraries=extra_libraries,
     )
 ]