From 70af8234798d7098be907e8f0ec8a9d441c21997 Mon Sep 17 00:00:00 2001 From: HCLJason <79225526+HCLJason@users.noreply.github.com> Date: Fri, 21 Oct 2022 11:36:23 -0400 Subject: [PATCH 1/2] Updating zlib to 1.2.13 --- tools/ports/zlib.py | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/tools/ports/zlib.py b/tools/ports/zlib.py index 727302201e3c6..bcdddce5000b5 100644 --- a/tools/ports/zlib.py +++ b/tools/ports/zlib.py @@ -4,23 +4,22 @@ # found in the LICENSE file. import os +import shutil -VERSION = '1.2.12' -HASH = 'cc2366fa45d5dfee1f983c8c51515e0cff959b61471e2e8d24350dea22d3f6fcc50723615a911b046ffc95f51ba337d39ae402131a55e6d1541d3b095d6c0a14' - +VERSION = '1.2.13' +HASH = '44b834fbfb50cca229209b8dbe1f96b258f19a49f5df23b80970b716371d856a4adf525edb4c6e0e645b180ea949cb90f5365a1d896160f297f56794dd888659' def needed(settings): return settings.USE_ZLIB - def get(ports, settings, shared): - ports.fetch_project('zlib', f'https://storage.googleapis.com/webassembly/emscripten-ports/zlib-{VERSION}.tar.gz', 'zlib-' + VERSION, sha512hash=HASH) - + ports.fetch_project('zlib', 'https://github.com/madler/zlib/archive/refs/tags/v' + VERSION + '.tar.gz', 'zlib-' + VERSION, sha512hash=HASH) def create(final): + ports.clear_project_build('zlib') source_path = os.path.join(ports.get_dir(), 'zlib', 'zlib-' + VERSION) ports.write_file(os.path.join(source_path, 'zconf.h'), zconf_h) ports.install_headers(source_path) - + # build srcs = 'adler32.c compress.c crc32.c deflate.c gzclose.c gzlib.c gzread.c gzwrite.c infback.c inffast.c inflate.c inftrees.c trees.c uncompr.c zutil.c'.split() flags = ['-Wno-deprecated-non-prototype'] @@ -30,7 +29,7 @@ def create(final): def clear(ports, settings, shared): - shared.Cache.erase_lib('libz.a') + shared.Cache.erase_file('libz.a') def process_args(ports): From 0025c37de82f7b7bfce86e7c6c1e5b90721ae9e3 Mon Sep 17 00:00:00 2001 From: HCLJason <79225526+HCLJason@users.noreply.github.com> Date: Fri, 21 Oct 2022 13:27:18 -0400 Subject: [PATCH 2/2] Don't need shutil --- tools/ports/zlib.py | 1 - 1 file changed, 1 deletion(-) diff --git a/tools/ports/zlib.py b/tools/ports/zlib.py index bcdddce5000b5..46729e3de0db1 100644 --- a/tools/ports/zlib.py +++ b/tools/ports/zlib.py @@ -4,7 +4,6 @@ # found in the LICENSE file. import os -import shutil VERSION = '1.2.13' HASH = '44b834fbfb50cca229209b8dbe1f96b258f19a49f5df23b80970b716371d856a4adf525edb4c6e0e645b180ea949cb90f5365a1d896160f297f56794dd888659'