[fontconfig] fix preprocessor for clang-cl (#26052)

* fix fontconfig for clang-cl

* v db
This commit is contained in:
Alexander Neumann 2022-08-01 22:39:44 +02:00 committed by GitHub
parent c9ab969f8e
commit 55209aae66
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 21 additions and 2 deletions

View File

@ -0,0 +1,13 @@
diff --git a/src/meson.build b/src/meson.build
index 9a6ba2021..5d04f7360 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -33,7 +33,7 @@ fc_sources = [
cpp = cc.cmd_array()
if cc.get_id() == 'gcc'
cpp += ['-E', '-P']
-elif cc.get_id() == 'msvc'
+elif cc.get_argument_syntax() == 'msvc'
cpp += ['/EP']
elif cc.get_id() == 'clang'
cpp += ['-E', '-P']

View File

@ -11,6 +11,7 @@ vcpkg_from_gitlab(
no-etc-symlinks.patch
libgetopt.patch
fix-mingw-gperf-fallback.patch
fix-preprocessor-clang-cl.patch
)
vcpkg_add_to_path(PREPEND "${CURRENT_HOST_INSTALLED_DIR}/tools/gperf")

View File

@ -1,7 +1,7 @@
{
"name": "fontconfig",
"version": "2.14.0",
"port-version": 3,
"port-version": 4,
"description": "Library for configuring and customizing font access.",
"homepage": "https://www.freedesktop.org/wiki/Software/fontconfig",
"license": "MIT",

View File

@ -2338,7 +2338,7 @@
},
"fontconfig": {
"baseline": "2.14.0",
"port-version": 3
"port-version": 4
},
"foonathan-memory": {
"baseline": "2019-07-21",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "51b89b5deffdfb0ca92218871623ab22738d2178",
"version": "2.14.0",
"port-version": 4
},
{
"git-tree": "edebefba0511e2f8ee4018707fe611d0035c4dd4",
"version": "2.14.0",