diff options
| author | Kai Pastor <dg0yt@darc.de> | 2021-10-01 08:58:36 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-30 23:58:36 -0700 |
| commit | 2ed5383f7b88b23975f9cfd325f6451fd8716fb2 (patch) | |
| tree | e35a8fd32812c05c3e35c513fcfa8610d7447707 /ports/libtasn1 | |
| parent | 41874992952fffd37c60583391802e29b6f14d86 (diff) | |
| download | vcpkg-2ed5383f7b88b23975f9cfd325f6451fd8716fb2.tar.gz vcpkg-2ed5383f7b88b23975f9cfd325f6451fd8716fb2.zip | |
[vcpkg_configure_make] Standardize `OPTIONS` list item handling (#19540)
* Remove unused EXTRA_QUOTES
* Uniformly invoke 'configure'
* [libtasn1] Fix mingw build
* Unify prefix handling
* Revise install dir processing
* x-add-version
* Force libdir to lib (adopted from #19666)
* [skip actions] CI rebuild
* CR request: Put backslash before shell var
* CR request: Use vcpkg_list
* Update versions
* Fix python3 options
* Update versions
* Bump python port-version.
* CR request: Add comment about backslashes before prefix
Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
Diffstat (limited to 'ports/libtasn1')
| -rw-r--r-- | ports/libtasn1/portfile.cmake | 9 | ||||
| -rw-r--r-- | ports/libtasn1/vcpkg.json | 6 |
2 files changed, 7 insertions, 8 deletions
diff --git a/ports/libtasn1/portfile.cmake b/ports/libtasn1/portfile.cmake index 700bb977e..902dff196 100644 --- a/ports/libtasn1/portfile.cmake +++ b/ports/libtasn1/portfile.cmake @@ -18,21 +18,20 @@ vcpkg_extract_source_archive_ex( ${PATCHES}
)
-if(VCPKG_TARGET_IS_WINDOWS OR VCPKG_TARGET_IS_MINGW)
+set(EXTRA_OPTS "")
+if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW)
# $LIBS is an environment variable that vcpkg already pre-populated with some libraries.
# We need to re-purpose it when passing LIBS option to make to avoid overriding the vcpkg's own list.
- set(EXTRA_OPTS "LIBS=\"$LIBS -lgettimeofday -lgetopt\"")
+ list(APPEND EXTRA_OPTS "LIBS=-lgettimeofday -lgetopt \$LIBS")
else()
# restore the default ac_cv_prog_cc_g flags, otherwise it fails to compile
- set(EXTRA_OPTS)
set(VCPKG_C_FLAGS "-g -O2")
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\"")
+ list(APPEND EXTRA_OPTS "CFLAGS=\$CFLAGS -DASN1_STATIC")
endif()
set(ENV{GTKDOCIZE} true)
diff --git a/ports/libtasn1/vcpkg.json b/ports/libtasn1/vcpkg.json index e61d35e03..fd021c21c 100644 --- a/ports/libtasn1/vcpkg.json +++ b/ports/libtasn1/vcpkg.json @@ -1,18 +1,18 @@ { "name": "libtasn1", "version": "4.17.0", - "port-version": 1, + "port-version": 3, "description": "A secure communications library implementing the SSL, TLS and DTLS protocols", "homepage": "https://www.gnutls.org/", "supports": "!uwp", "dependencies": [ { "name": "getopt", - "platform": "windows" + "platform": "windows & !mingw" }, { "name": "gettimeofday", - "platform": "windows" + "platform": "windows & !mingw" } ] } |