diff options
| -rw-r--r-- | ports/starlink-ast/portfile.cmake | 2 | ||||
| -rw-r--r-- | ports/starlink-ast/vcpkg.json | 1 | ||||
| -rwxr-xr-x | scripts/cmake/vcpkg_build_make.cmake | 17 | ||||
| -rw-r--r-- | scripts/cmake/vcpkg_configure_make.cmake | 9 | ||||
| -rw-r--r-- | versions/baseline.json | 2 | ||||
| -rw-r--r-- | versions/s-/starlink-ast.json | 5 |
6 files changed, 25 insertions, 11 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", diff --git a/scripts/cmake/vcpkg_build_make.cmake b/scripts/cmake/vcpkg_build_make.cmake index 30b073c50..18f857fce 100755 --- a/scripts/cmake/vcpkg_build_make.cmake +++ b/scripts/cmake/vcpkg_build_make.cmake @@ -81,15 +81,16 @@ function(vcpkg_build_make) string(REPLACE " " "\ " _VCPKG_INSTALLED "${CURRENT_INSTALLED_DIR}")
endif()
- set(MAKE )
set(MAKE_OPTS )
set(INSTALL_OPTS )
if (CMAKE_HOST_WIN32)
set(PATH_GLOBAL "$ENV{PATH}")
vcpkg_add_to_path(PREPEND "${SCRIPTS}/buildsystems/make_wrapper")
- vcpkg_acquire_msys(MSYS_ROOT)
- find_program(MAKE make PATHS "${MSYS_ROOT}/usr/bin" NO_DEFAULT_PATH REQUIRED)
- set(MAKE_COMMAND "${MAKE}")
+ if(NOT DEFINED Z_VCPKG_MAKE)
+ vcpkg_acquire_msys(MSYS_ROOT)
+ find_program(Z_VCPKG_MAKE make PATHS "${MSYS_ROOT}/usr/bin" NO_DEFAULT_PATH REQUIRED)
+ endif()
+ set(MAKE_COMMAND "${Z_VCPKG_MAKE}")
set(MAKE_OPTS ${_bc_MAKE_OPTIONS} -j ${VCPKG_CONCURRENCY} --trace -f ${_bc_MAKEFILE} ${_bc_BUILD_TARGET})
set(NO_PARALLEL_MAKE_OPTS ${_bc_MAKE_OPTIONS} -j 1 --trace -f ${_bc_MAKEFILE} ${_bc_BUILD_TARGET})
@@ -98,14 +99,12 @@ function(vcpkg_build_make) set(INSTALL_OPTS -j ${VCPKG_CONCURRENCY} --trace -f ${_bc_MAKEFILE} ${_bc_INSTALL_TARGET} DESTDIR=${_VCPKG_PACKAGE_PREFIX})
#TODO: optimize for install-data (release) and install-exec (release/debug)
else()
- # Compiler requriements
if(VCPKG_HOST_IS_OPENBSD)
- find_program(MAKE gmake REQUIRED)
+ find_program(Z_VCPKG_MAKE gmake REQUIRED)
else()
- find_program(MAKE make REQUIRED)
+ find_program(Z_VCPKG_MAKE make REQUIRED)
endif()
- set(MAKE_COMMAND "${MAKE}")
- # Set make command and install command
+ set(MAKE_COMMAND "${Z_VCPKG_MAKE}")
set(MAKE_OPTS ${_bc_MAKE_OPTIONS} V=1 -j ${VCPKG_CONCURRENCY} -f ${_bc_MAKEFILE} ${_bc_BUILD_TARGET})
set(NO_PARALLEL_MAKE_OPTS ${_bc_MAKE_OPTIONS} V=1 -j 1 -f ${_bc_MAKEFILE} ${_bc_BUILD_TARGET})
set(INSTALL_OPTS -j ${VCPKG_CONCURRENCY} -f ${_bc_MAKEFILE} ${_bc_INSTALL_TARGET} DESTDIR=${CURRENT_PACKAGES_DIR})
diff --git a/scripts/cmake/vcpkg_configure_make.cmake b/scripts/cmake/vcpkg_configure_make.cmake index f9a042660..067bf4da0 100644 --- a/scripts/cmake/vcpkg_configure_make.cmake +++ b/scripts/cmake/vcpkg_configure_make.cmake @@ -861,6 +861,15 @@ function(vcpkg_configure_make) endforeach()
endforeach()
+ # Export matching make program for vcpkg_build_make (cache variable)
+ if(CMAKE_HOST_WIN32 AND MSYS_ROOT)
+ find_program(Z_VCPKG_MAKE make PATHS "${MSYS_ROOT}/usr/bin" NO_DEFAULT_PATH REQUIRED)
+ elseif(VCPKG_HOST_IS_OPENBSD)
+ find_program(Z_VCPKG_MAKE gmake REQUIRED)
+ else()
+ find_program(Z_VCPKG_MAKE make REQUIRED)
+ endif()
+
# Restore environment
_vcpkg_restore_env_variables(${_cm_FLAGS} LIB LIBPATH LIBRARY_PATH LD_LIBRARY_PATH)
diff --git a/versions/baseline.json b/versions/baseline.json index 7995aa87d..19650fadc 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6098,7 +6098,7 @@ }, "starlink-ast": { "baseline": "9.2.4", - "port-version": 0 + "port-version": 1 }, "status-code": { "baseline": "1.0.0-ab3cd821", diff --git a/versions/s-/starlink-ast.json b/versions/s-/starlink-ast.json index f357f55c5..a72495000 100644 --- a/versions/s-/starlink-ast.json +++ b/versions/s-/starlink-ast.json @@ -1,6 +1,11 @@ { "versions": [ { + "git-tree": "2fecd468269d73b6e8f29a297c4f7db771ea37c4", + "version-semver": "9.2.4", + "port-version": 1 + }, + { "git-tree": "50f0b71ca66bd9e4ce6cb5a153e25878dd7a0600", "version-semver": "9.2.4", "port-version": 0 |