[fmt] Update to 6.1.2 by curoky · Pull Request #10080 · microsoft/vcpkg

curoky · 2020-02-15T04:15:42Z

This PR changes:

Update to latest revision 6.1.2
Update patch fix-warning4189

PhoebeHui

@curoky, thanks for the PR!

Could you also bump the version in CONTROL file?

curoky · 2020-02-15T12:22:27Z

Done.

PhoebeHui · 2020-02-18T10:09:39Z

@curoky, the patch applied failed in CI testing, could you update the patch?

Checking patch include/fmt/format.h...
error: while searching for:

#ifndef FMT_FORMAT_H_
#define FMT_FORMAT_H_

#include
#include
#include

error: patch failed: include/fmt/format.h:32
error: include/fmt/format.h: patch does not apply

curoky · 2020-02-19T08:26:41Z

Done.
spdlog also needs to be upgraded or patched. Because the dependent header files are not in this version of fmt.

[1/8] /usr/bin/c++  -DFMT_LOCALE -DSPDLOG_COMPILED_LIB -DSPDLOG_FMT_EXTERNAL -I/home/curoky/repos/fork/vcpkg/buildtrees/spdlog/src/34724392a0-c671dd4aa9/include -isystem /home/curoky/repos/fork/vcpkg/installed/x64-linux/include -fPIC -g   -Wall -Wextra -Wconversion -pedantic -Wfatal-errors -std=c++11 -MD -MT CMakeFiles/spdlog.dir/src/fmt.cpp.o -MF CMakeFiles/spdlog.dir/src/fmt.cpp.o.d -o CMakeFiles/spdlog.dir/src/fmt.cpp.o -c /home/curoky/repos/fork/vcpkg/buildtrees/spdlog/src/34724392a0-c671dd4aa9/src/fmt.cpp
[2/8] /usr/bin/c++  -DFMT_LOCALE -DSPDLOG_COMPILED_LIB -DSPDLOG_FMT_EXTERNAL -I/home/curoky/repos/fork/vcpkg/buildtrees/spdlog/src/34724392a0-c671dd4aa9/include -isystem /home/curoky/repos/fork/vcpkg/installed/x64-linux/include -fPIC -g   -Wall -Wextra -Wconversion -pedantic -Wfatal-errors -std=c++11 -MD -MT CMakeFiles/spdlog.dir/src/spdlog.cpp.o -MF CMakeFiles/spdlog.dir/src/spdlog.cpp.o.d -o CMakeFiles/spdlog.dir/src/spdlog.cpp.o -c /home/curoky/repos/fork/vcpkg/buildtrees/spdlog/src/34724392a0-c671dd4aa9/src/spdlog.cpp
FAILED: CMakeFiles/spdlog.dir/src/spdlog.cpp.o 
/usr/bin/c++  -DFMT_LOCALE -DSPDLOG_COMPILED_LIB -DSPDLOG_FMT_EXTERNAL -I/home/curoky/repos/fork/vcpkg/buildtrees/spdlog/src/34724392a0-c671dd4aa9/include -isystem /home/curoky/repos/fork/vcpkg/installed/x64-linux/include -fPIC -g   -Wall -Wextra -Wconversion -pedantic -Wfatal-errors -std=c++11 -MD -MT CMakeFiles/spdlog.dir/src/spdlog.cpp.o -MF CMakeFiles/spdlog.dir/src/spdlog.cpp.o.d -o CMakeFiles/spdlog.dir/src/spdlog.cpp.o -c /home/curoky/repos/fork/vcpkg/buildtrees/spdlog/src/34724392a0-c671dd4aa9/src/spdlog.cpp
In file included from /home/curoky/repos/fork/vcpkg/buildtrees/spdlog/src/34724392a0-c671dd4aa9/src/spdlog.cpp:13:
/home/curoky/repos/fork/vcpkg/buildtrees/spdlog/src/34724392a0-c671dd4aa9/include/spdlog/details/pattern_formatter-inl.h: In member function ‘void spdlog::details::scoped_padder::pad_it(size_t)’:
/home/curoky/repos/fork/vcpkg/buildtrees/spdlog/src/34724392a0-c671dd4aa9/include/spdlog/details/pattern_formatter-inl.h:76:9: error: ‘assert’ was not declared in this scope
   76 |         assert(count <= spaces_.size());
      |         ^~~~~~
compilation terminated due to -Wfatal-errors.
[3/8] /usr/bin/c++  -DFMT_LOCALE -DSPDLOG_COMPILED_LIB -DSPDLOG_FMT_EXTERNAL -I/home/curoky/repos/fork/vcpkg/buildtrees/spdlog/src/34724392a0-c671dd4aa9/include -isystem /home/curoky/repos/fork/vcpkg/installed/x64-linux/include -fPIC -g   -Wall -Wextra -Wconversion -pedantic -Wfatal-errors -std=c++11 -MD -MT CMakeFiles/spdlog.dir/src/async.cpp.o -MF CMakeFiles/spdlog.dir/src/async.cpp.o.d -o CMakeFiles/spdlog.dir/src/async.cpp.o -c /home/curoky/repos/fork/vcpkg/buildtrees/spdlog/src/34724392a0-c671dd4aa9/src/async.cpp
[4/8] /usr/bin/c++  -DFMT_LOCALE -DSPDLOG_COMPILED_LIB -DSPDLOG_FMT_EXTERNAL -I/home/curoky/repos/fork/vcpkg/buildtrees/spdlog/src/34724392a0-c671dd4aa9/include -isystem /home/curoky/repos/fork/vcpkg/installed/x64-linux/include -fPIC -g   -Wall -Wextra -Wconversion -pedantic -Wfatal-errors -std=c++11 -MD -MT CMakeFiles/spdlog.dir/src/stdout_sinks.cpp.o -MF CMakeFiles/spdlog.dir/src/stdout_sinks.cpp.o.d -o CMakeFiles/spdlog.dir/src/stdout_sinks.cpp.o -c /home/curoky/repos/fork/vcpkg/buildtrees/spdlog/src/34724392a0-c671dd4aa9/src/stdout_sinks.cpp
[5/8] /usr/bin/c++  -DFMT_LOCALE -DSPDLOG_COMPILED_LIB -DSPDLOG_FMT_EXTERNAL -I/home/curoky/repos/fork/vcpkg/buildtrees/spdlog/src/34724392a0-c671dd4aa9/include -isystem /home/curoky/repos/fork/vcpkg/installed/x64-linux/include -fPIC -g   -Wall -Wextra -Wconversion -pedantic -Wfatal-errors -std=c++11 -MD -MT CMakeFiles/spdlog.dir/src/file_sinks.cpp.o -MF CMakeFiles/spdlog.dir/src/file_sinks.cpp.o.d -o CMakeFiles/spdlog.dir/src/file_sinks.cpp.o -c /home/curoky/repos/fork/vcpkg/buildtrees/spdlog/src/34724392a0-c671dd4aa9/src/file_sinks.cpp
[6/8] /usr/bin/c++  -DFMT_LOCALE -DSPDLOG_COMPILED_LIB -DSPDLOG_FMT_EXTERNAL -I/home/curoky/repos/fork/vcpkg/buildtrees/spdlog/src/34724392a0-c671dd4aa9/include -isystem /home/curoky/repos/fork/vcpkg/installed/x64-linux/include -fPIC -g   -Wall -Wextra -Wconversion -pedantic -Wfatal-errors -std=c++11 -MD -MT CMakeFiles/spdlog.dir/src/color_sinks.cpp.o -MF CMakeFiles/spdlog.dir/src/color_sinks.cpp.o.d -o CMakeFiles/spdlog.dir/src/color_sinks.cpp.o -c /home/curoky/repos/fork/vcpkg/buildtrees/spdlog/src/34724392a0-c671dd4aa9/src/color_sinks.cpp
ninja: build stopped: subcommand failed.

Should fix it in this PR?

PhoebeHui · 2020-02-19T11:04:11Z

@curoky, please also fix spdlog in this PR.

fmt also failed on CI testing, could you take a look? does it repro in your local machine?
-- Installing: C:/vsts/_work/3/s/packages/fmt_x86-windows/share/fmt/copyright
CMake Error at ports/fmt/portfile.cmake:24 (file):
file RENAME failed to rename
C:/vsts/_work/3/s/packages/fmt_x86-windows/debug/lib/fmtd.dll
to
C:/vsts/_work/3/s/packages/fmt_x86-windows/debug/bin/fmtd.dll

because: File exists

PhoebeHui

@curoky, thanks for updates!

Could you also bump version in spdlog CONTROL file?

curoky · 2020-02-20T10:14:45Z

Done.

curoky · 2020-02-20T10:23:46Z

/azp run

azure-pipelines · 2020-02-20T10:23:51Z

Commenter does not have sufficient privileges for PR 10080 in repo microsoft/vcpkg

PhoebeHui · 2020-02-20T10:28:24Z

@curoky, I have rerun CI testing on windows, let's wait for the results.

PhoebeHui · 2020-02-21T00:53:13Z

@curoky, azure-kinect-sensor-sdk:x64-windows failed on CI testing, could you take a look?

Failures:

Clang-format not found
CMake Error at CMakeLists.txt:303 (configure_file):
configure_file Problem configuring file

-- Configuring incomplete, errors occurred!

curoky · 2020-02-21T06:46:57Z

The error message is not enough to conclude, try to run again? @PhoebeHui

PhoebeHui · 2020-02-21T08:40:32Z

I have rerun the CI again, does the issue repro locally?

PhoebeHui · 2020-02-21T08:41:40Z

The CI test pass.

kenr · 2020-02-27T10:00:52Z

Is there anything stopping this to get merged? May I assist if so?

PhoebeHui · 2020-02-27T10:18:08Z

@strega-nil, could you priority to review and merge this PR?

strega-nil

This is awesome! thanks for the PR, just some minor changes needed and then I'll merge :)

strega-nil · 2020-02-28T03:16:58Z

ports/fmt/CONTROL

@@ -1,4 +1,4 @@
 Source: fmt
-Version: 6.0.0-1
+Version: 6.1.2-1


This should be 6.1.2, instead of 6.1.2-1

ports/fmt/portfile.cmake

ports/spdlog/CONTROL

strega-nil · 2020-02-29T03:37:15Z

/azp run

PhoebeHui · 2020-03-02T13:51:09Z

The azure-kinect-sensor-sdk failures is fake, after remove the tombstone, this issue solved.
Now the CI test pass.

PhoebeHui requested changes Feb 15, 2020

View reviewed changes

PhoebeHui self-assigned this Feb 15, 2020

PhoebeHui added the waiting for response label Feb 18, 2020

[fmt] Update to 6.1.2

163d65c

curoky added 2 commits February 20, 2020 13:03

[spdlog] add patch to fix include missing

8fc1e91

[fmt] check if file exists before file(RENAME ...)

794f0b6

PhoebeHui requested changes Feb 20, 2020

View reviewed changes

[spdlog] bump version to 1.4.2-2

28b73f4

PhoebeHui approved these changes Feb 21, 2020

View reviewed changes

PhoebeHui added info:needs-maintainer-attention Lets the current 'on rotation' vcpkg maintainer know they need to look at this. and removed waiting for response labels Feb 21, 2020

PhoebeHui assigned strega-nil Feb 27, 2020

strega-nil suggested changes Feb 28, 2020

View reviewed changes

[fmt][spdlog] Fix version number

424e870

strega-nil merged commit 705764c into microsoft:master Mar 2, 2020

kevinlul mentioned this pull request Mar 7, 2020

[fmt] Updated to 6.1.2 #9620

Closed

curoky deleted the upgrade_fmt branch March 18, 2020 04:41

Conversation

curoky commented Feb 15, 2020

Uh oh!

PhoebeHui left a comment

Choose a reason for hiding this comment

Uh oh!

curoky commented Feb 15, 2020

Uh oh!

PhoebeHui commented Feb 18, 2020

Uh oh!

curoky commented Feb 19, 2020

Uh oh!

PhoebeHui commented Feb 19, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

PhoebeHui left a comment

Choose a reason for hiding this comment

Uh oh!

curoky commented Feb 20, 2020

Uh oh!

curoky commented Feb 20, 2020

Uh oh!

azure-pipelines bot commented Feb 20, 2020

Uh oh!

PhoebeHui commented Feb 20, 2020

Uh oh!

PhoebeHui commented Feb 21, 2020

Uh oh!

curoky commented Feb 21, 2020

Uh oh!

PhoebeHui commented Feb 21, 2020

Uh oh!

PhoebeHui commented Feb 21, 2020

Uh oh!

kenr commented Feb 27, 2020

Uh oh!

PhoebeHui commented Feb 27, 2020

Uh oh!

strega-nil left a comment

Choose a reason for hiding this comment

Uh oh!

strega-nil Feb 28, 2020

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

strega-nil commented Feb 29, 2020

Uh oh!

PhoebeHui commented Mar 2, 2020

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

PhoebeHui commented Feb 19, 2020 •

edited

Loading