зеркало из https://github.com/microsoft/vcpkg.git
[fontconfig] Fix mingw build (#25389)
* Fix mingw build * Update versions
This commit is contained in:
Родитель
613ee92bae
Коммит
d3197c9ada
|
@ -0,0 +1,13 @@
|
|||
diff --git a/meson.build b/meson.build
|
||||
index e5096bf..51c289f 100644
|
||||
--- a/meson.build
|
||||
+++ b/meson.build
|
||||
@@ -268,7 +268,7 @@ sh = find_program('sh', required : false)
|
||||
|
||||
if not sh.found() # host_machine.system() == 'windows' or not sh.found()
|
||||
# TODO: This is not always correct
|
||||
- if cc.get_id() == 'msvc'
|
||||
+ if host_machine.system() == 'windows'
|
||||
gperf_len_type = 'size_t'
|
||||
else
|
||||
gperf_len_type = 'unsigned'
|
|
@ -120,7 +120,7 @@ index f616600..6d82a16 100644
|
|||
+if host_machine.system() == 'windows'
|
||||
+ conf.set('HAVE_GETOPT', 1)
|
||||
+ conf.set('HAVE_GETOPT_LONG', 1)
|
||||
+ getopt_dep = cc.find_library('getopt', required: true)
|
||||
+ getopt_dep = cc.find_library('getopt', required: false)
|
||||
+else
|
||||
+ getopt_dep = dependency('', required: false)
|
||||
+endif
|
||||
|
|
|
@ -10,6 +10,7 @@ vcpkg_from_gitlab(
|
|||
PATCHES
|
||||
no-etc-symlinks.patch
|
||||
libgetopt.patch
|
||||
fix-mingw-gperf-fallback.patch
|
||||
)
|
||||
|
||||
vcpkg_add_to_path(PREPEND "${CURRENT_HOST_INSTALLED_DIR}/tools/gperf")
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
{
|
||||
"name": "fontconfig",
|
||||
"version": "2.14.0",
|
||||
"port-version": 2,
|
||||
"port-version": 3,
|
||||
"description": "Library for configuring and customizing font access.",
|
||||
"homepage": "https://www.freedesktop.org/wiki/Software/fontconfig",
|
||||
"license": "MIT",
|
||||
|
|
|
@ -2314,7 +2314,7 @@
|
|||
},
|
||||
"fontconfig": {
|
||||
"baseline": "2.14.0",
|
||||
"port-version": 2
|
||||
"port-version": 3
|
||||
},
|
||||
"foonathan-memory": {
|
||||
"baseline": "2019-07-21",
|
||||
|
|
|
@ -1,5 +1,10 @@
|
|||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "edebefba0511e2f8ee4018707fe611d0035c4dd4",
|
||||
"version": "2.14.0",
|
||||
"port-version": 3
|
||||
},
|
||||
{
|
||||
"git-tree": "5c02d2ba027c9f390729a7e0899e63c853450dfb",
|
||||
"version": "2.14.0",
|
||||
|
|
Загрузка…
Ссылка в новой задаче