diff options
| author | Yuri Victorovich <yuri@FreeBSD.org> | 2022-02-27 09:08:18 -0800 |
|---|---|---|
| committer | Yuri Victorovich <yuri@FreeBSD.org> | 2022-02-27 10:35:40 -0800 |
| commit | 0216168ecb30237c9e20377727ff4a05ff936ce8 (patch) | |
| tree | 9b756f6f1ea88285506c91317dc5936f4250ccc4 /archivers/zchunk/files | |
| parent | science/mctc-lib: Update 0.2.4 -> 0.2.5 (diff) | |
archivers/zchunk: Update 1.1.16 -> 1.2.0
Reported by: portscout
Diffstat (limited to 'archivers/zchunk/files')
| -rw-r--r-- | archivers/zchunk/files/patch-meson.build | 37 |
1 files changed, 19 insertions, 18 deletions
diff --git a/archivers/zchunk/files/patch-meson.build b/archivers/zchunk/files/patch-meson.build index aad04c686dbe..7a5a07726815 100644 --- a/archivers/zchunk/files/patch-meson.build +++ b/archivers/zchunk/files/patch-meson.build @@ -1,22 +1,23 @@ ---- meson.build.orig 2020-03-14 23:03:28 UTC +--- meson.build.orig 2022-02-20 17:07:24 UTC +++ meson.build -@@ -31,9 +31,18 @@ endif - if get_option('with-openssl') == 'disabled' - openssl_dep = dependency('', required : false) +@@ -43,10 +43,19 @@ endif + if build_machine.system() == 'windows' + openssl_dep = dependency('openssl', modules : ['OpenSSL::SSL', 'OpenSSL::Crypto'], required : get_option('with-openssl')) else -- openssl_dep = dependency('openssl', required : get_option('with-openssl') == 'enabled') -+ openssl_dep = dependency('openssl', required: false) - if openssl_dep.found() - add_project_arguments('-DZCHUNK_OPENSSL', language : 'c') -+ else -+ openssl_dep = [ -+ cc.find_library('ssl', required: get_option('with-openssl') == 'enabled'), -+ cc.find_library('crypto', required: get_option('with-openssl') == 'enabled') -+ ] -+ openssl_dep = openssl_dep[0] -+ if openssl_dep.found() -+ add_project_arguments('-DZCHUNK_OPENSSL', language : 'c') -+ endif - endif +- openssl_dep = dependency('openssl', required : get_option('with-openssl')) ++ openssl_dep = dependency('openssl', required : false) + endif + if openssl_dep.found() + add_project_arguments('-DZCHUNK_OPENSSL', language : 'c') ++else ++ openssl_dep = [ ++ cc.find_library('ssl', required: get_option('with-openssl')), ++ cc.find_library('crypto', required: get_option('with-openssl')) ++ ] ++ openssl_dep = openssl_dep[0] ++ if openssl_dep.found() ++ add_project_arguments('-DZCHUNK_OPENSSL', language : 'c') ++ endif endif + # includes |