Skip to content

[expat] Update the version to 2.2.9 (add support for uwp) #9146

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 33 commits into from
Aug 17, 2020
Merged

[expat] Update the version to 2.2.9 (add support for uwp) #9146

merged 33 commits into from
Aug 17, 2020

Conversation

NancyLi1013
Copy link
Contributor

@NancyLi1013 NancyLi1013 commented Nov 29, 2019 •
edited
Loading

Update to 2.2.9

  • Add support for uwp
  • Supportfind_package()by expat-config.cmake instead of Findexpat.cmake(Remove usage in ports/expat/usage)

Fix #3174, #11840

@grdowns grdowns self-assigned this Dec 2, 2019
@NancyLi1013 NancyLi1013 marked this pull request as ready for review December 11, 2019 06:02
@NancyLi1013
Copy link
Contributor Author

/azp run

4 similar comments
@NancyLi1013
Copy link
Contributor Author

/azp run

@NancyLi1013
Copy link
Contributor Author

/azp run

@NancyLi1013
Copy link
Contributor Author

/azp run

@NancyLi1013
Copy link
Contributor Author

/azp run

@azure-pipelines
Copy link

Azure Pipelines could not run because the pipeline triggers exclude this branch/path.

@ray42
Copy link

ray42 commented May 27, 2020

@NancyLi1013 @JackBoosY what needs to be done to get this merged? Anything I could help with? I would love to get expat v2.2.9, thanks.

@JackBoosY
Copy link
Contributor

/azp run

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@JackBoosY
Copy link
Contributor

@ray42 we are trying to solve the baseline error, then we will handle this PR.

@ray42
Copy link

ray42 commented May 28, 2020

@JackBoosY Thank you.

@NancyLi1013 - let me know if there is anything I can help out with, thank you.

@NancyLi1013
Copy link
Contributor Author

/azp run

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@NancyLi1013 NancyLi1013 mentioned this pull request Jun 9, 2020
Closed
@NancyLi1013
Copy link
Contributor Author

/azp run

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@JackBoosY JackBoosY added the category:port-feature The issue is with a library, which is requesting new capabilities that didn’t exist label Jun 11, 2020
@NancyLi1013
Copy link
Contributor Author

The regression on x64-osx for itk is due to the following cause, which will be fixed in PR #11208.

Undefined symbols for architecture x86_64:
  "gdcm::Rescaler::SetMinMaxForPixelType(double, double)", referenced from:
      itk::GDCMImageIO::Write(void const*) in libITKIOGDCM-5.0.a(itkGDCMImageIO.cxx.o)
ld: symbol(s) not found for architecture x86_64
clang: error: linker command failed with exit code 1 (use -v to see invocation)
ninja: build stopped: subcommand failed.

@NancyLi1013 NancyLi1013 added depends:different-pr This PR or Issue depends on a PR which has been filed and removed info:reviewed Pull Request changes follow basic guidelines labels Jul 30, 2020
@strega-nil
Copy link
Contributor

@NancyLi1013 is this itk failure going to happen regardless, or should we wait for #11208 to be merged?

@NancyLi1013
Copy link
Contributor Author

The itk failure will happen regardless, which has existed for long time . It seems that this issue appeared in this PR #10767 (comment) for the first time and the failure code was removed from ci.baseline.txt in #11513. It appeared again in ##12067 (comment) and #12133.

It should not block this PR. But we can also wait for #11208 merged and then try to rerun this PR. There are also many changes in this PR. We may wait for all CI checks have passed.

NancyLi1013 added 2 commits August 2, 2020 19:02
Merge branch 'master' of https://github.com/Microsoft/vcpkg into dev/…
c5833c8 
…NancyLi/3174-update-expat

# Conflicts:
#	ports/wxwidgets/portfile.cmake
[wxwidgest] Remove unnecessary spaces
90749f8
@NancyLi1013 NancyLi1013 removed the depends:different-pr This PR or Issue depends on a PR which has been filed label Aug 3, 2020
@strega-nil
Copy link
Contributor

/azp run

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@strega-nil
Copy link
Contributor

@NancyLi1013 what's going on with itk and cmake on windows, do you know?

Merge branch 'master' of https://github.com/Microsoft/vcpkg into dev/…
ea98684 
…NancyLi/3174-update-expat

# Conflicts:
#	ports/wxwidgets/CONTROL
#	ports/wxwidgets/portfile.cmake
@NancyLi1013
Copy link
Contributor Author

@strega-nil

For the regressions caused by itk, I'm in investigation now.
For cmake, I don't know why it will fail.

I resolved the conflicts for wxwidgets just now. Let's wait for the new results.

@strega-nil
Copy link
Contributor

/azp run

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@NancyLi1013
Copy link
Contributor Author

NancyLi1013 commented Aug 7, 2020 •
edited
Loading

The regressions for itk have been fixed now.
But for cmake, I have no idea.

[503/504] cmd.exe /C "cd /D D:\buildtrees\cmake\x64-windows-dbg && D:\buildtrees\cmake\x64-windows-dbg\bin\cmake.exe -P cmake_install.cmake"
FAILED: CMakeFiles/install.util 
cmd.exe /C "cd /D D:\buildtrees\cmake\x64-windows-dbg && D:\buildtrees\cmake\x64-windows-dbg\bin\cmake.exe -P cmake_install.cmake"
ninja: build stopped: subcommand failed.

@strega-nil

Could you please help take a look? I don't know what's wrong with cmake.

@NancyLi1013
Copy link
Contributor Author

@strega-nil
Thanks for your help to fix cmake issue.

I noticed that you updated cmake to 3.18.1 and also disable -DCMAKE_USE_SYSTEM_EXPAT=OFF.

I tried to install cmake 3.17.2 via .\vcpkg.exe install cmake --overlay-ports=scripts/test_ports on my local on both master branch and expat branch, it failed with the same error, which is different from CI results.

The results from expat branch:

F:\expet\vcpkg\buildtrees\cmake\src\7fc4616c28-392dff6306.clean\Source\cmGeneratorExpressionParser.cxx(39): error C2672: 'cm::static_reference_cast': no matching overloaded function found
F:\expet\vcpkg\buildtrees\cmake\src\7fc4616c28-392dff6306.clean\Source\cmGeneratorExpressionParser.cxx(39): error C2783: 'T &cm::static_reference_cast(O &)': could not deduce template argument for '__formal'
F:\expet\vcpkg\buildtrees\cmake\src\7fc4616c28-392dff6306.clean\Utilities\std\cmext/memory(19): note: see declaration of 'cm::static_reference_cast'
F:\expet\vcpkg\buildtrees\cmake\src\7fc4616c28-392dff6306.clean\Source\cmGeneratorExpressionParser.cxx(55): error C2672: 'cm::static_reference_cast': no matching overloaded function found
F:\expet\vcpkg\buildtrees\cmake\src\7fc4616c28-392dff6306.clean\Source\cmGeneratorExpressionParser.cxx(55): error C2783: 'T &cm::static_reference_cast(O &)': could not deduce template argument for '__formal'
F:\expet\vcpkg\buildtrees\cmake\src\7fc4616c28-392dff6306.clean\Utilities\std\cmext/memory(19): note: see declaration of 'cm::static_reference_cast'
F:\expet\vcpkg\buildtrees\cmake\src\7fc4616c28-392dff6306.clean\Source\cmGeneratorExpressionParser.cxx(57): error C2672: 'cm::static_reference_cast': no matching overloaded function found
F:\expet\vcpkg\buildtrees\cmake\src\7fc4616c28-392dff6306.clean\Source\cmGeneratorExpressionParser.cxx(57): error C2783: 'T &cm::static_reference_cast(O &)': could not deduce template argument for '__formal'
F:\expet\vcpkg\buildtrees\cmake\src\7fc4616c28-392dff6306.clean\Utilities\std\cmext/memory(19): note: see declaration of 'cm::static_reference_cast'
F:\expet\vcpkg\buildtrees\cmake\src\7fc4616c28-392dff6306.clean\Source\cmGeneratorExpressionParser.cxx(217): error C2672: 'cm::static_reference_cast': no matching overloaded function found
F:\expet\vcpkg\buildtrees\cmake\src\7fc4616c28-392dff6306.clean\Source\cmGeneratorExpressionParser.cxx(217): error C2783: 'T &cm::static_reference_cast(O &)': could not deduce template argument for '__formal'
F:\expet\vcpkg\buildtrees\cmake\src\7fc4616c28-392dff6306.clean\Utilities\std\cmext/memory(19): note: see declaration of 'cm::static_reference_cast'

The results from master branch:

F:\new\vcpkg\buildtrees\cmake\src\7fc4616c28-392dff6306.clean\Source\cmGeneratorExpressionParser.cxx(39): error C2672: 'cm::static_reference_cast': no matching overloaded function found
F:\new\vcpkg\buildtrees\cmake\src\7fc4616c28-392dff6306.clean\Source\cmGeneratorExpressionParser.cxx(39): error C2783: 'T &cm::static_reference_cast(O &)': could not deduce template argument for '__formal'
F:\new\vcpkg\buildtrees\cmake\src\7fc4616c28-392dff6306.clean\Utilities\std\cmext/memory(19): note: see declaration of 'cm::static_reference_cast'
F:\new\vcpkg\buildtrees\cmake\src\7fc4616c28-392dff6306.clean\Source\cmGeneratorExpressionParser.cxx(55): error C2672: 'cm::static_reference_cast': no matching overloaded function found
F:\new\vcpkg\buildtrees\cmake\src\7fc4616c28-392dff6306.clean\Source\cmGeneratorExpressionParser.cxx(55): error C2783: 'T &cm::static_reference_cast(O &)': could not deduce template argument for '__formal'
F:\new\vcpkg\buildtrees\cmake\src\7fc4616c28-392dff6306.clean\Utilities\std\cmext/memory(19): note: see declaration of 'cm::static_reference_cast'
F:\new\vcpkg\buildtrees\cmake\src\7fc4616c28-392dff6306.clean\Source\cmGeneratorExpressionParser.cxx(57): error C2672: 'cm::static_reference_cast': no matching overloaded function found
F:\new\vcpkg\buildtrees\cmake\src\7fc4616c28-392dff6306.clean\Source\cmGeneratorExpressionParser.cxx(57): error C2783: 'T &cm::static_reference_cast(O &)': could not deduce template argument for '__formal'
F:\new\vcpkg\buildtrees\cmake\src\7fc4616c28-392dff6306.clean\Utilities\std\cmext/memory(19): note: see declaration of 'cm::static_reference_cast'
F:\new\vcpkg\buildtrees\cmake\src\7fc4616c28-392dff6306.clean\Source\cmGeneratorExpressionParser.cxx(217): error C2672: 'cm::static_reference_cast': no matching overloaded function found
F:\new\vcpkg\buildtrees\cmake\src\7fc4616c28-392dff6306.clean\Source\cmGeneratorExpressionParser.cxx(217): error C2783: 'T &cm::static_reference_cast(O &)': could not deduce template argument for '__formal'
F:\new\vcpkg\buildtrees\cmake\src\7fc4616c28-392dff6306.clean\Utilities\std\cmext/memory(19): note: see declaration of 'cm::static_reference_cast'

So I'm not sure if the regressions on CI are related with the changes in this PR. I also have a doubt that why you update cmake to 3.18.1?

@strega-nil
Copy link
Contributor

@NancyLi1013 yeah, that was a thing that was broken in that version of CMake with the latest version of VC++.

@strega-nil strega-nil merged commit d6285bc into microsoft:master Aug 17, 2020
@NancyLi1013
Copy link
Contributor Author

@strega-nil thanks for your help.

@ray42
Copy link

ray42 commented Aug 18, 2020

Thanks to everyone, especially @NancyLi1013 , for the awesome work :)

remz1337 pushed a commit to remz1337/vcpkg that referenced this pull request Aug 23, 2020
@NancyLi1013 @strega-nil @remz1337
[expat] Update the version to 2.2.9 (add support for uwp) (microsoft#…
9860578 
…9146)

* [expat] Update the version to 2.2.9(support uwp)

* [readosm] Fix expat.lib cannot be found

* Remove expat:arm-uwp and expat:x64-uwp from fail list in ci.baseline.txt

* [apr-util,io2d,skia] Fix expat cannot be found and also update expat

* [many ports] Add supports and fix the regressions

* Fix new regressions

* Fix typo

* [io2d] Update expat patch

* [io2d,libkml,skia] Fix expat cannot find and also fix typo

* [expat] Remove usage

* [libkml,vtk] Update expat patch and fix static build

* [wxwidgets] Fix static build caused by expat cannot found

* Update as review suggestion

* Add Port-Version

* Remove evpp:x64-osx=fail from ci.baseline.txt

* [wxwidgest] Remove unnecessary spaces

* [itk] Fix expat cannot be found

* fix cmake test port

* [wxwidgets] Update Port-Version

Co-authored-by: Nicole Mazzuca <mazzucan@outlook.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
1 more reviewer

@JackBoosY JackBoosY JackBoosY approved these changes

Reviewers whose approvals may not affect merge requirements
Assignees

@JackBoosY JackBoosY

Labels
category:port-feature The issue is with a library, which is requesting new capabilities that didn’t exist category:port-update The issue is with a library, which is requesting update new revision
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

wxwidgets:x64-uwp requires expat:x64-uwp, which does not exist
6 participants
@NancyLi1013 @ray42 @JackBoosY @oskaritimperi @strega-nil @grdowns