diff options
| author | Kai Pastor <dg0yt@darc.de> | 2021-08-07 16:48:44 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-07 07:48:44 -0700 |
| commit | 57bd7102d9fd880daa1b0958692294c4a125f6d8 (patch) | |
| tree | bae9dae3c6c2bd2540faeb2e8512280c3a6b9918 /ports | |
| parent | 5742e878fc71b4fcb9c019b50f1f887f22db58df (diff) | |
| download | vcpkg-57bd7102d9fd880daa1b0958692294c4a125f6d8.tar.gz vcpkg-57bd7102d9fd880daa1b0958692294c4a125f6d8.zip | |
[vcpkg baseline][vcpkg_configure_make] Pass make tool to `vcpkg_build_make` (#19361)
* Pass 'make' between vcpkg scripts
* Restore original BSD gmake lookup
* [starlink-ast] Add ADDITIONAL_MSYS_PACKAGES to vcpkg_configure_make
* [starlink-ast] x-add-version
Co-authored-by: JackBoosY <yuzaiyang@beyondsoft.com>
Diffstat (limited to 'ports')
| -rw-r--r-- | ports/starlink-ast/portfile.cmake | 2 | ||||
| -rw-r--r-- | ports/starlink-ast/vcpkg.json | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/ports/starlink-ast/portfile.cmake b/ports/starlink-ast/portfile.cmake index b49c13320..054da2900 100644 --- a/ports/starlink-ast/portfile.cmake +++ b/ports/starlink-ast/portfile.cmake @@ -25,11 +25,11 @@ else() set(CONFIGURE_OPTIONS "${CONFIGURE_OPTIONS} --without-pthreads")
endif()
-vcpkg_acquire_msys(MSYS_ROOT PACKAGES make automake1.16 perl)
vcpkg_configure_make(
SOURCE_PATH "${SOURCE_PATH}"
USE_WRAPPERS
DETERMINE_BUILD_TRIPLET
+ ADDITIONAL_MSYS_PACKAGES perl
OPTIONS ${CONFIGURE_OPTIONS}
OPTIONS_RELEASE ${CONFIGURE_OPTIONS_RELEASE}
OPTIONS_DEBUG ${CONFIGURE_OPTIONS_DEBUG}
diff --git a/ports/starlink-ast/vcpkg.json b/ports/starlink-ast/vcpkg.json index 8bbc2238c..3248e2659 100644 --- a/ports/starlink-ast/vcpkg.json +++ b/ports/starlink-ast/vcpkg.json @@ -1,6 +1,7 @@ { "name": "starlink-ast", "version-semver": "9.2.4", + "port-version": 1, "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", |