зеркало из https://github.com/microsoft/vcpkg.git
[libhydrogen] update und fix arm64-osx build (#25355)
This commit is contained in:
Родитель
77d244f2cc
Коммит
08780359d1
|
@ -0,0 +1,25 @@
|
||||||
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||||
|
index 91e2bf1..7333479 100644
|
||||||
|
--- a/CMakeLists.txt
|
||||||
|
+++ b/CMakeLists.txt
|
||||||
|
@@ -39,11 +39,6 @@ set(arduino_files "library.properties")
|
||||||
|
|
||||||
|
# Compile options
|
||||||
|
|
||||||
|
-get_setting(target_arch STRING "Target system architecture (fed to the compiler's -march=XXX).")
|
||||||
|
-if(NOT target_arch AND NOT CMAKE_CROSSCOMPILING)
|
||||||
|
- set(target_arch native)
|
||||||
|
-endif()
|
||||||
|
-
|
||||||
|
get_setting(target_device STRING "Target device identifier (defines HYDRO_TARGET_DEVICE_XXX).")
|
||||||
|
|
||||||
|
set(compile_options
|
||||||
|
@@ -52,7 +47,7 @@ set(compile_options
|
||||||
|
# ---- Definitions ----
|
||||||
|
$<$<BOOL:${target_device}>:-DHYDRO_TARGET_DEVICE_${target_device}>
|
||||||
|
# ---- Optimizations ----
|
||||||
|
- -Os $<$<BOOL:${target_arch}>:-march=${target_arch}> -fno-exceptions
|
||||||
|
+ -Os -fno-exceptions
|
||||||
|
# ---- Warnings ----
|
||||||
|
-Wall
|
||||||
|
-Wextra
|
|
@ -3,10 +3,12 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
|
||||||
vcpkg_from_github(
|
vcpkg_from_github(
|
||||||
OUT_SOURCE_PATH SOURCE_PATH
|
OUT_SOURCE_PATH SOURCE_PATH
|
||||||
REPO jedisct1/libhydrogen
|
REPO jedisct1/libhydrogen
|
||||||
REF 01c32862f6f6e864c113efc3f0142e05ea3531fe #2021-12-02
|
REF 9f9d504bb5a97bc98ee52529726d41c027df76ad #2022-06-21
|
||||||
SHA512 016181db4573a1ab31547fbfb51e19fa09e4ee4e0e788434a7654921956a02547b55eda14ccfea98425f4f615fb90e0534c5e1010d5320c1958b65b0489a2931
|
SHA512 f4dabc0b399c8850563c8a967209db537fdf787deaef46899a5484bc89bffb31581312940549784defe4c42d057309aaabd402831a7c3a94b04a00d47a07736c
|
||||||
HEAD_REF master
|
HEAD_REF master
|
||||||
PATCHES remove-tests.patch
|
PATCHES
|
||||||
|
remove-tests.patch
|
||||||
|
no-arch.patch
|
||||||
)
|
)
|
||||||
|
|
||||||
vcpkg_cmake_configure(
|
vcpkg_cmake_configure(
|
||||||
|
|
|
@ -1,9 +1,9 @@
|
||||||
{
|
{
|
||||||
"name": "libhydrogen",
|
"name": "libhydrogen",
|
||||||
"version-date": "2021-12-02",
|
"version-date": "2022-06-21",
|
||||||
"port-version": 1,
|
|
||||||
"description": "A lightweight, secure, easy-to-use crypto library suitable for constrained environments",
|
"description": "A lightweight, secure, easy-to-use crypto library suitable for constrained environments",
|
||||||
"homepage": "https://github.com/jedisct1/libhydrogen",
|
"homepage": "https://github.com/jedisct1/libhydrogen",
|
||||||
|
"license": "ISC",
|
||||||
"dependencies": [
|
"dependencies": [
|
||||||
{
|
{
|
||||||
"name": "vcpkg-cmake",
|
"name": "vcpkg-cmake",
|
||||||
|
|
|
@ -3685,8 +3685,8 @@
|
||||||
"port-version": 2
|
"port-version": 2
|
||||||
},
|
},
|
||||||
"libhydrogen": {
|
"libhydrogen": {
|
||||||
"baseline": "2021-12-02",
|
"baseline": "2022-06-21",
|
||||||
"port-version": 1
|
"port-version": 0
|
||||||
},
|
},
|
||||||
"libical": {
|
"libical": {
|
||||||
"baseline": "3.0.11",
|
"baseline": "3.0.11",
|
||||||
|
|
|
@ -1,5 +1,10 @@
|
||||||
{
|
{
|
||||||
"versions": [
|
"versions": [
|
||||||
|
{
|
||||||
|
"git-tree": "08c53fcf5af4463927ee0880632e2e7e52c08f49",
|
||||||
|
"version-date": "2022-06-21",
|
||||||
|
"port-version": 0
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"git-tree": "609fe75a9dbacc5dc5d3765cdaa1dd045eb89a13",
|
"git-tree": "609fe75a9dbacc5dc5d3765cdaa1dd045eb89a13",
|
||||||
"version-date": "2021-12-02",
|
"version-date": "2021-12-02",
|
||||||
|
|
Загрузка…
Ссылка в новой задаче