mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-27 10:21:07 +08:00
[harfbuzz] Fix mingw (#24206)
* Fix mingw build * Update versions * fix license Co-authored-by: nicole mazzuca <mazzucan@outlook.com>
This commit is contained in:
parent
239bf76101
commit
0495716066
17
ports/harfbuzz/fix-mingw-build.patch
Normal file
17
ports/harfbuzz/fix-mingw-build.patch
Normal file
@ -0,0 +1,17 @@
|
||||
diff --git a/meson.build b/meson.build
|
||||
index 41344b3a33..8fb68f296a 100644
|
||||
--- a/meson.build
|
||||
+++ b/meson.build
|
||||
@@ -57,6 +57,12 @@ if host_machine.cpu_family() == 'arm' and cpp.alignment('struct { char c; }') !=
|
||||
endif
|
||||
endif
|
||||
|
||||
+if host_machine.system() == 'windows'
|
||||
+ add_project_arguments(cpp.get_supported_arguments([
|
||||
+ '-Wa,-mbig-obj'
|
||||
+ ]), language : 'cpp')
|
||||
+endif
|
||||
+
|
||||
check_headers = [
|
||||
['unistd.h'],
|
||||
['sys/mman.h'],
|
@ -12,6 +12,7 @@ vcpkg_from_github(
|
||||
0001-circumvent-samefile-error.patch
|
||||
0002-fix-uwp-build.patch
|
||||
fix-macos-build.diff # fixes https://github.com/harfbuzz/harfbuzz/issues/3484
|
||||
fix-mingw-build.patch # https://github.com/harfbuzz/harfbuzz/pull/3385
|
||||
)
|
||||
|
||||
if("icu" IN_LIST FEATURES)
|
||||
|
@ -1,9 +1,10 @@
|
||||
{
|
||||
"name": "harfbuzz",
|
||||
"version-semver": "3.2.0",
|
||||
"port-version": 2,
|
||||
"port-version": 3,
|
||||
"description": "HarfBuzz OpenType text shaping engine",
|
||||
"homepage": "https://github.com/harfbuzz/harfbuzz",
|
||||
"license": "MIT-Modern-Variant",
|
||||
"dependencies": [
|
||||
{
|
||||
"name": "freetype",
|
||||
|
@ -2722,7 +2722,7 @@
|
||||
},
|
||||
"harfbuzz": {
|
||||
"baseline": "3.2.0",
|
||||
"port-version": 2
|
||||
"port-version": 3
|
||||
},
|
||||
"hayai": {
|
||||
"baseline": "2019-08-10",
|
||||
|
@ -1,5 +1,10 @@
|
||||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "1c4a2589742ad6156667771b0cf38ecb46e8c797",
|
||||
"version-semver": "3.2.0",
|
||||
"port-version": 3
|
||||
},
|
||||
{
|
||||
"git-tree": "fb0fcb23cc704f5a2bca6fc631622309876ab271",
|
||||
"version-semver": "3.2.0",
|
||||
|
Loading…
x
Reference in New Issue
Block a user