[upb] Fix uwp build (#10005)

* [upb] Fix uwp build * update baseline
2025-02-22 10:37:10 +01:00 · 2020-03-11 00:31:38 +08:00 · 2020-03-11 00:31:38 +08:00 · 7893f7c76c
commit 7893f7c76c
parent 8fe412611c
4 changed files with 19 additions and 4 deletions
--- a/ports/upb/CONTROL
+++ b/ports/upb/CONTROL
@ -1,4 +1,4 @@
 Source: upb
-Version: 2019-10-21-1
+Version: 2019-10-21-2
 Homepage: https://github.com/protocolbuffers/upb/
 Description: μpb (often written 'upb') is a small protobuf implementation written in C.
--- a/ports/upb/fix-uwp.patch
+++ b/ports/upb/fix-uwp.patch
@ -0,0 +1,15 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 577000a..759e35b 100644
+--- a/CMakeLists.txt
+++ b/CMakeLists.txt
+@@ -58,6 +58,10 @@ elseif(UNIX)
+   set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--build-id")
+ endif()
+ 
+if (MSVC)
+  add_compile_options(/wd4146 -D_CRT_SECURE_NO_WARNINGS)
+endif()
+
+ enable_testing()
+ add_library(descriptor_upbproto INTERFACE)
+ add_library(upb
--- a/ports/upb/portfile.cmake
+++ b/ports/upb/portfile.cmake
@ -6,7 +6,9 @@ vcpkg_from_github(
    REF  9effcbcb27f0a665f9f345030188c0b291e32482
    SHA512 416ff26ec21181d53be23e94203205072152ab3a8e4b3b28d16263a601995fd2d2f8afe5d8cfbecdac8543249482287b9fe6129314f7c9a7880660f5508bb85e
    HEAD_REF master
-    PATCHES add-cmake-install.patch
+    PATCHES
+        add-cmake-install.patch
+        fix-uwp.patch
 )

 vcpkg_configure_cmake(
--- a/scripts/ci.baseline.txt
+++ b/scripts/ci.baseline.txt
@ -1784,8 +1784,6 @@ unrar:x64-linux=fail
 unrar:x64-osx=fail
 unrar:x64-uwp=fail
 unrar:x64-windows-static=fail
-upb:arm-uwp=fail
-upb:x64-uwp=fail
 urdfdom:x64-windows-static=fail
 usd:x64-linux=ignore
 usd:x86-windows=fail