Skip to content

Commit

Permalink
[ryu] Add support for mingw
Browse files Browse the repository at this point in the history
  • Loading branch information
sbrajchuk committed Apr 21, 2023
1 parent 95252ea commit 01fa72c
Show file tree
Hide file tree
Showing 4 changed files with 45 additions and 9 deletions.
44 changes: 37 additions & 7 deletions ports/ryu/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -30,18 +30,48 @@ set(ENV{BAZEL_BIN_PATH} ${BAZEL})
vcpkg_cmake_get_vars(cmake_vars_file)
include(${cmake_vars_file})

if (CMAKE_HOST_WIN32)
set(ENV{BAZEL_VC} $ENV{VCInstallDir})
if (VCPKG_HOST_IS_WINDOWS)
if (VCPKG_DETECTED_MSVC)
set(ENV{BAZEL_VC} $ENV{VCInstallDir})
elseif (VCPKG_TARGET_IS_MINGW)
if (NOT VCPKG_DETECTED_CMAKE_SYSTEM_PROCESSOR STREQUAL x86_64)
message(FATAL_ERROR "${VCPKG_DETECTED_CMAKE_SYSTEM_PROCESSOR} is not supported!")
endif ()
set(BAZEL_COMPILER --compiler=mingw-gcc)
# BAZEL_SH can be propagated to the build environment using VCPKG_KEEP_ENV_VARS
if (NOT DEFINED ENV{BAZEL_SH})
message("Environment variable BAZEL_SH is not specified, trying to guess...")
get_filename_component(DIR ${VCPKG_DETECTED_CMAKE_C_COMPILER} DIRECTORY)
# Bazel expects Mingw-w64 to be installed in MSYS2 (pacman -S mingw-w64-x86_64-toolchain).
# From BAZEL_SH it finds MSYS2 root, adds "mingw64" to the root and uses this path as the location of Mingw-w64.
# In my setup, the toolchain were installed to c:\msys64\mingw64, to make it discoverable by vcpkg,
# I've added c:\msys64\mingw64\bin to the PATH.
# It is also possible to use non-MSYS2 binaries with Bazel if they are installed to a directory
# with the "mingw64" prefix, such as c:\mingw64 or c:\TDM-GCC-64\mingw64.
string(REGEX REPLACE "/mingw64/bin$" "" MSYS_DIR ${DIR})
string(REPLACE / \\ MSYS_DIR ${MSYS_DIR})
set(ENV{BAZEL_SH} ${MSYS_DIR}\\usr\\bin\\bash.exe)
message("BAZEL_SH $ENV{BAZEL_SH}")
endif ()
else ()
message(FATAL_ERROR "${TARGET_TRIPLET} is not supported!")
endif ()
if (VCPKG_DETECTED_CMAKE_SYSTEM_PROCESSOR STREQUAL x86)
set(BAZEL_CPU --cpu=x64_x86_windows)
elseif (VCPKG_DETECTED_CMAKE_SYSTEM_PROCESSOR STREQUAL ARM)
set(BAZEL_CPU --cpu=x64_arm_windows)
elseif (VCPKG_DETECTED_CMAKE_SYSTEM_PROCESSOR STREQUAL ARM64)
set(BAZEL_CPU --cpu=x64_arm64_windows)
endif ()
else()
if (NOT VCPKG_DETECTED_CMAKE_SYSTEM_PROCESSOR STREQUAL x86_64)
message(FATAL_ERROR "${VCPKG_DETECTED_CMAKE_SYSTEM_PROCESSOR} is not supported!")
endif ()
set(ENV{CC} ${VCPKG_DETECTED_CMAKE_C_COMPILER})
set(ENV{AR} ${VCPKG_DETECTED_CMAKE_AR})
endif ()

if (VCPKG_DETECTED_CMAKE_HOST_SYSTEM_NAME STREQUAL Darwin)
if (VCPKG_HOST_IS_OSX)
set(ENV{SDKROOT} ${VCPKG_DETECTED_CMAKE_OSX_SYSROOT})
endif ()

Expand All @@ -51,12 +81,12 @@ prepare_bazel_opts(VCPKG_COMBINED_STATIC_LINKER_FLAGS_RELEASE LINK_OPTS_RELEASE
prepare_bazel_opts(VCPKG_COMBINED_STATIC_LINKER_FLAGS_DEBUG LINK_OPTS_DEBUG --linkopt)

vcpkg_execute_build_process(
COMMAND ${BAZEL} --batch build ${BAZEL_CPU} ${CONLY_OPTS_RELEASE} ${LINK_OPTS_RELEASE} --verbose_failures --strategy=CppCompile=standalone //ryu //ryu:ryu_printf
COMMAND ${BAZEL} --batch build ${BAZEL_COMPILER} ${BAZEL_CPU} ${CONLY_OPTS_RELEASE} ${LINK_OPTS_RELEASE} --verbose_failures --strategy=CppCompile=standalone //ryu //ryu:ryu_printf
WORKING_DIRECTORY ${SOURCE_PATH}
LOGNAME build-${TARGET_TRIPLET}-rel
)

if (CMAKE_HOST_WIN32)
if (VCPKG_HOST_IS_WINDOWS)
file(INSTALL ${SOURCE_PATH}/bazel-bin/ryu/ryu.lib DESTINATION ${CURRENT_PACKAGES_DIR}/lib/)
file(INSTALL ${SOURCE_PATH}/bazel-bin/ryu/ryu_printf.lib DESTINATION ${CURRENT_PACKAGES_DIR}/lib/)
else ()
Expand All @@ -65,12 +95,12 @@ else ()
endif ()

vcpkg_execute_build_process(
COMMAND ${BAZEL} --batch build ${BAZEL_CPU} ${CONLY_OPTS_DEBUG} ${LINK_OPTS_DEBUG} --verbose_failures --strategy=CppCompile=standalone //ryu //ryu:ryu_printf
COMMAND ${BAZEL} --batch build ${BAZEL_COMPILER} ${BAZEL_CPU} ${CONLY_OPTS_DEBUG} ${LINK_OPTS_DEBUG} --verbose_failures --strategy=CppCompile=standalone //ryu //ryu:ryu_printf
WORKING_DIRECTORY ${SOURCE_PATH}
LOGNAME build-${TARGET_TRIPLET}-dbg
)

if (CMAKE_HOST_WIN32)
if (VCPKG_HOST_IS_WINDOWS)
file(INSTALL ${SOURCE_PATH}/bazel-bin/ryu/ryu.lib DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib/)
file(INSTALL ${SOURCE_PATH}/bazel-bin/ryu/ryu_printf.lib DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib/)
else ()
Expand Down
3 changes: 2 additions & 1 deletion ports/ryu/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
{
"name": "ryu",
"version": "2.0",
"port-version": 8,
"port-version": 9,
"description": "Ryu generates the shortest decimal representation of a floating point number that maintains round-trip safety.",
"homepage": "https://github.com/ulfjack/ryu",
"supports": "(linux & x64) | (osx & x64) | (mingw & x64) | (windows & !(mingw & x64))",
"dependencies": [
{
"name": "vcpkg-cmake-get-vars",
Expand Down
2 changes: 1 addition & 1 deletion versions/baseline.json
Original file line number Diff line number Diff line change
Expand Up @@ -7098,7 +7098,7 @@
},
"ryu": {
"baseline": "2.0",
"port-version": 8
"port-version": 9
},
"s2geometry": {
"baseline": "0.10.0",
Expand Down
5 changes: 5 additions & 0 deletions versions/r-/ryu.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "1b7cc7461c6f4a94a6d0afbcd55ff027bf814b3c",
"version": "2.0",
"port-version": 9
},
{
"git-tree": "660ffa1a7a15e75dbcff064ac704f53b8a2da880",
"version": "2.0",
Expand Down

0 comments on commit 01fa72c

Please sign in to comment.