mirror of
https://github.com/microsoft/vcpkg.git
synced 2025-01-19 05:53:03 +08:00
[zeroc-ice] fix arm64-osx build (#30519)
Co-authored-by: Cheney-Wang <850426846@qq.com>
This commit is contained in:
parent
effb026d8d
commit
df1fcfb1a6
13
ports/zeroc-ice/no-werror.patch
Normal file
13
ports/zeroc-ice/no-werror.patch
Normal file
@ -0,0 +1,13 @@
|
||||
diff --git a/config/Make.rules.Darwin b/config/Make.rules.Darwin
|
||||
index e978836..2276b5d 100644
|
||||
--- a/config/Make.rules.Darwin
|
||||
+++ b/config/Make.rules.Darwin
|
||||
@@ -35,7 +35,7 @@ endif
|
||||
shared_cppflags = $(if $(filter-out program,$($1_target)),-fPIC) -fvisibility=hidden
|
||||
|
||||
cppflags = -Wall -Wextra -Wshadow -Wshadow-all -Wredundant-decls -Wno-shadow-field \
|
||||
- -Wdeprecated -Wstrict-prototypes -Werror -Wconversion -Wdocumentation -pthread \
|
||||
+ -Wdeprecated -Wstrict-prototypes -Wconversion -Wdocumentation -pthread \
|
||||
$(if $(filter yes,$(OPTIMIZE)),-O2 -DNDEBUG,-g)
|
||||
|
||||
ifeq ($(MAXWARN),yes)
|
@ -4,7 +4,7 @@ vcpkg_from_github(
|
||||
REPO zeroc-ice/ice
|
||||
REF v3.7.7
|
||||
SHA512 73c3a2bb14c9e145383e4026206edd3e03b29c60a33af628611bfdab71d69a3aed108ce4e6cbfd67eb852560110e3495b4bd238c8cdf0de9d1f8e2f1088513ee
|
||||
PATCHES md5i_fix.patch slice2swift.patch mcppd_fix.patch
|
||||
PATCHES md5i_fix.patch slice2swift.patch mcppd_fix.patch no-werror.patch
|
||||
)
|
||||
|
||||
set(RELEASE_TRIPLET ${TARGET_TRIPLET}-rel)
|
||||
|
@ -1,7 +1,7 @@
|
||||
{
|
||||
"name": "zeroc-ice",
|
||||
"version": "3.7.7",
|
||||
"port-version": 3,
|
||||
"port-version": 4,
|
||||
"maintainers": "Benjamin Oldenburg <benjamin.oldenburg@ordis.co.th>",
|
||||
"description": "Comprehensive RPC framework with support for C++, CSharp, Java, JavaScript, Python and more.",
|
||||
"homepage": "https://github.com/zeroc-ice/ice",
|
||||
|
@ -1094,10 +1094,6 @@ dimcli:x64-windows-static=fail
|
||||
zeroc-ice:x86-windows=fail
|
||||
zeroc-ice:x64-windows=fail
|
||||
zeroc-ice:x64-windows-static-md=fail
|
||||
# ZeroC doesn't provide ARM tagets in project files.
|
||||
zeroc-ice:arm64-windows=fail
|
||||
zeroc-ice:arm-uwp=fail
|
||||
zeroc-ice:x64-uwp=fail
|
||||
|
||||
# Ports which needs to pass in CI
|
||||
cmake:x64-windows=pass
|
||||
|
@ -8694,7 +8694,7 @@
|
||||
},
|
||||
"zeroc-ice": {
|
||||
"baseline": "3.7.7",
|
||||
"port-version": 3
|
||||
"port-version": 4
|
||||
},
|
||||
"zeromq": {
|
||||
"baseline": "2023-01-31",
|
||||
|
@ -1,5 +1,10 @@
|
||||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "2ec016c70ea82b2ddb340c6c809aece865c7c2ce",
|
||||
"version": "3.7.7",
|
||||
"port-version": 4
|
||||
},
|
||||
{
|
||||
"git-tree": "e57483820c975a5418fcd98645c7d1315dd8bced",
|
||||
"version": "3.7.7",
|
||||
|
Loading…
Reference in New Issue
Block a user