diff options
| author | Daniel <supsuper@gmail.com> | 2020-08-10 23:33:47 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-10 15:33:47 -0700 |
| commit | 92f6eb402afbf32dcc8d4083ccb5ae01dcf10881 (patch) | |
| tree | d3a4e1eced0fb6d94c9fbce0cda328600195618b /ports/fribidi/fix-win-static-suffix.patch | |
| parent | fca18ba3572f8aebe3b8158c359db62a7e26134e (diff) | |
| download | vcpkg-92f6eb402afbf32dcc8d4083ccb5ae01dcf10881.tar.gz vcpkg-92f6eb402afbf32dcc8d4083ccb5ae01dcf10881.zip | |
[fribidi] Update to 1.0.10 (#12517)
* [fribidi] Update to 1.0.10
* [fribidi] Disable tests and executables
* [fribidi] Apply FRIBIDI_LIB_STATIC to static builds
Co-authored-by: wangli28 <wangli28@beyondsoft.com>
Diffstat (limited to 'ports/fribidi/fix-win-static-suffix.patch')
| -rw-r--r-- | ports/fribidi/fix-win-static-suffix.patch | 42 |
1 files changed, 14 insertions, 28 deletions
diff --git a/ports/fribidi/fix-win-static-suffix.patch b/ports/fribidi/fix-win-static-suffix.patch index 87f288e93..953b1b91b 100644 --- a/ports/fribidi/fix-win-static-suffix.patch +++ b/ports/fribidi/fix-win-static-suffix.patch @@ -1,39 +1,25 @@ diff --git a/lib/meson.build b/lib/meson.build -index 573d47f..c9b249e 100644 +index aaf2aed..3fe8937 100644 --- a/lib/meson.build +++ b/lib/meson.build -@@ -71,14 +71,26 @@ fribidi_sources = [ +@@ -71,6 +71,10 @@ fribidi_sources = [ 'fribidi-shape.c', ] --libfribidi = library('fribidi', -- fribidi_sources, fribidi_unicode_version_h, fribidi_config_h, -- generated_tab_include_files, config_h, -- include_directories: incs, -- c_args: ['-DHAVE_CONFIG_H'] + visibility_args, -- version: libversion, -- soversion: soversion, -- install: true) ++libsuffix = [] +if host_machine.system() == 'windows' and get_option('default_library') == 'static' -+ libfribidi = library('fribidi', -+ fribidi_sources, fribidi_unicode_version_h, fribidi_config_h, -+ generated_tab_include_files, config_h, -+ include_directories: incs, -+ c_args: ['-DHAVE_CONFIG_H'] + visibility_args, -+ version: libversion, -+ soversion: soversion, -+ install: true, -+ name_suffix: 'lib') -+else -+ libfribidi = library('fribidi', -+ fribidi_sources, fribidi_unicode_version_h, fribidi_config_h, -+ generated_tab_include_files, config_h, -+ include_directories: incs, -+ c_args: ['-DHAVE_CONFIG_H'] + visibility_args, -+ version: libversion, -+ soversion: soversion, -+ install: true) ++ libsuffix = 'lib' +endif + libfribidi = library('fribidi', + fribidi_sources, fribidi_unicode_version_h, fribidi_config_h, + generated_tab_include_files, config_h, +@@ -78,7 +82,8 @@ libfribidi = library('fribidi', + c_args: ['-DHAVE_CONFIG_H', '-DFRIBIDI_BUILD'] + fribidi_static_cargs + visibility_args, + version: libversion, + soversion: soversion, +- install: true) ++ install: true, ++ name_suffix: libsuffix) libfribidi_dep = declare_dependency(link_with: libfribidi, include_directories: incs, |