merge lxml-3.6 branch into master

CHANGES.txt

@@ -2,7 +2,6 @@
 lxml changelog
 ==============
 
-
 3.7.0 (2016-??-??)
 ==================
 
@@ -20,16 +19,22 @@ Other changes
   and file name.
 
 
+3.6.4 (2016-08-20)
+==================
+
+* GH#204, LP#1614693: build fix for MacOS-X.
+
+
 3.6.3 (2016-08-18)
 ==================
 
-* release without source changes to provide cleanly built Linux wheels
+* LP#1614603: change linker flags to build multi-linux wheels
 
 
 3.6.2 (2016-08-18)
 ==================
 
-* release without source changes to provide cleanly built Linux wheels
+* LP#1614603: release without source changes to provide cleanly built Linux wheels
 
 
 3.6.1 (2016-07-24)

doc/main.txt

@@ -157,8 +157,8 @@ Index <http://pypi.python.org/pypi/lxml/>`_ (PyPI).  It has the source
 that compiles on various platforms.  The source distribution is signed
 with `this key <pubkey.asc>`_.
 
-The latest version is `lxml 3.6.3`_, released 2016-08-18
-(`changes for 3.6.3`_).  `Older versions <#old-versions>`_
+The latest version is `lxml 3.6.4`_, released 2016-08-20
+(`changes for 3.6.4`_).  `Older versions <#old-versions>`_
 are listed below.
 
 Please take a look at the
@@ -243,7 +243,9 @@ See the web sites of lxml
 `3.5 <http://lxml.de/3.5/>`_
 and the `latest in-development version <http://lxml.de/dev/>`_.
 
-.. _`PDF documentation`: lxmldoc-3.6.1.pdf
+.. _`PDF documentation`: lxmldoc-3.6.4.pdf
+
+* `lxml 3.6.4`_, released 2016-08-18 (`changes for 3.6.4`_)
 
 * `lxml 3.6.3`_, released 2016-08-18 (`changes for 3.6.3`_)
 
@@ -269,6 +271,7 @@ and the `latest in-development version <http://lxml.de/dev/>`_.
 
 * `older releases <http://lxml.de/3.4/#old-versions>`_
 
+.. _`lxml 3.6.4`: /files/lxml-3.6.4.tgz
 .. _`lxml 3.6.3`: /files/lxml-3.6.3.tgz
 .. _`lxml 3.6.2`: /files/lxml-3.6.2.tgz
 .. _`lxml 3.6.1`: /files/lxml-3.6.1.tgz
@@ -281,6 +284,7 @@ and the `latest in-development version <http://lxml.de/dev/>`_.
 .. _`lxml 3.4.1`: /files/lxml-3.4.1.tgz
 .. _`lxml 3.4.0`: /files/lxml-3.4.0.tgz
 
+.. _`changes for 3.6.4`: /changes-3.6.4.html
 .. _`changes for 3.6.3`: /changes-3.6.3.html
 .. _`changes for 3.6.2`: /changes-3.6.2.html
 .. _`changes for 3.6.1`: /changes-3.6.1.html

setupinfo.py

@@ -231,17 +231,17 @@ def print_libxml_error():
 
 
 def libraries():
+    librt = ['rt'] if 'linux' in sys.platform else []
+
     if sys.platform in ('win32',):
         libs = ['libxslt', 'libexslt', 'libxml2', 'iconv']
         if OPTION_STATIC:
             libs = ['%s_a' % lib for lib in libs]
         libs.extend(['zlib', 'WS2_32'])
     elif OPTION_STATIC:
-        libs = ['rt', 'z', 'm']
-    elif sys.platform in ('darwin',):
-        libs = ['xslt', 'exslt', 'xml2', 'z', 'm']
+        libs = librt + ['z', 'm']
     else:
-        libs = ['xslt', 'exslt', 'rt', 'xml2', 'z', 'm']
+        libs = ['xslt', 'exslt'] + librt + ['xml2', 'z', 'm']
     return libs
 
 def library_dirs(static_library_dirs):

version.txt

@@ -1 +1 @@
-3.6.3
+3.6.4