aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorautoantwort <41973254+autoantwort@users.noreply.github.com>2021-05-21 02:59:15 +0200
committerGitHub <noreply@github.com>2021-05-20 17:59:15 -0700
commit9b5cbe4afe0c3aef46c462bc3c539125fdaab9c0 (patch)
tree01d4c27fe4780eb5d8768ff3332c88e4e1fe7b2b
parentad96e2e8ba79b0d9e3fa06459515821196165194 (diff)
downloadvcpkg-9b5cbe4afe0c3aef46c462bc3c539125fdaab9c0.tar.gz
vcpkg-9b5cbe4afe0c3aef46c462bc3c539125fdaab9c0.zip
[libb2] fix build (#17914)
* [libb2] fix build for arm -> x64 on macOS * add version files
-rw-r--r--ports/libb2/portfile.cmake4
-rw-r--r--ports/libb2/vcpkg.json4
-rw-r--r--versions/baseline.json2
-rw-r--r--versions/l-/libb2.json5
4 files changed, 11 insertions, 4 deletions
diff --git a/ports/libb2/portfile.cmake b/ports/libb2/portfile.cmake
index 992c59f4b..fe26199ce 100644
--- a/ports/libb2/portfile.cmake
+++ b/ports/libb2/portfile.cmake
@@ -16,7 +16,9 @@ endif()
vcpkg_configure_make(
AUTOCONFIG
SOURCE_PATH ${SOURCE_PATH}
- OPTIONS ${OPTIONS}
+ OPTIONS
+ ax_cv_check_cflags___O3=no # see https://github.com/microsoft/vcpkg/pull/17912#issuecomment-840514179
+ ${OPTIONS}
)
vcpkg_install_make()
vcpkg_fixup_pkgconfig()
diff --git a/ports/libb2/vcpkg.json b/ports/libb2/vcpkg.json
index dbe8dc265..6cd8bc6dc 100644
--- a/ports/libb2/vcpkg.json
+++ b/ports/libb2/vcpkg.json
@@ -1,7 +1,7 @@
{
"name": "libb2",
- "version-string": "0.98.1",
- "port-version": 4,
+ "version": "0.98.1",
+ "port-version": 5,
"description": "C library providing BLAKE2b, BLAKE2s, BLAKE2bp, BLAKE2sp",
"homepage": "https://github.com/BLAKE2/libb2",
"supports": "!windows"
diff --git a/versions/baseline.json b/versions/baseline.json
index b19db1d34..7145894ab 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -2986,7 +2986,7 @@
},
"libb2": {
"baseline": "0.98.1",
- "port-version": 4
+ "port-version": 5
},
"libbacktrace": {
"baseline": "2021-03-14",
diff --git a/versions/l-/libb2.json b/versions/l-/libb2.json
index 354351613..084a1ee4c 100644
--- a/versions/l-/libb2.json
+++ b/versions/l-/libb2.json
@@ -1,6 +1,11 @@
{
"versions": [
{
+ "git-tree": "0419d2f293a094dc4cdca1111daea2a6425a137b",
+ "version": "0.98.1",
+ "port-version": 5
+ },
+ {
"git-tree": "98925560fbceb14da7820146f6df113f9dae7988",
"version-string": "0.98.1",
"port-version": 4