smallsolar
/
kiwix-build
mirror of https://github.com/kiwix/kiwix-build.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove unnecessary zstd patch.

This commit is contained in:
Matthieu Gautier 2021-12-22 15:36:16 +01:00
parent 1a3df6fa3b
commit 4ee28541cd
2 changed files with 0 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
kiwixbuild/dependencies/zstd.py
View File

@ -14,7 +14,6 @@ class zstd(Dependency):
archive = Remotefile('zstd-1.5.1.tar.gz', archive = Remotefile('zstd-1.5.1.tar.gz',
'e28b2f2ed5710ea0d3a1ecac3f6a947a016b972b9dd30242369010e5f53d7002', 'e28b2f2ed5710ea0d3a1ecac3f6a947a016b972b9dd30242369010e5f53d7002',
'https://github.com/facebook/zstd/releases/download/v1.5.1/zstd-1.5.1.tar.gz') 'https://github.com/facebook/zstd/releases/download/v1.5.1/zstd-1.5.1.tar.gz')
patches = ['zstd_meson.patch']
class Builder(MesonBuilder): class Builder(MesonBuilder):
subsource_dir = 'build/meson' subsource_dir = 'build/meson'

20
kiwixbuild/patches/zstd_meson.patch
View File

@ -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'])