mirror of
https://github.com/microsoft/vcpkg.git
synced 2025-01-18 10:03:02 +08:00
[vcpkg-baseline] Fixes for vtk, libarchive, xalan-c, and openvpn3 on Linux (#9411)
* [libarchive] Fix cpu_set_t missing * [xalan-c] Fix flakiness in presense of ICU * [openvpn3] Add missing bits/endian.h include * [vcpkg-baseline] Mark vtk as no longer failing
This commit is contained in:
parent
37265f7a45
commit
59b28867dc
@ -1,5 +1,5 @@
|
||||
Source: libarchive
|
||||
Version: 3.4.0-1
|
||||
Version: 3.4.0-2
|
||||
Homepage: https://github.com/libarchive/libarchive
|
||||
Description: Library for reading and writing streaming archives
|
||||
Build-Depends: zlib
|
||||
|
15
ports/libarchive/fix-cpu-set.patch
Normal file
15
ports/libarchive/fix-cpu-set.patch
Normal file
@ -0,0 +1,15 @@
|
||||
diff --git a/libarchive/archive_random.c b/libarchive/archive_random.c
|
||||
index 65ea691..63217ec 100644
|
||||
--- a/libarchive/archive_random.c
|
||||
+++ b/libarchive/archive_random.c
|
||||
@@ -48,6 +48,10 @@ __FBSDID("$FreeBSD$");
|
||||
#include <sys/time.h>
|
||||
#endif
|
||||
#ifdef HAVE_PTHREAD_H
|
||||
+#ifdef __GNUC__
|
||||
+#define _GNU_SOURCE
|
||||
+#include <sched.h>
|
||||
+#endif
|
||||
#include <pthread.h>
|
||||
#endif
|
||||
|
@ -15,6 +15,7 @@ vcpkg_from_github(
|
||||
fix-dependencies.patch
|
||||
fix-lz4.patch
|
||||
fix-zstd.patch
|
||||
fix-cpu-set.patch
|
||||
)
|
||||
|
||||
set(BUILD_libarchive_bzip2 OFF)
|
||||
|
@ -1,4 +1,4 @@
|
||||
cmake_minimum_required(VERSION 3.0)
|
||||
cmake_minimum_required(VERSION 3.5)
|
||||
project(openvpncli CXX)
|
||||
|
||||
find_path(ASIO_HPP asio.hpp)
|
||||
@ -13,6 +13,9 @@ if(WIN32)
|
||||
endif()
|
||||
|
||||
add_definitions(-DNOMINMAX -DUSE_ASIO -DUSE_MBEDTLS -D_WIN32_WINNT=0x0600)
|
||||
if(LINUX)
|
||||
add_compile_options(-include bits/endian.h)
|
||||
endif()
|
||||
|
||||
add_library(ovpncli client/ovpncli.cpp)
|
||||
target_link_libraries(ovpncli PRIVATE Iphlpapi.lib Wininet.lib Setupapi.lib Cfgmgr32.lib Rpcrt4.lib Fwpuclnt.lib Wtsapi32.lib ${MBEDTLS_LIB} ${MBEDCRYPTO_LIB} ${MBEDX509_LIB})
|
||||
|
@ -1,4 +1,4 @@
|
||||
Source: openvpn3
|
||||
Version: 3.4.1
|
||||
Version: 3.4.1-1
|
||||
Build-Depends: asio, tap-windows6 (windows), mbedtls
|
||||
Description: a C++ class library that implements the functionality of an OpenVPN client, and is protocol-compatible with the OpenVPN 2.x branch.
|
||||
|
@ -1,5 +1,5 @@
|
||||
Source: xalan-c
|
||||
Version: 1.11-10
|
||||
Version: 1.11-11
|
||||
Homepage: https://github.com/apache/xalan-c
|
||||
Description: Xalan is an XSLT processor for transforming XML documents into HTML, text, or other XML document types
|
||||
Build-Depends: xerces-c
|
||||
|
@ -14,6 +14,7 @@ vcpkg_from_github(
|
||||
vcpkg_configure_cmake(
|
||||
SOURCE_PATH ${SOURCE_PATH}
|
||||
PREFER_NINJA
|
||||
OPTIONS -DCMAKE_DISABLE_FIND_PACKAGE_ICU=ON
|
||||
)
|
||||
|
||||
vcpkg_install_cmake()
|
||||
|
@ -1704,7 +1704,6 @@ vlpp:arm64-windows=fail
|
||||
vlpp:arm-uwp=fail
|
||||
vlpp:x64-osx=fail
|
||||
vlpp:x64-uwp=fail
|
||||
vtk:x64-linux=fail
|
||||
vulkan:arm64-windows=fail
|
||||
vulkan:arm-uwp=fail
|
||||
vulkan:x64-linux=fail
|
||||
|
Loading…
Reference in New Issue
Block a user