mirror of
https://github.com/microsoft/vcpkg.git
synced 2025-06-07 16:52:53 +08:00
[fontconfig] fix preprocessor for clang-cl (#26052)
* fix fontconfig for clang-cl * v db
This commit is contained in:
parent
c9ab969f8e
commit
55209aae66
13
ports/fontconfig/fix-preprocessor-clang-cl.patch
Normal file
13
ports/fontconfig/fix-preprocessor-clang-cl.patch
Normal 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']
|
@ -11,6 +11,7 @@ vcpkg_from_gitlab(
|
|||||||
no-etc-symlinks.patch
|
no-etc-symlinks.patch
|
||||||
libgetopt.patch
|
libgetopt.patch
|
||||||
fix-mingw-gperf-fallback.patch
|
fix-mingw-gperf-fallback.patch
|
||||||
|
fix-preprocessor-clang-cl.patch
|
||||||
)
|
)
|
||||||
|
|
||||||
vcpkg_add_to_path(PREPEND "${CURRENT_HOST_INSTALLED_DIR}/tools/gperf")
|
vcpkg_add_to_path(PREPEND "${CURRENT_HOST_INSTALLED_DIR}/tools/gperf")
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"name": "fontconfig",
|
"name": "fontconfig",
|
||||||
"version": "2.14.0",
|
"version": "2.14.0",
|
||||||
"port-version": 3,
|
"port-version": 4,
|
||||||
"description": "Library for configuring and customizing font access.",
|
"description": "Library for configuring and customizing font access.",
|
||||||
"homepage": "https://www.freedesktop.org/wiki/Software/fontconfig",
|
"homepage": "https://www.freedesktop.org/wiki/Software/fontconfig",
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
|
@ -2338,7 +2338,7 @@
|
|||||||
},
|
},
|
||||||
"fontconfig": {
|
"fontconfig": {
|
||||||
"baseline": "2.14.0",
|
"baseline": "2.14.0",
|
||||||
"port-version": 3
|
"port-version": 4
|
||||||
},
|
},
|
||||||
"foonathan-memory": {
|
"foonathan-memory": {
|
||||||
"baseline": "2019-07-21",
|
"baseline": "2019-07-21",
|
||||||
|
@ -1,5 +1,10 @@
|
|||||||
{
|
{
|
||||||
"versions": [
|
"versions": [
|
||||||
|
{
|
||||||
|
"git-tree": "51b89b5deffdfb0ca92218871623ab22738d2178",
|
||||||
|
"version": "2.14.0",
|
||||||
|
"port-version": 4
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"git-tree": "edebefba0511e2f8ee4018707fe611d0035c4dd4",
|
"git-tree": "edebefba0511e2f8ee4018707fe611d0035c4dd4",
|
||||||
"version": "2.14.0",
|
"version": "2.14.0",
|
||||||
|
Loading…
Reference in New Issue
Block a user