diff options
| author | JackBoosY <47264268+JackBoosY@users.noreply.github.com> | 2019-08-21 03:18:47 +0800 |
|---|---|---|
| committer | Curtis J Bezault <curtbezault@gmail.com> | 2019-08-20 12:18:47 -0700 |
| commit | f7e4478af1e814a42f3a0b182692c9451e844066 (patch) | |
| tree | ba9d31835cc16db4b5535d42930178ab4ad82450 | |
| parent | adad43a41751d0bfc315b17f7d691c6988ab9f9b (diff) | |
| download | vcpkg-f7e4478af1e814a42f3a0b182692c9451e844066.tar.gz vcpkg-f7e4478af1e814a42f3a0b182692c9451e844066.zip | |
[fribidi]Fix static library suffix in windows-static (#7768)
| -rw-r--r-- | ports/fribidi/CONTROL | 2 | ||||
| -rw-r--r-- | ports/fribidi/fix-win-static-suffix.patch | 39 | ||||
| -rw-r--r-- | ports/fribidi/portfile.cmake | 1 |
3 files changed, 41 insertions, 1 deletions
diff --git a/ports/fribidi/CONTROL b/ports/fribidi/CONTROL index 098748ee8..e493429d4 100644 --- a/ports/fribidi/CONTROL +++ b/ports/fribidi/CONTROL @@ -1,3 +1,3 @@ Source: fribidi
-Version: 58c6cb3
+Version: 2019-02-04-1
Description: GNU FriBidi is an implementation of the Unicode Bidirectional Algorithm (bidi)
diff --git a/ports/fribidi/fix-win-static-suffix.patch b/ports/fribidi/fix-win-static-suffix.patch new file mode 100644 index 000000000..87f288e93 --- /dev/null +++ b/ports/fribidi/fix-win-static-suffix.patch @@ -0,0 +1,39 @@ +diff --git a/lib/meson.build b/lib/meson.build +index 573d47f..c9b249e 100644 +--- a/lib/meson.build ++++ b/lib/meson.build +@@ -71,14 +71,26 @@ 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) ++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) ++endif + + libfribidi_dep = declare_dependency(link_with: libfribidi, + include_directories: incs, diff --git a/ports/fribidi/portfile.cmake b/ports/fribidi/portfile.cmake index 5b45a17b1..843964500 100644 --- a/ports/fribidi/portfile.cmake +++ b/ports/fribidi/portfile.cmake @@ -6,6 +6,7 @@ vcpkg_from_github( REF 58c6cb390a9a18c98b2cbaac555d8ea9352a9e4f
SHA512 1ec9c19faa87886786ce1589e2c66cab173b48e34d0e43487becc8606001f21f6ed17d0abd1c322fbbcaeb96a47ed882cad228be2e9beb019020ca2a475fc298
HEAD_REF master
+ PATCHES fix-win-static-suffix.patch
)
vcpkg_configure_meson(
|