Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[asio] update to version 1.18.0 (#14095) #14167

Merged
merged 10 commits into from
Oct 30, 2020
Merged

[asio] update to version 1.18.0 (#14095) #14167

merged 10 commits into from
Oct 30, 2020

Conversation

mathisloge
Copy link
Contributor

This PR is related to #14095

  • What does your PR fix?
    Upates asio to version 1.18.0

  • Which triplets are supported/not supported? Have you updated the CI baseline?

  • Does your PR follow the maintainer guide?
    yes

@mathisloge
Copy link
Contributor Author

mathisloge commented Oct 22, 2020

Hi @NancyLi1013

So I have tried to update restbed to the newest version prior to applying the patch you mentioned at #14095 .

Unfortunately I getting now the ninja error

ninja: error: build.ninja:469: multiple rules generate restbed.lib [-w dupbuild=err]

@mathisloge
Copy link
Contributor Author

Okay, the removal of PREFER_NINJA fixed the ninja: error: build.ninja:469: multiple rules generate restbed.lib [-w dupbuild=err]

@mathisloge mathisloge marked this pull request as ready for review October 22, 2020 19:03
@NancyLi1013 NancyLi1013 self-assigned this Oct 23, 2020
@NancyLi1013 NancyLi1013 added the category:port-update The issue is with a library, which is requesting update new revision label Oct 23, 2020
ports/asio/portfile.cmake Outdated Show resolved Hide resolved
ports/asio/portfile.cmake Show resolved Hide resolved
ports/opendnp3/portfile.cmake Outdated Show resolved Hide resolved
ports/restbed/portfile.cmake Show resolved Hide resolved
ports/restbed/use-FindOpenSSL-cmake.patch Outdated Show resolved Hide resolved
ports/restbed/portfile.cmake Show resolved Hide resolved
@mathisloge
Copy link
Contributor Author

when adding 64cfeef it results in the config error.

@NancyLi1013 do you have any tips on how to solve this? I don't have any experience with that one.

@NancyLi1013
Copy link
Contributor

CMake Error:
  Running

   'D:/downloads/tools/ninja/1.10.1-windows/ninja.exe' '-C' 'D:/buildtrees/restbed/x86-windows-dbg' '-t' 'cleandead'

  failed with:

   ninja: error: build.ninja:469: multiple rules generate restbed.lib [-w dupbuild=err]

Since there are more that one targets generated at the same time.

You can add the options BUILD_SHARED_LIBS in CMakeLists.txt to judge if you build static library or dynamic library.

if(NOT BUILD_SHARED_LIBS)
      
else()

endif()

@mathisloge
Copy link
Contributor Author

@NancyLi1013 now it will build with PREFER_NINJA

@NancyLi1013
Copy link
Contributor

Could you please resolve the conflicts?

@mathisloge
Copy link
Contributor Author

@NancyLi1013 resolved conflicts

@NancyLi1013
Copy link
Contributor

LGTM now. Have you tested the feature restbed[openssl]? Does it work fine?

Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com>
@mathisloge
Copy link
Contributor Author

LGTM now. Have you tested the feature restbed[openssl]? Does it work fine?

I've only build with the openssl feature but didn't compile a test program. I can do that in the evening today.

@mathisloge
Copy link
Contributor Author

@NancyLi1013 I've build restbed[*] with tests. All tests are successfully.
install-x64-windows-dbg-out.log
install-x64-windows-rel-out.log

@NancyLi1013
Copy link
Contributor

Awesome! Thanks for your test and feedback.

@NancyLi1013 NancyLi1013 added the info:reviewed Pull Request changes follow basic guidelines label Oct 29, 2020
@BillyONeal BillyONeal merged commit 416bb1c into microsoft:master Oct 30, 2020
@BillyONeal
Copy link
Member

Thanks for your contribution!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
category:port-update The issue is with a library, which is requesting update new revision info:reviewed Pull Request changes follow basic guidelines
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants