From 4ee28541cd621c3fcdfd694fbf031f85cd55e6ca Mon Sep 17 00:00:00 2001 From: Matthieu Gautier Date: Wed, 22 Dec 2021 15:36:16 +0100 Subject: [PATCH] Remove unnecessary zstd patch. --- kiwixbuild/dependencies/zstd.py | 1 - kiwixbuild/patches/zstd_meson.patch | 20 -------------------- 2 files changed, 21 deletions(-) delete mode 100644 kiwixbuild/patches/zstd_meson.patch diff --git a/kiwixbuild/dependencies/zstd.py b/kiwixbuild/dependencies/zstd.py index e4dd643..f142d82 100644 --- a/kiwixbuild/dependencies/zstd.py +++ b/kiwixbuild/dependencies/zstd.py @@ -14,7 +14,6 @@ class zstd(Dependency): archive = Remotefile('zstd-1.5.1.tar.gz', 'e28b2f2ed5710ea0d3a1ecac3f6a947a016b972b9dd30242369010e5f53d7002', 'https://github.com/facebook/zstd/releases/download/v1.5.1/zstd-1.5.1.tar.gz') - patches = ['zstd_meson.patch'] class Builder(MesonBuilder): subsource_dir = 'build/meson' diff --git a/kiwixbuild/patches/zstd_meson.patch b/kiwixbuild/patches/zstd_meson.patch deleted file mode 100644 index 83e7fc3..0000000 --- a/kiwixbuild/patches/zstd_meson.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff -ur zstd-1.4.4/build/meson/meson.build zstd-1.4.4.patched/build/meson/meson.build ---- zstd-1.4.4/build/meson/meson.build 2019-11-04 21:54:32.000000000 +0400 -+++ zstd-1.4.4.patched/build/meson/meson.build 2020-04-07 13:59:26.012106549 +0400 -@@ -68,6 +68,7 @@ - # Built-in options - use_debug = get_option('debug') - buildtype = get_option('buildtype') -+default_library_type = get_option('default_library') - - # Custom options - debug_level = get_option('debug_level') -@@ -121,7 +122,7 @@ - if use_multi_thread - msvc_compile_flags += '/MP' - endif -- if enable_static_runtime -+ if use_static_runtime - msvc_compile_flags += '/MT' - endif - add_project_arguments(msvc_compile_flags, language: ['c', 'cpp'])