BUG21782246: Fix Install check of bitness of libmysql c client fails.

The check for libmysqlclient.so it was being done in the worng
file, this patch corrects the problem avoding 'libmysqlclient.a.*'
files.

v 1.7

Author: isrgomez

CHANGES.txt

@@ -11,6 +11,7 @@ Full release notes:
 v2.1.3
 ======
 
+- BUG#21782246: Fix Install check of bitness of libmysql c client fails
 - BUG#21505096: MySQL Connector python 2.1.2 does not ship with required __init.py__ files
 - BUG#21499127: Fix copyright year in README.txt
 - BUG#21420633: Fix CExtension crashing while fetching large number of NULL value

lib/cpy_distutils.py

@@ -1,6 +1,7 @@
 # MySQL Connector/Python - MySQL driver written in Python.
 # Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
 
+
 # MySQL Connector/Python is licensed under the terms of the GPLv2
 # <http://www.gnu.org/licenses/old-licenses/gpl-2.0.html>, like most
 # MySQL Connectors. There are special exceptions to the terms and
@@ -40,6 +41,7 @@
 import platform
 
 ARCH_64BIT = sys.maxsize > 2**32  # Works with Python 2.6 and greater
+py_arch = '64-bit' if ARCH_64BIT else '32-bit'
 
 CEXT_OPTIONS = [
     ('with-mysql-capi=', None,
@@ -108,25 +110,28 @@ def unix_lib_is64bit(lib_file):
         raise OSError("unix_lib_is64bit only useful on UNIX-like systems")
 
     if os.isdir(lib_file):
-        mysqlclient_lib = None
-        for root, dirs, files in os.walk(lib_file):
+        mysqlclient_libs = []
+        for root, _, files in os.walk(lib_file):
             for filename in files:
                 filepath = os.path.join(root, filename)
                 if filename.startswith('libmysqlclient') and \
-                    not os.path.islink(filepath) and \
-                    '_r' not in filename:
-                    mysqlclient_lib = filepath
-                    break
-            if mysqlclient_lib:
+                   not os.path.islink(filepath) and \
+                   '_r' not in filename and \
+                   '.a' not in filename:
+                    mysqlclient_libs.append(filepath)
+            if mysqlclient_libs:
                 break
-        lib_file = mysqlclient_lib
+        # give priority to .so files instead of .a
+        mysqlclient_libs.sort()
+        lib_file = mysqlclient_libs[-1]
 
+    log.debug("# Using file command to test lib_file {0}".format(lib_file))
     prc = Popen(['file', '-L', lib_file], stdin=PIPE, stderr=STDOUT,
                 stdout=PIPE)
     stdout = prc.communicate()[0]
     stdout = stdout.split(':')[1]
-
-    if 'x86_64' in stdout or 'x86-64' in stdout:
+    log.debug("# lib_file {0} stdout: {1}".format(lib_file, stdout))
+    if 'x86_64' in stdout or 'x86-64' in stdout or '32-bit' not in stdout:
         return True
 
     return False
@@ -147,9 +152,11 @@ def get_mysql_config_info(mysql_config):
     except OSError as exc:
         raise DistutilsExecError("Failed executing mysql_config: {0}".format(
             str(exc)))
-
+    log.debug("# stdout: {0}".format(stdout))
     info = {}
     for option, line in zip(options, stdout.split('\n')):
+        log.debug("# option: {0}".format(option))
+        log.debug("# line: {0}".format(line))
         info[option] = line.strip()
 
     ver = info['version']
@@ -160,7 +167,10 @@ def get_mysql_config_info(mysql_config):
     libs = shlex.split(info['libs'])
     info['lib_dir'] = libs[0].replace('-L', '')
     info['libs'] = [ lib.replace('-l', '') for lib in libs[1:] ]
-
+    log.debug("# info['libs']: ")
+    for lib in info['libs']:
+        log.debug("#   {0}".format(lib))
+    log.error("# info['libs']: {0}".format(info['libs']))
     libs = shlex.split(info['libs_r'])
     info['lib_r_dir'] = libs[0].replace('-L', '')
     info['libs_r'] = [ lib.replace('-l', '') for lib in libs[1:] ]
@@ -171,11 +181,29 @@ def get_mysql_config_info(mysql_config):
     info['arch'] = None
     if os.name == 'posix':
         pathname = os.path.join(info['lib_dir'], 'lib' + info['libs'][0]) + '*'
-        lib = glob(pathname)[0]
+        libs = glob(pathname)
+        log.debug("# libs: {0}".format(libs))
+        for lib in libs:
+            log.debug("#-   {0}".format(lib))
+        mysqlclient_libs = []
+        for filepath in libs:
+            _, filename = os.path.split(filepath)
+            log.debug("#  filename {0}".format(filename))
+            if filename.startswith('libmysqlclient') and \
+               not os.path.islink(filepath) and \
+               '_r' not in filename and \
+               '.a' not in filename:
+                mysqlclient_libs.append(filepath)
+        mysqlclient_libs.sort()
 
         stdout = None
         try:
-            proc = Popen(['file', '-L', lib], stdout=PIPE,
+            log.debug("# mysqlclient_lib: {0}".format(mysqlclient_libs[-1]))
+            for mysqlclient_lib in mysqlclient_libs:
+                log.debug("#+   {0}".format(mysqlclient_lib))
+            log.debug("# tested mysqlclient_lib[-1]: "
+                      "{0}".format(mysqlclient_libs[-1]))
+            proc = Popen(['file', '-L', mysqlclient_libs[-1]], stdout=PIPE,
                          universal_newlines=True)
             stdout, _ = proc.communicate()
             stdout = stdout.split(':')[1]
@@ -254,6 +282,7 @@ def _finalize_connector_c(self, connc_loc):
             if os.path.isfile(mysql_config) and \
                     os.access(mysql_config, os.X_OK):
                 connc_loc = mysql_config
+                log.debug("# connc_loc: {0}".format(connc_loc))
             else:
                 # Probably using MS Windows
                 myconfigh = os.path.join(connc_loc, 'include', 'my_config.h')
@@ -299,6 +328,7 @@ def _finalize_connector_c(self, connc_loc):
                     libraries = ['-lmysqlclient']
                 library_dirs = os.path.join(connc_loc, 'lib')
 
+                log.debug("# connc_64bit: {0}".format(connc_64bit))
                 if connc_64bit:
                     self.arch = 'x86_64'
                 else:
@@ -310,6 +340,7 @@ def _finalize_connector_c(self, connc_loc):
             mysql_config = connc_loc
             # Check mysql_config
             myc_info = get_mysql_config_info(mysql_config)
+            log.debug("# myc_info: {0}".format(myc_info))
 
             if myc_info['version'] < min_version:
                 log.error(err_version)
@@ -334,10 +365,16 @@ def _finalize_connector_c(self, connc_loc):
         # We try to offer a nice message when the architecture of Python
         # is not the same as MySQL Connector/C binaries.
         py_arch = '64-bit' if ARCH_64BIT else '32-bit'
+        log.debug("# Python architecture: {0}".format(py_arch))
+        log.debug("# Python ARCH_64BIT: {0}".format(ARCH_64BIT))
+        log.debug("# self.arch: {0}".format(self.arch))
         if ARCH_64BIT != connc_64bit:
             log.error("Python is {0}, but does not "
-                      "match MySQL C API {1} architecture".format(
-                py_arch, '64-bit' if connc_64bit else '32-bit'))
+                      "match MySQL C API {1} architecture, "
+                      "type: {2}"
+                      "".format(py_arch,
+                                '64-bit' if connc_64bit else '32-bit',
+                                self.arch))
             sys.exit(1)
 
     def finalize_options(self):