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

[cgal] update to 5.6 #32896

Merged
merged 4 commits into from
Aug 10, 2023
Merged

[cgal] update to 5.6 #32896

merged 4 commits into from
Aug 10, 2023

Conversation

lrineau
Copy link
Contributor

@lrineau lrineau commented Aug 2, 2023

This pull-request updates the cgal port to CGAL version 5.6.

  • 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.

@lrineau lrineau mentioned this pull request Aug 2, 2023
60 tasks
@jimwang118 jimwang118 added the category:port-update The issue is with a library, which is requesting update new revision label Aug 2, 2023
@lrineau
Copy link
Contributor Author

lrineau commented Aug 2, 2023

The CI checks failed on x86_windows only, with two dependent packages:

  • colmap
  • openmvs

https://dev.azure.com/vcpkg/public/_build/results?buildId=92387&view=logs&j=878666d5-db33-5b27-9e7d-b0c7ee352005&t=dc897974-8f7e-5107-e5db-0a01be8e9d4f&l=7652:

Building openmvs[core,nonfree]:x86-windows...
-- Note: openmvs only supports static library linkage. Building static library.
-- Downloading https://github.com/cdcseacave/openMVS/archive/v2.1.0.tar.gz -> cdcseacave-openMVS-v2.1.0.tar.gz...
-- Extracting source D:/downloads/cdcseacave-openMVS-v2.1.0.tar.gz
-- Applying patch fix-build.patch
-- Applying patch no-absolute-paths.patch
-- Using source at D:/buildtrees/openmvs/src/v2.1.0-c152f74ee1.clean
-- Found external ninja('1.11.0').
-- Configuring x86-windows
-- Building x86-windows-dbg
CMake Error at scripts/cmake/vcpkg_execute_build_process.cmake:134 (message):
    Command failed: D:/downloads/tools/cmake-3.27.1-windows/cmake-3.27.1-windows-i386/bin/cmake.exe --build . --config Debug --target install -- -v -j33
    Working Directory: D:/buildtrees/openmvs/x86-windows-dbg
    See logs for more information:
      D:\buildtrees\openmvs\install-x86-windows-dbg-out.log

Call Stack (most recent call first):
  D:/installed/x64-windows/share/vcpkg-cmake/vcpkg_cmake_build.cmake:74 (vcpkg_execute_build_process)
  D:/installed/x64-windows/share/vcpkg-cmake/vcpkg_cmake_install.cmake:16 (vcpkg_cmake_build)
  ports/openmvs/portfile.cmake:42 (vcpkg_cmake_install)
  scripts/ports.cmake:147 (include)


error: building openmvs:x86-windows failed with: BUILD_FAILED
Elapsed time to handle openmvs:x86-windows: 58 s

https://dev.azure.com/vcpkg/public/_build/results?buildId=92387&view=logs&j=878666d5-db33-5b27-9e7d-b0c7ee352005&t=dc897974-8f7e-5107-e5db-0a01be8e9d4f&l=7571:

Building colmap:x86-windows...
-- Downloading https://github.com/colmap/colmap/archive/30da037ce19bdceb6d239c45342fadb221bdabb2.tar.gz -> colmap-colmap-30da037ce19bdceb6d239c45342fadb221bdabb2.tar.gz...
-- Extracting source D:/downloads/colmap-colmap-30da037ce19bdceb6d239c45342fadb221bdabb2.tar.gz
-- Applying patch fix-dependencies.patch
-- Using source at D:/buildtrees/colmap/src/b221bdabb2-e3968635af.clean
-- Found external ninja('1.11.0').
-- Configuring x86-windows-dbg
-- Configuring x86-windows-rel
-- Building x86-windows-dbg
CMake Error at scripts/cmake/vcpkg_execute_build_process.cmake:134 (message):
    Command failed: D:/downloads/tools/cmake-3.27.1-windows/cmake-3.27.1-windows-i386/bin/cmake.exe --build . --config Debug --target install -- -v -j33
    Working Directory: D:/buildtrees/colmap/x86-windows-dbg
    See logs for more information:
      D:\buildtrees\colmap\install-x86-windows-dbg-out.log

Call Stack (most recent call first):
  D:/installed/x64-windows/share/vcpkg-cmake/vcpkg_cmake_build.cmake:74 (vcpkg_execute_build_process)
  D:/installed/x64-windows/share/vcpkg-cmake/vcpkg_cmake_install.cmake:16 (vcpkg_cmake_build)
  ports/colmap/portfile.cmake:60 (vcpkg_cmake_install)
  scripts/ports.cmake:147 (include)


error: building colmap:x86-windows failed with: BUILD_FAILED
Elapsed time to handle colmap:x86-windows: 1.2 min

I cannot extract more useful information about the compilation errors, and my daily job platform is on Linux. Is there anywhere the build logs are uploaded?

@jimwang118
Copy link
Contributor

You can refer to this comment for logs.

@lrineau
Copy link
Contributor Author

lrineau commented Aug 2, 2023

You can refer to this comment for logs.

Thanks to the discussion. I found out the logs, available in the artifacts of Azure job. It turns out the issue is CGAL-5.6 that is no longer tested on Windows x86 (32 bits). And the error is:

D:\installed\x86-windows\include\CGAL/cpp_float.h(30): error C3861: '_BitScanForward64': identifier not found
D:\installed\x86-windows\include\CGAL/cpp_float.h(42): error C3861: '_BitScanReverse64': identifier not found

I will try to find out a solution with my fellow CGAL developers...

@lrineau
Copy link
Contributor Author

lrineau commented Aug 2, 2023

Done: now the CI checks are fine. I will contribute the patch upstream, now that I have verified that it is correct.

ports/cgal/vcpkg.json Outdated Show resolved Hide resolved
@jimwang118
Copy link
Contributor

Note: I will be converting your PR to draft status. The above suggested changes are only recommendations. If you are willing to adopt them, please click "ready for review" after making the modifications. If you do not wish to make any changes, please click "ready for review" directly. That way, I can be aware that you've responded since you can't modify the tags.

@jimwang118 jimwang118 marked this pull request as draft August 3, 2023 01:55
lrineau added 2 commits August 3, 2023 11:50
adds a patch:
  - do not use Boost MP number type on Windows x86 (32 bits)
versions/baseline.json Show resolved Hide resolved
@lrineau lrineau marked this pull request as ready for review August 9, 2023 12:54
@lrineau lrineau marked this pull request as draft August 9, 2023 12:55
@lrineau lrineau marked this pull request as ready for review August 9, 2023 12:59
@lrineau lrineau mentioned this pull request Aug 9, 2023
@jimwang118 jimwang118 added the info:reviewed Pull Request changes follow basic guidelines label Aug 10, 2023
@jimwang118 jimwang118 mentioned this pull request Aug 10, 2023
7 tasks
@JavierMatosD JavierMatosD merged commit b73601a into microsoft:master Aug 10, 2023
@lrineau lrineau deleted the cgal-5.6 branch August 10, 2023 19:44
sloriot added a commit to CGAL/cgal that referenced this pull request Aug 14, 2023
## Summary of Changes

Patch required for the acceptance of CGAL-5.6 in vcpkg. The CI system
tests on `x86_windows` (32 bits), and there was an error:
```
D:\installed\x86-windows\include\CGAL/cpp_float.h(30): error C3861: '_BitScanForward64': identifier not found
D:\installed\x86-windows\include\CGAL/cpp_float.h(42): error C3861: '_BitScanReverse64': identifier not found
```
See
microsoft/vcpkg#32896 (comment)

The solution is do disable support for Boost MP on Windows 32 bits. That
patch has been tested with the vcpkg CI, and it worked.

## Release Management

* Affected package(s): Number_types
* Issue(s) solved (if any): patch required by
microsoft/vcpkg#32896
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.

3 participants