[ryu] Fix toolchain selection on *nixes. Fix macOS build. Add support for Mingw-w64 on Windows #31037

sbrajchuk · 2023-04-21T21:42:35Z

Changes comply with the maintainer guide
SHA512s are updated for each updated download
The "supports" clause reflects platforms that may be fixed by this new version
Any fixed CI baseline entries are removed from that file.
Any patches that are no longer applied are deleted from the port's directory.
The version database is fixed by rerunning ./vcpkg x-add-version --all and committing the result.
Only one version is added to each modified port's versions file.

BillyONeal · 2023-04-21T21:47:02Z

/azp run

azure-pipelines · 2023-04-21T21:47:10Z

Azure Pipelines successfully started running 1 pipeline(s).

BillyONeal · 2023-04-25T00:34:17Z

ports/ryu/portfile.cmake

+        endif ()
+    else ()
+        message(FATAL_ERROR "${TARGET_TRIPLET} is not supported!")
+    endif ()
    if (VCPKG_DETECTED_CMAKE_SYSTEM_PROCESSOR STREQUAL x86)


For what it's worth this if/elseif ladder looks wrong to me because it's inspecting CMAKE_SYSTEM_PROCESSOR which is information about the host, not the target, but this PR isn't meaningfully changing that.

I noticed that vcpkg uses triplets instead of CPUs in its command line, so I chose to display the triplet to avoid confusion.

On my x64 host, I checked the cmake-get-vars-x86-mingw-dynamic-rel.cmake.log file and found the following lines:

set(VCPKG_DETECTED_CMAKE_SYSTEM_PROCESSOR "i686") set(VCPKG_DETECTED_CMAKE_HOST_SYSTEM_PROCESSOR "x86_64")

Based on this, I believe that VCPKG_DETECTED_CMAKE_SYSTEM_PROCESSOR refers to the target.

BillyONeal

I didn't just push the quote adds because I wasn't 100% positive on them. Can you please either apply those or just let me know they're OK and I'll push that change for ya?

BillyONeal · 2023-04-25T01:30:38Z

ports/ryu/portfile.cmake

+            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.
+            # It is also possible to use non-MSYS2 binaries with Bazel if they are installed to a directory
+            # whose name ends with "mingw64", such as c:\mingw64 or c:\TDM-GCC-64\mingw64.
+            string(REGEX REPLACE "/mingw64/bin$" "" MSYS2_ROOT ${DIR})
+            string(REPLACE / \\ MSYS2_ROOT ${MSYS2_ROOT})
+            set(ENV{BAZEL_SH} ${MSYS2_ROOT}\\usr\\bin\\bash.exe)


Suggested change

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.

# It is also possible to use non-MSYS2 binaries with Bazel if they are installed to a directory

# whose name ends with "mingw64", such as c:\mingw64 or c:\TDM-GCC-64\mingw64.

string(REGEX REPLACE "/mingw64/bin$" "" MSYS2_ROOT ${DIR})

string(REPLACE / \\ MSYS2_ROOT ${MSYS2_ROOT})

set(ENV{BAZEL_SH} ${MSYS2_ROOT}\\usr\\bin\\bash.exe)

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.

# It is also possible to use non-MSYS2 binaries with Bazel if they are installed to a directory

# whose name ends with "mingw64", such as c:\mingw64 or c:\TDM-GCC-64\mingw64.

string(REGEX REPLACE "/mingw64/bin$" "" MSYS2_ROOT "${DIR}")

string(REPLACE / \\ MSYS2_ROOT "${MSYS2_ROOT}")

set(ENV{BAZEL_SH} "${MSYS2_ROOT}\\usr\\bin\\bash.exe")

BillyONeal · 2023-04-25T01:30:57Z

ports/ryu/portfile.cmake

 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


Suggested change

COMMAND ${BAZEL} --batch build ${BAZEL_COMPILER} ${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

Ditto I was wrong sorry

BillyONeal · 2023-04-25T01:31:22Z

ports/ryu/portfile.cmake

@@ -65,12 +91,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


Suggested change

COMMAND ${BAZEL} --batch build ${BAZEL_COMPILER} ${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

Ah, my mistake. I thought this was the file path to a compiler, and didn't realize that it could sometimes be empty string. This suggestion was wrong.

BillyONeal · 2023-04-25T01:31:58Z

ports/ryu/portfile.cmake

        WORKING_DIRECTORY ${SOURCE_PATH}
        LOGNAME build-${TARGET_TRIPLET}-rel
 )

-if (CMAKE_HOST_WIN32)
+if (CMAKE_STATIC_LIBRARY_SUFFIX STREQUAL .lib)


I'm torn on whether this should be:

Suggested change

if (CMAKE_STATIC_LIBRARY_SUFFIX STREQUAL .lib)

if ("${CMAKE_STATIC_LIBRARY_SUFFIX}" STREQUAL ".lib")

I think what you originally wrote is OK though...

I believe that all the double quotes in the code are unnecessary, so I removed them (where it possible). In my opinion, the lines with or without double quotes have the same meaning. However, if you prefer to keep the quotes for readability, it is acceptable.

I believe that all the double quotes in the code are unnecessary, so I removed them (where it possible). In my opinion, the lines with or without double quotes have the same meaning. However, if you prefer to keep the quotes for readability, it is acceptable.

In all cases where the variable is referred to by ${}, the double quotes do have meaning. Without them, spaces in the original variable are replaced with ;s (they are interpreted as different parameters to the CMake function in question).

The only case that is borderline is one like this where the variable is referred to by name rather than with ${}.

Apart from space:
All commands are equal, especially if commands. Here, it is not necessary to turn variable names (CMAKE_STATIC_LIBRARY_SUFFIX is okay) into quoted strings, but you should turn all expressions and literals into quoted strings.

When some ${foo} evaluates to an empty string, if(foo STREQUAL ${foo}) becomes invalid if(foo STREQUAL).

We had cases where unexpectedly a variable named 1 was defined to mean 0 (or the other way?), giving unexpected results on if( ... EQUAL ...). So any literal which can be a variable name must be quoted ("1", "0").

So I would really apply quotes for .lib here, unambiguously marking it as a plain literal expression.

Thank you for your advice! I don't fully agree with it, but as I mentioned earlier, using or not using double quotes doesn't make a difference to me. Therefore, I've added double quotes where it is possible. In my personal opinion, not using quotes was better.

You didn't need to add quotes on things that don't name variables. Do you want me to just fix that up for you?

BillyONeal · 2023-04-25T01:32:20Z

ports/ryu/vcpkg.json

  "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 | osx | windows",


It seems like this supports does nothing?

I am facing an issue here where I have been able to successfully compile x86-mingw-static and x86-mingw-dynamic triplets on Linux, but not on Windows.
The following expression:
linux | osx | (linux & mingw) | (mingw & x64) | (windows & !mingw)
is wrong as it does not allow the compilation of x86 mingw targets on Linux.

(linux & mingw) is never true.

Users can still build unsupported targets with --allow-unsupported.
But maybe it is easier to omit the supports expression where it cannot accurately catch the unsupported configurations.
(freebsd? android? ios? mingw & arm64?)

We know for certain that the mingw x86 target is not supported on Windows.
!(mingw & x86 & windows) is too restrictive, as it also prohibits mingw x86 targets on Linux.

Again, it cannot be expressed that it is supported for cross-builds only. Let supports be less restrictive, and catch it in the portfile. Similar to what is needed elsewhere for "at least GCC 10" or "at least "C++20" etc.

I've removed the supports field. Non-x64 Windows mingw targets are already captured by the portfile.

My comments were fixed

BillyONeal · 2023-04-27T19:41:24Z

This looks good to me but after removals from ci.baseline.txt the build has to actually pass first before it can merge.

Thanks again!

dg0yt

Please make it work also with release-only triplets.

dg0yt · 2023-04-28T05:07:53Z

ports/ryu/portfile.cmake

-        string(REGEX REPLACE "[ ]+-" ";-" ${flags} ${${flags}})
-        foreach (OPT IN LISTS ${flags})
+        string(REGEX REPLACE "[ ]+((\\\")?)-" ";\\1-" ${flags} ${${flags}})
+        foreach (opt IN LISTS ${flags})
+            string(REGEX REPLACE "^([^ ]+)[ ]+\"?([^\"]+)\"?$" \\1\\2 opt ${opt})
+            string(REGEX REPLACE "^\"([^\"]+)\"$" \\1 opt ${opt})
            if (${opts})
-                string(REGEX REPLACE "^([^ ]+)[ ]+\"?([^\"]+)\"?$" \\1\\2 OPT ${OPT})
-                set(${opts} ${${opts}};${switch}=${OPT})
+                set(${opts} ${${opts}};${switch}=${opt})
            else ()
-                set(${opts} ${switch}=${OPT})
+                set(${opts} ${switch}=${opt})


I don't know which transformation is really desired here, but in my experience parsing of flags from CMake should always start with separate_arguments. Cf. https://github.com/microsoft/vcpkg/pull/30381/files.

dg0yt · 2023-04-28T05:09:48Z

ports/ryu/portfile.cmake

+            string(REPLACE "/" "\\" MSYS2_ROOT "${MSYS2_ROOT}")
+            set(ENV{BAZEL_SH} "${MSYS2_ROOT}\\usr\\bin\\bash.exe")


In my tests, no conversion from CMake paths to Windows path is needed here.

sbrajchuk · 2023-04-28T08:41:49Z

@dg0yt Thanks!

… for Mingw-w64 on Windows

BillyONeal · 2023-04-28T23:25:25Z

@dg0yt Since you've reviewed this can you confirm you're happy with it?

@sbrajchuk Thanks for your submission!

dg0yt · 2023-04-30T14:33:04Z

ports/ryu/portfile.cmake

+if ("${VCPKG_BUILD_TYPE}" STREQUAL "" OR "${VCPKG_BUILD_TYPE}" STREQUAL "release")
+    bazel_build("release")
+endif ()

-if (CMAKE_HOST_WIN32)
-    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 ()
-    file(INSTALL ${SOURCE_PATH}/bazel-bin/ryu/libryu.a DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib/)
-    file(INSTALL ${SOURCE_PATH}/bazel-bin/ryu/libryu_printf.a DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib/)
+if ("${VCPKG_BUILD_TYPE}" STREQUAL "" OR "${VCPKG_BUILD_TYPE}" STREQUAL "debug")
+    bazel_build("debug")
 endif ()


Note that the only supported single-config type is "release", so transformed to a frequent pattern, this would be:

bazel_build("release") if(NOT VCPKG_BUILD_TYPE) bazel_build("debug") endif()

sbrajchuk force-pushed the ryu_mingw64 branch from 01fa72c to 54f7bf6 Compare April 22, 2023 09:59

sbrajchuk marked this pull request as ready for review April 22, 2023 10:05

sbrajchuk marked this pull request as draft April 22, 2023 10:32

sbrajchuk force-pushed the ryu_mingw64 branch from 54f7bf6 to 00635b9 Compare April 22, 2023 10:36

sbrajchuk marked this pull request as ready for review April 22, 2023 10:43

sbrajchuk marked this pull request as draft April 22, 2023 11:12

sbrajchuk force-pushed the ryu_mingw64 branch 2 times, most recently from e91af15 to d39033e Compare April 22, 2023 11:21

sbrajchuk marked this pull request as ready for review April 22, 2023 11:26

sbrajchuk marked this pull request as draft April 22, 2023 13:20

sbrajchuk force-pushed the ryu_mingw64 branch from d39033e to cee5f91 Compare April 22, 2023 13:34

sbrajchuk marked this pull request as ready for review April 22, 2023 13:43

sbrajchuk marked this pull request as draft April 22, 2023 18:16

sbrajchuk force-pushed the ryu_mingw64 branch 2 times, most recently from 974344a to e2ea376 Compare April 22, 2023 20:47

sbrajchuk marked this pull request as ready for review April 22, 2023 21:23

Cheney-W assigned FrankXie05 Apr 23, 2023

FrankXie05 added the category:port-feature The issue is with a library, which is requesting new capabilities that didn’t exist label Apr 23, 2023

sbrajchuk marked this pull request as draft April 23, 2023 18:13

sbrajchuk force-pushed the ryu_mingw64 branch from e2ea376 to b5f8fcd Compare April 23, 2023 20:21

sbrajchuk marked this pull request as ready for review April 23, 2023 20:29

FrankXie05 previously approved these changes Apr 24, 2023

View reviewed changes

FrankXie05 added the info:reviewed Pull Request changes follow basic guidelines label Apr 24, 2023

BillyONeal reviewed Apr 25, 2023

View reviewed changes

BillyONeal previously requested changes Apr 25, 2023

View reviewed changes

BillyONeal added requires:author-response and removed info:reviewed Pull Request changes follow basic guidelines labels Apr 25, 2023

sbrajchuk marked this pull request as draft April 26, 2023 17:16

sbrajchuk marked this pull request as draft April 27, 2023 10:45

sbrajchuk force-pushed the ryu_mingw64 branch 4 times, most recently from 192ae1c to b20c163 Compare April 27, 2023 18:57

sbrajchuk force-pushed the ryu_mingw64 branch from b20c163 to 7e50177 Compare April 27, 2023 21:53

sbrajchuk marked this pull request as ready for review April 27, 2023 22:57

dg0yt reviewed Apr 28, 2023

View reviewed changes

sbrajchuk marked this pull request as draft April 28, 2023 06:56

sbrajchuk force-pushed the ryu_mingw64 branch from 7e50177 to 155599b Compare April 28, 2023 08:14

sbrajchuk marked this pull request as ready for review April 28, 2023 09:08

sbrajchuk marked this pull request as draft April 28, 2023 19:44

[ryu] Fix toolchain selection on *nixes. Fix macOS build. Add support…

62cbae6

… for Mingw-w64 on Windows

sbrajchuk force-pushed the ryu_mingw64 branch from 155599b to 62cbae6 Compare April 28, 2023 20:26

sbrajchuk marked this pull request as ready for review April 28, 2023 21:24

BillyONeal previously approved these changes Apr 28, 2023

View reviewed changes

BillyONeal removed the requires:author-response label Apr 28, 2023

sbrajchuk marked this pull request as draft April 29, 2023 11:10

sbrajchuk dismissed BillyONeal’s stale review via 0899d8b April 30, 2023 13:27

sbrajchuk marked this pull request as ready for review April 30, 2023 13:33

Refactor code

c437200

sbrajchuk force-pushed the ryu_mingw64 branch from c051f4c to c437200 Compare April 30, 2023 14:10

dg0yt reviewed Apr 30, 2023

View reviewed changes

Fix build type handling

b7a7f94

BillyONeal approved these changes May 1, 2023

View reviewed changes

JavierMatosD merged commit d46c6ba into microsoft:master May 1, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[ryu] Fix toolchain selection on *nixes. Fix macOS build. Add support for Mingw-w64 on Windows #31037

[ryu] Fix toolchain selection on *nixes. Fix macOS build. Add support for Mingw-w64 on Windows #31037

sbrajchuk commented Apr 21, 2023 •

edited

Loading

BillyONeal commented Apr 21, 2023

azure-pipelines bot commented Apr 21, 2023

BillyONeal Apr 25, 2023

sbrajchuk Apr 25, 2023

sbrajchuk Apr 25, 2023

BillyONeal left a comment

BillyONeal Apr 25, 2023

BillyONeal Apr 25, 2023

BillyONeal Apr 27, 2023

BillyONeal Apr 25, 2023

BillyONeal Apr 27, 2023

BillyONeal Apr 25, 2023

sbrajchuk Apr 25, 2023 •

edited

Loading

BillyONeal Apr 26, 2023

dg0yt Apr 26, 2023

sbrajchuk Apr 26, 2023

BillyONeal Apr 27, 2023

BillyONeal Apr 25, 2023

sbrajchuk Apr 25, 2023 •

edited

Loading

dg0yt Apr 25, 2023

sbrajchuk Apr 25, 2023

dg0yt Apr 26, 2023

sbrajchuk Apr 26, 2023

BillyONeal commented Apr 27, 2023

dg0yt left a comment

dg0yt Apr 28, 2023

dg0yt Apr 28, 2023

sbrajchuk commented Apr 28, 2023

BillyONeal commented Apr 28, 2023

dg0yt Apr 30, 2023

	COMMAND ${BAZEL} --batch build ${BAZEL_COMPILER} ${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

	if (CMAKE_STATIC_LIBRARY_SUFFIX STREQUAL .lib)
	if ("${CMAKE_STATIC_LIBRARY_SUFFIX}" STREQUAL ".lib")

		string(REPLACE "/" "\\" MSYS2_ROOT "${MSYS2_ROOT}")
		set(ENV{BAZEL_SH} "${MSYS2_ROOT}\\usr\\bin\\bash.exe")

[ryu] Fix toolchain selection on *nixes. Fix macOS build. Add support for Mingw-w64 on Windows #31037

[ryu] Fix toolchain selection on *nixes. Fix macOS build. Add support for Mingw-w64 on Windows #31037

Conversation

sbrajchuk commented Apr 21, 2023 • edited Loading

BillyONeal commented Apr 21, 2023

azure-pipelines bot commented Apr 21, 2023

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

BillyONeal left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

sbrajchuk Apr 25, 2023 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

sbrajchuk Apr 25, 2023 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

BillyONeal commented Apr 27, 2023

dg0yt left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

sbrajchuk commented Apr 28, 2023

BillyONeal commented Apr 28, 2023

Choose a reason for hiding this comment

sbrajchuk commented Apr 21, 2023 •

edited

Loading

sbrajchuk Apr 25, 2023 •

edited

Loading

sbrajchuk Apr 25, 2023 •

edited

Loading