Skip to content

[vcpkg baseline][libtasn1] Fix static build #18116

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nicole mazzuca (strega-nil-ms) merged 7 commits into from
May 26, 2021
Merged

[vcpkg baseline][libtasn1] Fix static build #18116

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
f7a1042
[vcpkg baseline][libtasn1] Fix static build
May 26, 2021
0e32e81
update version record
May 26, 2021
ba3828c
update baseline
May 26, 2021
3dd6ea9
change the fix way to avoid other toolchain doesn't use VCPKG_X_FLAGS
May 26, 2021
29d401a
Update versions/l-/libtasn1.json
JackBoosY May 26, 2021
552d138
Update ports/libtasn1/portfile.cmake
JackBoosY May 26, 2021
8df6b97
Update versions/l-/libtasn1.json
JackBoosY May 26, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions ports/libtasn1/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,11 @@ 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)
Comment thread
JackBoosY marked this conversation as resolved.
Outdated
Comment thread
JackBoosY marked this conversation as resolved.
Outdated
set(EXTRA_OPTS "${EXTRA_OPTS} CFLAGS=\"$CFLAGS -DASN1_STATIC\"")
endif()

set(ENV{GTKDOCIZE} true)
vcpkg_configure_make(
AUTOCONFIG
Expand Down
1 change: 1 addition & 0 deletions ports/libtasn1/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
1 change: 0 additions & 1 deletion scripts/ci.baseline.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion versions/baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3558,7 +3558,7 @@
},
"libtasn1": {
"baseline": "4.17.0",
"port-version": 0
"port-version": 1
},
"libtcod": {
"baseline": "1.18.0",
Expand Down
5 changes: 5 additions & 0 deletions versions/l-/libtasn1.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "4969c8ddb39ae78f59999f2e94e6f0c8d8e81aaa",
Comment thread
PhoebeHui marked this conversation as resolved.
Outdated
"version": "4.17.0",
"port-version": 1
},
{
"git-tree": "63ad8395545c61a38b7564108d2c1c4b7a6bbf12",
"version": "4.17.0",
Expand Down