[graphviz,libslirp] Limit msys to windows (#24032)

* Limit vcpkg_acquire_msys to windows

* Add missing quotes

* Update versions
This commit is contained in:
Kai Pastor 2022-04-09 00:34:42 +02:00 committed by GitHub
parent c2978f8baa
commit bd1ef2df46
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 28 additions and 13 deletions

View File

@ -30,8 +30,10 @@ if(NOT VCPKG_TARGET_IS_WINDOWS)
set(EXTRA_CMAKE_OPTION "-DCMAKE_INSTALL_RPATH=${CURRENT_INSTALLED_DIR}/lib")
endif()
vcpkg_acquire_msys(MSYS_ROOT PACKAGES gawk)
vcpkg_add_to_path("${MSYS_ROOT}/usr/bin")
if(VCPKG_HOST_IS_WINDOWS)
vcpkg_acquire_msys(MSYS_ROOT PACKAGES gawk)
vcpkg_add_to_path("${MSYS_ROOT}/usr/bin")
endif()
vcpkg_find_acquire_program(BISON)
vcpkg_find_acquire_program(FLEX)
@ -42,11 +44,11 @@ vcpkg_cmake_configure(
SOURCE_PATH "${SOURCE_PATH}"
DISABLE_PARALLEL_CONFIGURE
OPTIONS
-DBISON_EXECUTABLE=${BISON}
-DFLEX_EXECUTABLE=${FLEX}
-DGIT_EXECUTABLE=${GIT}
-DPython3_EXECUTABLE=${PYTHON3}
-DPKG_CONFIG_EXECUTABLE=${CURRENT_HOST_INSTALLED_DIR}/tools/pkgconf/pkgconf
"-DBISON_EXECUTABLE=${BISON}"
"-DFLEX_EXECUTABLE=${FLEX}"
"-DGIT_EXECUTABLE=${GIT}"
"-DPython3_EXECUTABLE=${PYTHON3}"
"-DPKG_CONFIG_EXECUTABLE=${CURRENT_HOST_INSTALLED_DIR}/tools/pkgconf/pkgconf"
${EXTRA_CMAKE_OPTION}
)
@ -65,7 +67,7 @@ if(VCPKG_TARGET_IS_WINDOWS)
file(COPY ${PLUGINS} DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}")
vcpkg_execute_required_process(
COMMAND dot -c
WORKING_DIRECTORY ${CURRENT_PACKAGES_DIR}/tools/${PORT}
WORKING_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/${PORT}"
LOGNAME configure-plugins
)
file(COPY "${CURRENT_PACKAGES_DIR}/tools/${PORT}/config6" DESTINATION "${CURRENT_PACKAGES_DIR}/bin")

View File

@ -1,7 +1,7 @@
{
"name": "graphviz",
"version-semver": "2.49.1",
"port-version": 2,
"port-version": 3,
"description": "Graph Visualization Tools",
"homepage": "https://graphviz.org/",
"license": "EPL-1.0",

View File

@ -7,8 +7,10 @@ vcpkg_from_gitlab(
HEAD_REF master
)
vcpkg_acquire_msys(MSYS_ROOT)
vcpkg_add_to_path("${MSYS_ROOT}/usr/bin")
if(VCPKG_HOST_IS_WINDOWS)
vcpkg_acquire_msys(MSYS_ROOT)
vcpkg_add_to_path("${MSYS_ROOT}/usr/bin")
endif()
vcpkg_configure_meson(
SOURCE_PATH "${SOURCE_PATH}"

View File

@ -1,6 +1,7 @@
{
"name": "libslirp",
"version-semver": "4.6.1",
"port-version": 1,
"description": "libslirp is a user-mode networking library used by virtual machines, containers or various tools.",
"homepage": "https://gitlab.freedesktop.org/slirp/libslirp",
"license": "BSD-3-Clause",

View File

@ -2626,7 +2626,7 @@
},
"graphviz": {
"baseline": "2.49.1",
"port-version": 2
"port-version": 3
},
"greatest": {
"baseline": "1.5.0",
@ -3982,7 +3982,7 @@
},
"libslirp": {
"baseline": "4.6.1",
"port-version": 0
"port-version": 1
},
"libsmb2": {
"baseline": "2021-04-29",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "c1f20d0e1aaccb1035e3fe3eb95d005b4161a56e",
"version-semver": "2.49.1",
"port-version": 3
},
{
"git-tree": "912ac6a1578bd9cf23c20ed7f3bc85c25058c872",
"version-semver": "2.49.1",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "3230fcf2c1b8018c5eac033b618f2cb35217772f",
"version-semver": "4.6.1",
"port-version": 1
},
{
"git-tree": "5a7b734c0850f035d3eb2abc2d3dbf6389124be5",
"version-semver": "4.6.1",