Don't link ft2font to zlib.

anntzer · anntzer · commit 6a31feda42f1 · 2019-10-16T15:03:55.000+02:00
A default build of freetype (e.g. the one from MPLLOCALFREETYPE=1) uses
its own vendored version of zlib (see FT_CONFIG_OPTION_SYSTEM_ZLIB in
ftoption.h), so we don't need to link to zlib in that case; if we're
linking against a system freetype then we can assume that pkg-config
will list the right libraries to link.

Not linking zlib explicitly means that the staticbuild option is not
used anymore and can just be stripped out.
diff --git a/.appveyor.yml b/.appveyor.yml
@@ -60,7 +60,7 @@ install:
   # if conda-forge gets a new pyqt, it might be nice to install it as well to have more backends
   # https://github.com/conda-forge/conda-forge.github.io/issues/157#issuecomment-223536381
   - conda create -q -n test-environment python=%PYTHON_VERSION%
-    freetype=2.6 zlib=1.2 tk=8.5
+    freetype=2.6 tk=8.5
     pip setuptools numpy sphinx tornado
   - activate test-environment
   - echo %PYTHON_VERSION% %TARGET_ARCH%
@@ -81,9 +81,9 @@ test_script:
   # Now build the thing..
   - set LINK=/LIBPATH:%cd%\lib
   - pip install -ve .
-  # these should show no z or freetype dll...
+  # this should show no freetype dll...
   - set "DUMPBIN=%VS140COMNTOOLS%\..\..\VC\bin\dumpbin.exe"
-  - 'if x%MPLSTATICBUILD% == xTrue "%DUMPBIN%" /DEPENDENTS lib\matplotlib\ft2font*.pyd | findstr freetype.*.dll && exit /b 1 || exit /b 0'
+  - '"%DUMPBIN%" /DEPENDENTS lib\matplotlib\ft2font*.pyd | findstr freetype.*.dll && exit /b 1 || exit /b 0'
 
   # this are optional dependencies so that we don't skip so many tests...
   - if x%TEST_ALL% == xyes conda install -q ffmpeg inkscape miktex pillow
@@ -98,9 +98,8 @@ test_script:
   - pytest %PYTEST_ARGS%
 
 after_test:
-  # After the tests were a success, build wheels with the static libs
+  # After the tests were a success, build wheels.
   # Hide the output, the copied files really clutter the build log...
-  - set MPLSTATICBUILD=True
   - 'python setup.py bdist_wheel > NUL:'
   - dir dist\
   - echo finished...
diff --git a/INSTALL.rst b/INSTALL.rst
@@ -175,27 +175,22 @@ etc., you can install the following:
 
    .. _pkg-config: https://www.freedesktop.org/wiki/Software/pkg-config/
 
-   If not using pkg-config (in particular on Windows), you may need to set the
-   include path (to the FreeType and zlib headers) and link path (to
-   the FreeType and zlib libraries) explicitly, if they are not in
-   standard locations.  This can be done using standard environment variables
-   -- on Linux and OSX:
+   If not using pkg-config (in particular on Windows), you may need to set
+   the include path (to the FreeType headers) and link path (to the FreeType
+   library) explicitly, if they are not in standard locations.  This can be
+   done using standard environment variables -- on Linux and OSX:
 
    .. code-block:: sh
 
-      export CFLAGS='-I/directory/containing/ft2build.h ...'
-      export LDFLAGS='-L/directory/containing/libfreetype.so ...'
+      export CFLAGS='-I/directory/containing/ft2build.h'
+      export LDFLAGS='-L/directory/containing/libfreetype.so'
 
    and on Windows:
 
    .. code-block:: bat
 
-      set CL=/IC:\directory\containing\ft2build.h ...
-      set LINK=/LIBPATH:C:\directory\containing\freetype.lib ...
-
-   where ``...`` means "also give, in the same format, the directories
-   containing ``zlib.h`` for the include path, and for
-   ``libz.so``/``z.lib`` for the link path."
+      set CL=/IC:\directory\containing\ft2build.h
+      set LINK=/LIBPATH:C:\directory\containing\freetype.lib
 
 .. note::
 
@@ -273,7 +268,7 @@ https://packaging.python.org/guides/packaging-binary-extensions/#setting-up-a-bu
 for how to set up a build environment.
 
 Since there is no canonical Windows package manager, the methods for building
-FreeType and zlib from source code are documented as a build script
+FreeType from source code are documented as a build script
 at `matplotlib-winbuild <https://github.com/jbmohler/matplotlib-winbuild>`_.
 
 There are a few possibilities to build Matplotlib on Windows:
@@ -296,10 +291,8 @@ the list of conda packages.
 
 ::
 
-  conda create -n "matplotlib_build" python=3.7 numpy python-dateutil pyparsing tornado cycler tk zlib freetype
+  conda create -n "matplotlib_build" python=3.7 numpy python-dateutil pyparsing tornado cycler tk freetype
   conda activate matplotlib_build
-  # force the build against static zlib libraries
-  set MPLSTATICBUILD=True
   python setup.py bdist_wheel
 
 
diff --git a/ci/azure-pipelines-steps.yml b/ci/azure-pipelines-steps.yml
@@ -16,16 +16,6 @@ steps:
     prerelease: true
   condition: and(succeeded(), eq(variables['python.version'], 'Pre'))
 
-- ${{ if eq(parameters.installer, 'nuget') }}:
-  - task: NuGetToolInstaller@0
-    displayName: 'Use latest available Nuget'
-
-  - script: |
-      nuget install zlib-msvc14-x64 -ExcludeVersion -OutputDirectory "$(build.BinariesDirectory)"
-      echo ##vso[task.prependpath]$(build.BinariesDirectory)\zlib-msvc14-x64\build\native\bin_release
-
-    displayName: 'Install dependencies with nuget'
-
 - ${{ if eq(parameters.installer, 'brew') }}:
   - script: |
       brew install pkg-config ffmpeg imagemagick mplayer ccache
diff --git a/setupext.py b/setupext.py
@@ -151,32 +151,23 @@ def write_cache(local_fn, data):
 # matplotlib build options, which can be altered using setup.cfg
 options = {
     'backend': None,
-    'staticbuild': False,
-    }
+}
 
 
 setup_cfg = os.environ.get('MPLSETUPCFG', 'setup.cfg')
 if os.path.exists(setup_cfg):
     config = configparser.ConfigParser()
     config.read(setup_cfg)
-
     if config.has_option('rc_options', 'backend'):
         options['backend'] = config.get("rc_options", "backend")
-
     if config.has_option('test', 'local_freetype'):
         options['local_freetype'] = config.getboolean("test", "local_freetype")
-
-    if config.has_option('build', 'staticbuild'):
-        options['staticbuild'] = config.getboolean("build", "staticbuild")
 else:
     config = None
 
 lft = bool(os.environ.get('MPLLOCALFREETYPE', False))
 options['local_freetype'] = lft or options.get('local_freetype', False)
 
-staticbuild = bool(os.environ.get('MPLSTATICBUILD', os.name == 'nt'))
-options['staticbuild'] = staticbuild or options.get('staticbuild', False)
-
 
 if '-q' in sys.argv or '--quiet' in sys.argv:
     def print_raw(*args, **kwargs): pass  # Suppress our own output.
@@ -202,21 +193,6 @@ def get_buffer_hash(fd):
     return hasher.hexdigest()
 
 
-def deplib(libname):
-    if sys.platform != 'win32':
-        return libname
-
-    known_libs = {
-        'z': ('zlib', 'static'),
-    }
-
-    libname, static_postfix = known_libs[libname]
-    if options['staticbuild']:
-        libname += static_postfix
-
-    return libname
-
-
 @functools.lru_cache(1)  # We only need to compute this once.
 def get_pkg_config():
     """
@@ -521,7 +497,7 @@ def add_flags(self, ext):
                 ext, 'freetype2',
                 atleast_version='9.11.3',
                 alt_exec=['freetype-config'],
-                default_libraries=['freetype', deplib('z')])
+                default_libraries=['freetype'])
             ext.define_macros.append(('FREETYPE_BUILD_TYPE', 'system'))
 
     def do_custom_build(self):
