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

[bdwgc] Update to v8.2.0 #20580

Merged
merged 1 commit into from
Oct 15, 2021
Merged

[bdwgc] Update to v8.2.0 #20580

merged 1 commit into from
Oct 15, 2021

Conversation

ivmai
Copy link
Contributor

@ivmai ivmai commented Oct 7, 2021

  • Remove 001-install-libraries.patch (all changes are in upstream)
  • Change REF from 0c8905e84 (old master) to v8.2.0
  • Remove -Dbuild_tests=OFF which is default one
  • Kill spaces at EOLn in portfile.cmake
  • Update version-string, reset port-version

Describe the pull request

  • What does your PR fix?

    Fixes #...

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

    <all / linux, windows, ...>, <Yes/No>

  • Does your PR follow the maintainer guide?

    Your answer

  • If you have added/updated a port: Have you run ./vcpkg x-add-version --all and committed the result?

    <Yes / I am still working on this PR>

If you are still working on the PR, open it as a Draft: https://github.blog/2019-02-14-introducing-draft-pull-requests/

@ghost
Copy link

ghost commented Oct 7, 2021

CLA assistant check
All CLA requirements met.

@ivmai
Copy link
Contributor Author

ivmai commented Oct 7, 2021

Hello @vicroms,
Could you please help with this PR? I don't understand why it fails.

@NancyLi1013 NancyLi1013 added the category:port-update The issue is with a library, which is requesting update new revision label Oct 8, 2021
Copy link

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is a new experimental fast check for PR issues. Please let us know if this bot is helpful!

All manifest files must be formatted

./vcpkg format-manifest ports/*/vcpkg.json

Diff
diff --git a/ports/bdwgc/vcpkg.json b/ports/bdwgc/vcpkg.json
index 7ba90a3..2d1c619 100644
--- a/ports/bdwgc/vcpkg.json
+++ b/ports/bdwgc/vcpkg.json
@@ -1,6 +1,5 @@
 {
   "name": "bdwgc",
   "version-string": "8.2.0",
-  "port-version": 0,
   "description": "The Boehm-Demers-Weiser conservative C/C++ Garbage Collector (libgc, bdwgc, boehm-gc)"
 }
After committing all other changes, the version database must be updated
git add -u && git commit
git checkout 973a7d517c09c8cfb7e6a548fcc260ca34ba7b60 -- versions
./vcpkg x-add-version --all
Diff
diff --git a/versions/b-/bdwgc.json b/versions/b-/bdwgc.json
index 010ba5c..cdcbf7b 100644
--- a/versions/b-/bdwgc.json
+++ b/versions/b-/bdwgc.json
@@ -1,7 +1,7 @@
 {
   "versions": [
     {
-      "git-tree": "bca46ae01e88c4109a79c0089756ea7aaf67fa8d",
+      "git-tree": "55303bc87f1621ac6cddc0f55eba57f92f5d06ca",
       "version-string": "8.2.0",
       "port-version": 0
     },

You have modified or added at least one portfile where deprecated functions are used.

If you feel able to do so, please consider migrating them to the new functions:
vcpkg_install_cmake -> vcpkg_cmake_install (from port vcpkg-cmake)
vcpkg_build_cmake -> vcpkg_cmake_build (from port vcpkg-cmake)
vcpkg_configure_cmake -> vcpkg_cmake_configure (Please remove the option PREFER_NINJA) (from port vcpkg-cmake)
vcpkg_fixup_cmake_targets -> vcpkg_cmake_config_fixup (from port vcpkg-cmake-config)

In the ports that use the new function, you have to add the corresponding dependencies:

{
  "name": "vcpkg-cmake",
  "host": true
},
{
  "name": "vcpkg-cmake-config",
  "host": true
}

The following files are affected:

  • ports/bdwgc/portfile.cmake

@ivmai
Copy link
Contributor Author

ivmai commented Oct 8, 2021

Builds are still failing

@ivmai
Copy link
Contributor Author

ivmai commented Oct 8, 2021

Is git-tree value correct?

@NancyLi1013
Copy link
Contributor

Please run vcpkg x-add-version bdwgc --overwrite-version to update git-tree value first.

For the failures are like this on x64-windows:

D:\buildtrees\bdwgc\src\v8.2.0-a140da6a73.clean\include\private\gc_atomic_ops.h(110): fatal error C1083: Cannot open include file: 'atomic_ops.h': No such file or directory

@ivmai ivmai force-pushed the update-libgc-8_0_6 branch from f220576 to 5a465e8 Compare October 8, 2021 18:15
@ivmai
Copy link
Contributor Author

ivmai commented Oct 8, 2021

D:\buildtrees\bdwgc\src\v8.2.0-a140da6a73.clean\include\private\gc_atomic_ops.h(110): fatal error C1083: Cannot open include file: 'atomic_ops.h': No such file or directory

Fixed (previously the build was single-threaded one, so I left it single-threaded after update).

@ivmai
Copy link
Contributor Author

ivmai commented Oct 8, 2021

Still failing, help is appreciated:

-- Performing post-build validation
/debug/share should not exist. Please reorganize any important files, then use
    file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
The /lib/cmake folder should be merged with /debug/lib/cmake and moved to /share/bdwgc/cmake.
Please use the helper function `vcpkg_fixup_cmake_targets()`
The following cmake files were found outside /share/bdwgc. Please place cmake files in /share/bdwgc.

    /Users/vagrant/Data/packages/bdwgc_x64-osx/lib/cmake/bdwgc/BDWgcTargets.cmake
    /Users/vagrant/Data/packages/bdwgc_x64-osx/lib/cmake/bdwgc/BDWgcConfig.cmake
    /Users/vagrant/Data/packages/bdwgc_x64-osx/lib/cmake/bdwgc/BDWgcTargets-release.cmake
    /Users/vagrant/Data/packages/bdwgc_x64-osx/lib/cmake/bdwgc/BDWgcConfigVersion.cmake
    /Users/vagrant/Data/packages/bdwgc_x64-osx/debug/lib/cmake/bdwgc/BDWgcTargets.cmake
    /Users/vagrant/Data/packages/bdwgc_x64-osx/debug/lib/cmake/bdwgc/BDWgcConfig.cmake
    /Users/vagrant/Data/packages/bdwgc_x64-osx/debug/lib/cmake/bdwgc/BDWgcTargets-debug.cmake
    /Users/vagrant/Data/packages/bdwgc_x64-osx/debug/lib/cmake/bdwgc/BDWgcConfigVersion.cmake

@ivmai ivmai force-pushed the update-libgc-8_0_6 branch from 5a465e8 to 4ae276e Compare October 8, 2021 18:36
@ivmai ivmai requested a review from NancyLi1013 October 8, 2021 18:39
@NancyLi1013
Copy link
Contributor

Sorry for the late response @ivmai.
Please use vcpkg_fixup_cmake_targets() to solve the current problems. https://github.com/microsoft/vcpkg/blob/master/docs/maintainers/vcpkg_fixup_cmake_targets.md

vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/bdwgc)

@ivmai ivmai force-pushed the update-libgc-8_0_6 branch 2 times, most recently from 35ceb2a to 050f9c8 Compare October 11, 2021 19:02
@ivmai
Copy link
Contributor Author

ivmai commented Oct 11, 2021

Sorry for the late response @ivmai. Please use vcpkg_fixup_cmake_targets() to solve the current problems. https://github.com/microsoft/vcpkg/blob/master/docs/maintainers/vcpkg_fixup_cmake_targets.md

vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/bdwgc)

Thank you @NancyLi1013,
I fixed that issue. Now arm and arm64 builds are failure. But it is unclear to me why.

@NancyLi1013
Copy link
Contributor

The failures on arm are like this:

4>D:\buildtrees\bdwgc\src\v8.2.0-a140da6a73.clean\extra\msvc_dbg.c(139,14): error C2065: 'STACKFRAME': undeclared identifier [D:\buildtrees\bdwgc\arm-uwp-dbg\gc.vcxproj]
     4>D:\buildtrees\bdwgc\src\v8.2.0-a140da6a73.clean\extra\msvc_dbg.c(139,14): error C2146: syntax error: missing ';' before identifier 'stackFrame' [D:\buildtrees\bdwgc\arm-uwp-dbg\gc.vcxproj]
     4>D:\buildtrees\bdwgc\src\v8.2.0-a140da6a73.clean\extra\msvc_dbg.c(139,25): error C2065: 'stackFrame': undeclared identifier [D:\buildtrees\bdwgc\arm-uwp-dbg\gc.vcxproj]
     4>D:\buildtrees\bdwgc\src\v8.2.0-a140da6a73.clean\extra\msvc_dbg.c(139,27): error C2059: syntax error: '{' [D:\buildtrees\bdwgc\arm-uwp-dbg\gc.vcxproj]
     4>D:\buildtrees\bdwgc\src\v8.2.0-a140da6a73.clean\extra\msvc_dbg.c(140,13): error C2065: 'stackFrame': undeclared identifier [D:\buildtrees\bdwgc\arm-uwp-dbg\gc.vcxproj]
     4>D:\buildtrees\bdwgc\src\v8.2.0-a140da6a73.clean\extra\msvc_dbg.c(140,14): error C2224: left of '.AddrPC' must have struct/union type [D:\buildtrees\bdwgc\arm-uwp-dbg\gc.vcxproj]
     4>D:\buildtrees\bdwgc\src\v8.2.0-a140da6a73.clean\extra\msvc_dbg.c(140,45): error C2065: 'AddrModeFlat': undeclared identifier [D:\buildtrees\bdwgc\arm-uwp-dbg\gc.vcxproj]
     4>D:\buildtrees\bdwgc\src\v8.2.0-a140da6a73.clean\extra\msvc_dbg.c(164,1): fatal error C1189: #error:  Unknown CPU [D:\buildtrees\bdwgc\arm-uwp-dbg\gc.vcxproj]

@ivmai
Copy link
Contributor Author

ivmai commented Oct 12, 2021

The failures on arm are like this

Got it, I'll fix it.

D:\buildtrees\bdwgc\src\v8.2.0-a140da6a73.clean\extra\msvc_dbg.c(139,14): error C2065: 'STACKFRAME': undeclared identifier [D:\buildtrees\bdwgc\arm-uwp-dbg\gc.vcxproj]

How to see this in the build logs? Probably I've overlooked it.

@NancyLi1013
Copy link
Contributor

@ivmai ivmai force-pushed the update-libgc-8_0_6 branch from 050f9c8 to 9351e86 Compare October 12, 2021 09:52
@ivmai
Copy link
Contributor Author

ivmai commented Oct 12, 2021

All checks passed, waiting for the review.

@ivmai
Copy link
Contributor Author

ivmai commented Oct 12, 2021

I don't understand the requested changes by the bot.

Copy link

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You have modified or added at least one portfile where deprecated functions are used.

If you feel able to do so, please consider migrating them to the new functions:
vcpkg_install_cmake -> vcpkg_cmake_install (from port vcpkg-cmake)
vcpkg_build_cmake -> vcpkg_cmake_build (from port vcpkg-cmake)
vcpkg_configure_cmake -> vcpkg_cmake_configure (Please remove the option PREFER_NINJA) (from port vcpkg-cmake)
vcpkg_fixup_cmake_targets -> vcpkg_cmake_config_fixup (from port vcpkg-cmake-config)

In the ports that use the new function, you have to add the corresponding dependencies:

{
  "name": "vcpkg-cmake",
  "host": true
},
{
  "name": "vcpkg-cmake-config",
  "host": true
}

The following files are affected:

  • ports/bdwgc/portfile.cmake

* Remove 001-install-libraries.patch (all changes are in upstream)

* Change REF from 0c8905e84 (old master) to 59f15da55 (v8.2.0-20211013)

* Remove -Dbuild_tests=OFF which is default one

* Kill spaces at EOLn in portfile.cmake

* Update version, reset port-version
@ivmai ivmai force-pushed the update-libgc-8_0_6 branch from 9351e86 to f6f0d0f Compare October 13, 2021 06:27
Copy link

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You have modified or added at least one portfile where deprecated functions are used.

If you feel able to do so, please consider migrating them to the new functions:
vcpkg_install_cmake -> vcpkg_cmake_install (from port vcpkg-cmake)
vcpkg_build_cmake -> vcpkg_cmake_build (from port vcpkg-cmake)
vcpkg_configure_cmake -> vcpkg_cmake_configure (Please remove the option PREFER_NINJA) (from port vcpkg-cmake)
vcpkg_fixup_cmake_targets -> vcpkg_cmake_config_fixup (from port vcpkg-cmake-config)

In the ports that use the new function, you have to add the corresponding dependencies:

{
  "name": "vcpkg-cmake",
  "host": true
},
{
  "name": "vcpkg-cmake-config",
  "host": true
}

The following files are affected:

  • ports/bdwgc/portfile.cmake

@NancyLi1013 NancyLi1013 added the info:reviewed Pull Request changes follow basic guidelines label Oct 14, 2021
@vicroms vicroms merged commit 1ea8d69 into microsoft:master Oct 15, 2021
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