mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-27 18:31:15 +08:00
[harfbuzz] Fix build error (#34346)
This commit is contained in:
parent
4c84b3649d
commit
d15a15bc94
26
ports/harfbuzz/fix-win32-build.patch
Normal file
26
ports/harfbuzz/fix-win32-build.patch
Normal file
@ -0,0 +1,26 @@
|
|||||||
|
diff --git a/src/meson.build b/src/meson.build
|
||||||
|
index 87e8962..bdfa797 100644
|
||||||
|
--- a/src/meson.build
|
||||||
|
+++ b/src/meson.build
|
||||||
|
@@ -387,6 +387,11 @@ hb_subset_sources = files(
|
||||||
|
'hb-subset.hh',
|
||||||
|
)
|
||||||
|
|
||||||
|
+extra_hb_cpp_args = []
|
||||||
|
+if cpp.get_argument_syntax() == 'msvc'
|
||||||
|
+ extra_hb_cpp_args += ['/bigobj']
|
||||||
|
+endif
|
||||||
|
+
|
||||||
|
hb_subset_headers = files(
|
||||||
|
'hb-subset.h',
|
||||||
|
'hb-subset-repacker.h'
|
||||||
|
@@ -559,8 +564,7 @@ defs_list = [harfbuzz_def]
|
||||||
|
|
||||||
|
version = '0.@0@.0'.format(hb_version_int)
|
||||||
|
|
||||||
|
-extra_hb_cpp_args = []
|
||||||
|
-if cpp.get_define('_MSC_FULL_VER') != ''
|
||||||
|
+if cpp.get_argument_syntax() == 'msvc'
|
||||||
|
if get_option('default_library') != 'static'
|
||||||
|
extra_hb_cpp_args += '-DHB_DLL_EXPORT'
|
||||||
|
endif
|
@ -4,6 +4,8 @@ vcpkg_from_github(
|
|||||||
REF ${VERSION}
|
REF ${VERSION}
|
||||||
SHA512 23d6abbd270885d7ae1ebb3c981f0c331a48d891e23caffe9e254f5e7e205bb0348add7b371526166a49b336f8076f92c11ef76ca81f48a6fd9f58812ec96d79
|
SHA512 23d6abbd270885d7ae1ebb3c981f0c331a48d891e23caffe9e254f5e7e205bb0348add7b371526166a49b336f8076f92c11ef76ca81f48a6fd9f58812ec96d79
|
||||||
HEAD_REF master
|
HEAD_REF master
|
||||||
|
PATCHES
|
||||||
|
fix-win32-build.patch
|
||||||
)
|
)
|
||||||
|
|
||||||
if("icu" IN_LIST FEATURES)
|
if("icu" IN_LIST FEATURES)
|
||||||
|
@ -1,6 +1,7 @@
|
|||||||
{
|
{
|
||||||
"name": "harfbuzz",
|
"name": "harfbuzz",
|
||||||
"version": "8.2.1",
|
"version": "8.2.1",
|
||||||
|
"port-version": 1,
|
||||||
"description": "HarfBuzz OpenType text shaping engine",
|
"description": "HarfBuzz OpenType text shaping engine",
|
||||||
"homepage": "https://github.com/harfbuzz/harfbuzz",
|
"homepage": "https://github.com/harfbuzz/harfbuzz",
|
||||||
"license": "MIT-Modern-Variant",
|
"license": "MIT-Modern-Variant",
|
||||||
|
@ -3190,7 +3190,7 @@
|
|||||||
},
|
},
|
||||||
"harfbuzz": {
|
"harfbuzz": {
|
||||||
"baseline": "8.2.1",
|
"baseline": "8.2.1",
|
||||||
"port-version": 0
|
"port-version": 1
|
||||||
},
|
},
|
||||||
"hash-library": {
|
"hash-library": {
|
||||||
"baseline": "8",
|
"baseline": "8",
|
||||||
|
@ -1,5 +1,10 @@
|
|||||||
{
|
{
|
||||||
"versions": [
|
"versions": [
|
||||||
|
{
|
||||||
|
"git-tree": "1f39a3081e7055cbf5e8cc27b5f91fef2a274415",
|
||||||
|
"version": "8.2.1",
|
||||||
|
"port-version": 1
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"git-tree": "6894af0b171aea403718ebb131b454a60b0c961a",
|
"git-tree": "6894af0b171aea403718ebb131b454a60b0c961a",
|
||||||
"version": "8.2.1",
|
"version": "8.2.1",
|
||||||
|
Loading…
x
Reference in New Issue
Block a user