Merge pull request PyMySQL#32 from PyMySQL/library-args

methane · methane · commit 568cf52943b5 · 2015-10-11T16:33:23.000+09:00
Pass options in `mysql_config --libs` to `extra_linker_args`
diff --git a/INSTALL b/INSTALL
@@ -8,57 +8,25 @@ MySQLdb Installation
 Prerequisites
 -------------
 
-+ Python 2.3.4 or higher
++ Python 2.6, 2.7, 3.3 or higher
 
   * http://www.python.org/
 
-  * Versions lower than 2.3 WON'T WORK.
-
-  * 2.4 is the primary test environment.
-
-  * Red Hat Linux:
-
-    - Make sure you have the Python development headers and libraries
-      (python-devel).
-
 + setuptools
 
   * http://pypi.python.org/pypi/setuptools
 
-+ MySQL 3.23.32 or higher
++ MySQL 5.0 or higher
 
   * http://www.mysql.com/downloads/
 
-  * Versions lower than 3.22 definitely WON'T WORK.
-
-  * Versions lower than 3.22.19 might not work.
-
-  * MySQL-3.22 might work but isn't supported anymore. It's very old.
-
-  * MySQL-3.23 ought to work, but it's pretty elderly.
-
-  * MySQL-4.0 is supported, but not tested and slightly discouraged.
-
-  * MySQL-4.1 is supported. The prepared statements API is not
-    supported, and won't be until MySQLdb-1.3 or 2.0, if ever.
+  * MySQL-4.0 and MySQL-4.1 may work, but not supported.
 
   * MySQL-5.0 is supported and tested, including stored procedures.
 
   * MySQL-5.1 is supported (currently a release candidate) but untested.
     It should work.
 
-  * MySQL-6.0 is sorta-kinda-supported (currently alpha) but untested.
-    It should work.
-
-  * Drizzle <https://launchpad.net/drizzle> is a fork of MySQL. So far
-    the C API looks really similar except everything is renamed.
-    Drizzle support probably won't happen in 1.2. There may be have to
-    be an entirely different module, but still using DB-API.
-
-  * MaxDB, formerly known as SAP DB (and maybe Adabas D?), is a
-    completely different animal. Use the sapdb.sql module that comes
-    with MaxDB.
-
   * Red Hat Linux packages:
 
     - mysql-devel to compile
@@ -75,38 +43,15 @@ Prerequisites
 
     - MySQL-shared to run if you compiled with MySQL-shared installed
 
-  * Transactions (particularly InnoDB tables) are supported for
-    MySQL-3.23 and up. You may need a special package from your vendor
-    with this support turned on.
-
-+  zlib
-
-   * Required for MySQL-3.23 and newer.
-
-   * Red Hat Linux
-
-     - zlib-devel to compile
-
-     - zlib to run
-
-+ openssl
-
-  * May be needed for MySQL-4.0 or newer, depending on compilation
-    options. If you need it, you probably already have it.
-
-    - you may need openssl-devel on some platforms
-
 + C compiler
 
   * Most free software-based systems already have this, usually gcc.
 
   * Most commercial UNIX platforms also come with a C compiler, or
     you can also use gcc.
 
-  * If you have some Windows flavor, you usually have to pay extra
-    for this, or you can use Cygwin_.
-
-.. _Cygwin: http://www.cygwin.com/
+  * If you have some Windows flavor, you should use Windows SDK or
+    Visual C++.
 
 
 Building and installing
@@ -134,12 +79,18 @@ edit the [options] section of site.cfg:
         if True, try to link against a static library; otherwise link
 	against dynamic libraries (default). You may need static linking
 	to use the embedded server.
+        This option doesn't work for MySQL>5.6 since libmysqlclient
+        requires libstdc++. If you want to use, add `-lstdc++` to
+        mysql_config manually.
 
+If `<mysql prefix>/lib` is not added to `/etc/ld.so.conf`, `import _mysql`
+doesn't work. To fix this, (1) set `LD_LIBRARY_PATH`, or (2) add
+`-Wl,-rpath,<mysql prefix>/lib` to ldflags in your mysql_config.
 
 Finally, putting it together::
 
-  $ tar xfz MySQL-python-1.2.1.tar.gz
-  $ cd MySQL-python-1.2.1
+  $ tar xz mysqlclient-1.3.6.tar.gz
+  $ cd mysqlclient-1.3.6
   $ # edit site.cfg if necessary
   $ python setup.py build
   $ sudo python setup.py install # or su first
@@ -168,15 +119,6 @@ On Windows, you will definitely have to edit site.cfg since there is
 no mysql_config in the MySQL package.
 
 
-Zope
-....
-
-If you are using a binary package of Zope, you need run setup.py with
-the python executable that came with Zope. Otherwise, you'll install
-into the wrong Python tree and Zope (ZMySQLDA) will not be able to
-find _mysql.
-
-
 Binary Packages
 ---------------
 
diff --git a/setup_posix.py b/setup_posix.py
@@ -13,9 +13,6 @@ def dequote(s):
         s = s[1:-1]
     return s
 
-def compiler_flag(f):
-    return "-%s" % f
-
 def mysql_config(what):
     from os import popen
 
@@ -53,29 +50,24 @@ def get_config():
         libs = mysql_config("libs")
         client = "mysqlclient"
 
-    library_dirs = [ dequote(i[2:]) for i in libs if i.startswith(compiler_flag("L")) ]
-    libraries = [ dequote(i[2:]) for i in libs if i.startswith(compiler_flag("l")) ]
+    library_dirs = [dequote(i[2:]) for i in libs if i.startswith('-L')]
+    libraries = [dequote(i[2:]) for i in libs if i.startswith('-l')]
+    extra_link_args = [x for x in libs if not x.startswith(('-l', '-L'))]
 
-    removable_compile_args = [ compiler_flag(f) for f in "ILl" ]
-    extra_compile_args = [ i.replace("%", "%%") for i in mysql_config("cflags")
-                           if i[:2] not in removable_compile_args ]
+    removable_compile_args = ('-I', '-L', '-l')
+    extra_compile_args = [i.replace("%", "%%") for i in mysql_config("cflags")
+                          if i[:2] not in removable_compile_args]
 
     # Copy the arch flags for linking as well
-    extra_link_args = list()
     for i in range(len(extra_compile_args)):
         if extra_compile_args[i] == '-arch':
             extra_link_args += ['-arch', extra_compile_args[i + 1]]
 
-    include_dirs = [ dequote(i[2:])
-                     for i in mysql_config('include')
-                     if i.startswith(compiler_flag('I')) ]
-    if not include_dirs: # fix for MySQL-3.23
-        include_dirs = [ dequote(i[2:])
-                         for i in mysql_config('cflags')
-                         if i.startswith(compiler_flag('I')) ]
+    include_dirs = [dequote(i[2:])
+                    for i in mysql_config('include') if i.startswith('-I')]
 
     if static:
-        extra_objects.append(os.path.join(library_dirs[0],'lib%s.a' % client))
+        extra_objects.append(os.path.join(library_dirs[0], 'lib%s.a' % client))
         if client in libraries:
             libraries.remove(client)
 
@@ -104,4 +96,3 @@ def get_config():
 
 if __name__ == "__main__":
     sys.stderr.write("""You shouldn't be running this directly; it is used by setup.py.""")
-
