From 2ed5383f7b88b23975f9cfd325f6451fd8716fb2 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Fri, 1 Oct 2021 08:58:36 +0200 Subject: [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 --- ports/libtasn1/portfile.cmake | 9 ++++----- ports/libtasn1/vcpkg.json | 6 +++--- ports/python3/portfile.cmake | 2 +- ports/python3/vcpkg.json | 2 +- ports/starlink-ast/portfile.cmake | 16 +++++++++------- ports/starlink-ast/vcpkg.json | 2 +- 6 files changed, 19 insertions(+), 18 deletions(-) (limited to 'ports') 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" } ] } diff --git a/ports/python3/portfile.cmake b/ports/python3/portfile.cmake index 2ea878377..8967d5a3d 100644 --- a/ports/python3/portfile.cmake +++ b/ports/python3/portfile.cmake @@ -162,7 +162,7 @@ else() set(OPTIONS "--with-openssl=${CURRENT_INSTALLED_DIR}" "--with-ensurepip" - [[--with-suffix=""]] + "--with-suffix=" "--with-system-expat" ) if(VCPKG_TARGET_IS_OSX) diff --git a/ports/python3/vcpkg.json b/ports/python3/vcpkg.json index 63740b289..c3bec2e6b 100644 --- a/ports/python3/vcpkg.json +++ b/ports/python3/vcpkg.json @@ -1,7 +1,7 @@ { "name": "python3", "version-semver": "3.9.7", - "port-version": 1, + "port-version": 2, "description": "The Python programming language", "homepage": "https://github.com/python/cpython", "supports": "!(arm | uwp)", diff --git a/ports/starlink-ast/portfile.cmake b/ports/starlink-ast/portfile.cmake index 054da2900..92475ad55 100644 --- a/ports/starlink-ast/portfile.cmake +++ b/ports/starlink-ast/portfile.cmake @@ -11,18 +11,22 @@ vcpkg_extract_source_archive_ex( ARCHIVE ${ARCHIVE} ) -set(CONFIGURE_OPTIONS "--without-fortran star_cv_cnf_trail_type=long star_cv_cnf_f2c_compatible=no") +set(CONFIGURE_OPTIONS + --without-fortran + star_cv_cnf_trail_type=long + star_cv_cnf_f2c_compatible=no +) if ("yaml" IN_LIST FEATURES) - set(CONFIGURE_OPTIONS "${CONFIGURE_OPTIONS} --with-yaml") + list(APPEND CONFIGURE_OPTIONS --with-yaml) else() - set(CONFIGURE_OPTIONS "${CONFIGURE_OPTIONS} --without-yaml") + list(APPEND CONFIGURE_OPTIONS --without-yaml) endif() if ("pthreads" IN_LIST FEATURES) - set(CONFIGURE_OPTIONS "${CONFIGURE_OPTIONS} --with-pthreads") + list(APPEND CONFIGURE_OPTIONS --with-pthreads) else() - set(CONFIGURE_OPTIONS "${CONFIGURE_OPTIONS} --without-pthreads") + list(APPEND CONFIGURE_OPTIONS --without-pthreads) endif() vcpkg_configure_make( @@ -31,8 +35,6 @@ vcpkg_configure_make( DETERMINE_BUILD_TRIPLET ADDITIONAL_MSYS_PACKAGES perl OPTIONS ${CONFIGURE_OPTIONS} - OPTIONS_RELEASE ${CONFIGURE_OPTIONS_RELEASE} - OPTIONS_DEBUG ${CONFIGURE_OPTIONS_DEBUG} ) vcpkg_install_make() diff --git a/ports/starlink-ast/vcpkg.json b/ports/starlink-ast/vcpkg.json index 3248e2659..5c3753df6 100644 --- a/ports/starlink-ast/vcpkg.json +++ b/ports/starlink-ast/vcpkg.json @@ -1,7 +1,7 @@ { "name": "starlink-ast", "version-semver": "9.2.4", - "port-version": 1, + "port-version": 2, "description": "The AST library provides a comprehensive range of facilities for attaching world coordinate systems to astronomical data, for retrieving and interpreting that information and for generating graphical output based on it", "homepage": "https://starlink.eao.hawaii.edu/starlink/AST", "supports": "windows", -- cgit v1.2.3