Merge pull request #13462 from tacaswell/auto-backport-of-pr-13455-on-v2.2.x

NelleV · web-flow · commit 00d2340eae7c · 2019-02-19T09:35:18.000-08:00
Merge pull request #13455 from tacaswell/fix_freetype_download_logic
diff --git a/setupext.py b/setupext.py
@@ -1252,44 +1252,51 @@ def do_custom_build(self):
         else:
             libfreetype = 'libfreetype.a'
 
-        if os.path.isfile(os.path.join(src_path, 'objs', '.libs', libfreetype)):
+        # bailing because it is already built
+        if os.path.isfile(os.path.join(
+                src_path, 'objs', '.libs', libfreetype)):
             return
-        if not os.path.exists('build'):
-            os.makedirs('build')
-
-        url_fmts = [
-            ('https://downloads.sourceforge.net/project/freetype'
-             '/freetype2/{version}/{tarball}'),
-            ('https://download.savannah.gnu.org/releases/freetype'
-             '/{tarball}')
-        ]
-        tarball = 'freetype-{0}.tar.gz'.format(LOCAL_FREETYPE_VERSION)
 
-        target_urls = [
-            url_fmt.format(version=LOCAL_FREETYPE_VERSION,
-                           tarball=tarball)
-            for url_fmt in url_fmts]
+        # do we need to download / load the source from cache?
+        if not os.path.exists(src_path):
+            if not os.path.exists('build'):
+                os.makedirs('build')
 
-        for tarball_url in target_urls:
-            try:
-                tar_contents = download_or_cache(tarball_url,
-                                                 LOCAL_FREETYPE_HASH)
-                break
-            except Exception:
-                pass
-        else:
-            raise IOError("Failed to download FreeType.  Please download " +
-                          "one of {target_urls} ".format(
-                              target_urls=target_urls) +
-                          "and extract it into the build directory "
-                          "at the top-level of the source repository")
-
-        print("Building {}".format(tarball))
-        tar_contents.seek(0)
-        with tarfile.open(tarball, mode="r:gz", fileobj=tar_contents) as tgz:
-            tgz.extractall("build")
-
-        print("Building {0}".format(tarball))
+            url_fmts = [
+                ('https://downloads.sourceforge.net/project/freetype'
+                 '/freetype2/{version}/{tarball}'),
+                ('https://download.savannah.gnu.org/releases/freetype'
+                 '/{tarball}')
+            ]
+            tarball = 'freetype-{0}.tar.gz'.format(LOCAL_FREETYPE_VERSION)
+
+            target_urls = [
+                url_fmt.format(version=LOCAL_FREETYPE_VERSION,
+                               tarball=tarball)
+                for url_fmt in url_fmts]
+
+            for tarball_url in target_urls:
+                try:
+                    tar_contents = download_or_cache(tarball_url,
+                                                     LOCAL_FREETYPE_HASH)
+                    break
+                except Exception:
+                    pass
+            else:
+                raise IOError("Failed to download FreeType.  Please download "
+                              "one of {target_urls} and extract it into "
+                              "{src_path} at the top-level of the source "
+                              "repository".format(
+                                  target_urls=target_urls, src_path=src_path))
+
+            print("Extracting {}".format(tarball))
+            # just to be sure
+            tar_contents.seek(0)
+            with tarfile.open(tarball, mode="r:gz",
+                              fileobj=tar_contents) as tgz:
+                tgz.extractall("build")
+
+        print("Building freetype in {}".format(src_path))
         if sys.platform != 'win32':
             # compilation on all other platforms than windows
             cflags = 'CFLAGS="{0} -fPIC" '.format(os.environ.get('CFLAGS', ''))
