diff options
| -rw-r--r-- | ports/libtasn1/portfile.cmake | 6 | ||||
| -rw-r--r-- | ports/libtasn1/vcpkg.json | 1 | ||||
| -rw-r--r-- | scripts/ci.baseline.txt | 1 | ||||
| -rw-r--r-- | versions/baseline.json | 2 | ||||
| -rw-r--r-- | versions/l-/libtasn1.json | 5 |
5 files changed, 13 insertions, 2 deletions
diff --git a/ports/libtasn1/portfile.cmake b/ports/libtasn1/portfile.cmake index 80ca7d2b8..700bb977e 100644 --- a/ports/libtasn1/portfile.cmake +++ b/ports/libtasn1/portfile.cmake @@ -29,6 +29,12 @@ else() set(VCPKG_CXX_FLAGS "-g -O2")
endif()
+# The upstream doesn't add this macro to the configure
+if (VCPKG_TARGET_IS_WINDOWS AND VCPKG_LIBRARY_LINKAGE STREQUAL "static")
+
+ set(EXTRA_OPTS "${EXTRA_OPTS} CFLAGS=\"$CFLAGS -DASN1_STATIC\"")
+endif()
+
set(ENV{GTKDOCIZE} true)
vcpkg_configure_make(
AUTOCONFIG
diff --git a/ports/libtasn1/vcpkg.json b/ports/libtasn1/vcpkg.json index f5490dc89..e61d35e03 100644 --- a/ports/libtasn1/vcpkg.json +++ b/ports/libtasn1/vcpkg.json @@ -1,6 +1,7 @@ { "name": "libtasn1", "version": "4.17.0", + "port-version": 1, "description": "A secure communications library implementing the SSL, TLS and DTLS protocols", "homepage": "https://www.gnutls.org/", "supports": "!uwp", diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index efd858e7f..27000bc03 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -761,7 +761,6 @@ libssh:arm-uwp=fail libssh:x64-uwp=fail libstk:arm-uwp=fail libstk:x64-uwp=fail -libtasn1:x64-windows-static-md=fail libtins:arm-uwp=fail libtins:x64-uwp=fail libtomcrypt:arm64-windows=fail diff --git a/versions/baseline.json b/versions/baseline.json index 701edb7e7..5613c49bf 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3558,7 +3558,7 @@ }, "libtasn1": { "baseline": "4.17.0", - "port-version": 0 + "port-version": 1 }, "libtcod": { "baseline": "1.18.0", diff --git a/versions/l-/libtasn1.json b/versions/l-/libtasn1.json index 462949cc4..5960a6674 100644 --- a/versions/l-/libtasn1.json +++ b/versions/l-/libtasn1.json @@ -1,6 +1,11 @@ { "versions": [ { + "git-tree": "3554f6c03cdac32ddf68540d62c04f6f4644ec94", + "version": "4.17.0", + "port-version": 1 + }, + { "git-tree": "63ad8395545c61a38b7564108d2c1c4b7a6bbf12", "version": "4.17.0", "port-version": 0 |