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

[VTK] VTK ExprTk cmake patch #30058

Closed
wants to merge 11 commits into from
Closed

[VTK] VTK ExprTk cmake patch #30058

wants to merge 11 commits into from

Conversation

ArashPartow
Copy link
Contributor

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

This patch is intended to unblock the following PR: #29665

and is based on the following VTK MR: https://gitlab.kitware.com/vtk/vtk/-/merge_requests/9981

@dg0yt
Copy link
Contributor

dg0yt commented Mar 7, 2023

Previously submitted as #29801 and #29955. Again, please don't restart fresh PRs unless really needed.

@ArashPartow
Copy link
Contributor Author

ArashPartow commented Mar 7, 2023

@MonicaLiu0311 this PR is currently blocking #29665 and an upcoming VTK version refresh.

@JonLiu1993 JonLiu1993 added category:port-update The issue is with a library, which is requesting update new revision category:vcpkg-feature The issue is a new capability of the tool that doesn’t already exist and we haven’t committed category:port-feature The issue is with a library, which is requesting new capabilities that didn’t exist and removed category:port-update The issue is with a library, which is requesting update new revision category:vcpkg-feature The issue is a new capability of the tool that doesn’t already exist and we haven’t committed labels Mar 7, 2023
JonLiu1993
JonLiu1993 previously approved these changes Mar 7, 2023
@JonLiu1993 JonLiu1993 added the info:reviewed Pull Request changes follow basic guidelines label Mar 7, 2023
@ArashPartow ArashPartow requested a review from JonLiu1993 March 7, 2023 12:03
Copy link
Member

@BillyONeal BillyONeal left a comment

Choose a reason for hiding this comment

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

I agree with @dg0yt , please do not close and create new PRs with no changes in content, and/or at least describe the history of how the changes got there.

It seems that the patch could be reduced to one line, removing the "2.71828"?

ports/vtk/FindExprTk.patch Outdated Show resolved Hide resolved
ports/vtk/FindExprTk.patch Outdated Show resolved Hide resolved
+ break()
+ endif ()
+ endforeach ()
+ if (NOT ExprTk_VERSION)
Copy link
Member

Choose a reason for hiding this comment

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

ExprTk_VERSION seems to be unused; could you just remove this entirely rather than trying to fix it in a patch?

Copy link
Member

Choose a reason for hiding this comment

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

(To clarify, I don't mean patching this out, I mean just not doing this part of the patch since it seems like nobody is listening to the answer)

Copy link
Member

Choose a reason for hiding this comment

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

Copy link
Contributor Author

@ArashPartow ArashPartow Mar 7, 2023

Choose a reason for hiding this comment

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

Objective is to unblock and merge the following PR: #29665 which has been in limbo for nearly 2 months.

The primary reason for this seems to be an implicit cyclic dependency that comes about due to how vcpkg has been architected.

@ArashPartow ArashPartow requested review from BillyONeal and removed request for JonLiu1993 March 7, 2023 20:23
@dan-shaw dan-shaw added requires:author-response and removed info:reviewed Pull Request changes follow basic guidelines labels Mar 7, 2023
@ArashPartow
Copy link
Contributor Author

ArashPartow commented Mar 7, 2023

@BillyONeal : We've gone from an all builds and green ticks to all failures post your proposed changes. As such all your proposed changes will now have to reverted as they fail when being applied to the main VTK cmake.


2023-03-07T20:26:49.9269762Z -- Applying patch FindExprTk.patch
2023-03-07T20:26:49.9512547Z CMake Error at scripts/cmake/z_vcpkg_apply_patches.cmake:34 (message):
2023-03-07T20:26:49.9518373Z   Applying patch failed: error: corrupt patch at line 11
2023-03-07T20:26:49.9521677Z 
2023-03-07T20:26:49.9527802Z Call Stack (most recent call first):
2023-03-07T20:26:49.9534153Z   scripts/cmake/vcpkg_extract_source_archive.cmake:153 (z_vcpkg_apply_patches)
2023-03-07T20:26:49.9540264Z   scripts/cmake/vcpkg_extract_source_archive_ex.cmake:8 (vcpkg_extract_source_archive)
2023-03-07T20:26:49.9546238Z   scripts/cmake/vcpkg_from_github.cmake:113 (vcpkg_extract_source_archive_ex)
2023-03-07T20:26:49.9552209Z   ports/vtk/portfile.cmake:17 (vcpkg_from_github)
2023-03-07T20:26:49.9558579Z   scripts/ports.cmake:147 (include)
2023-03-07T20:26:49.9561814Z 

@BillyONeal
Copy link
Member

@BillyONeal : We've gone from an all builds and green ticks to all failures post your proposed changes. As such all your proposed changes will now have to reverted as they fail when being applied to the main VTK cmake.

I was saying "these are the changes that should happen in the source"; I agree with @dg0yt that you are intending to search for . but are actually searching for "any character"

Objective is to unblock and merge the following PR: #29665 which has been in limbo for nearly 2 months.

Doing things like closing and reopening the PR as a different number makes that situation worse as you go to the back of the queue each time.

That PR being blocked for months doesn't alter our responsibilities to be extremely limited in the patches we author because we are not the owners of the code bases in question. (We do not want to create a CVE-2008-0166 / https://wiki.debian.org/SSLkeys situation)

I didn't write this patch, it was done by VTK group: https://gitlab.kitware.com/vtk/vtk/-/merge_requests/9981
I'd rather keep things as-is and minimise the difference between what is in the VTK project and in vcpkg

OK, can you download the patch ( https://gitlab.kitware.com/vtk/vtk/-/merge_requests/9981.patch) and apply it that way instead so that it's clear any problems with it are out of our hands?

@ArashPartow
Copy link
Contributor Author

ArashPartow commented Mar 16, 2023

@BillyONeal that was the very patch I was originally applying, The same one people in other (and this one) PRs keep on preventing said PRs from being merged by requesting changes and needless commons - which I've mentioned over and over again.


ToDo:

I'm going to close this PR and start a fresh one, Once a successful builds and all green ticks, lets merge it without anymore handwaiving and dramas.

@JonLiu1993 hopefully we are in agreement. 👍

@JonLiu1993
Copy link
Member

@BillyONeal that was the very patch I was originally applying, The same one people in other (and this one) PRs keep on preventing said PRs from being merged by requesting changes and needless commons - which I've mentioned over and over again.

ToDo:

I'm going to close this PR and start a fresh one, Once a successful builds and all green ticks, lets merge it without anymore handwaiving and dramas.

@JonLiu1993 hopefully we are in agreement. 👍

@ArashPartow, Thanks your PR again, but we really don't agree to frequently close new PRs. This is not only not conducive to your PR being merged as soon as possible, but also increases the workload of CI. I hope you understand.

@ArashPartow
Copy link
Contributor Author

ArashPartow commented Mar 16, 2023

@JonLiu1993 I'm happy to continue with this PR - though I'm not sure how it increases the CI workload as the jobs will run on this PR or on a new one so same number of clock cycles either way for every change made to the PR(s).


My only concern is that a fresh PR with only 1 comment will be quicker to review/ merge than having others go through all the comments in say this PR to only come to the conclusion that the initial commit was what was needed all along.

In any case I'll clean this PR up and hopefully we can get this merged as soon as possible as the following PR: #29665 is still waiting on this PR to be merged.

@JonLiu1993
Copy link
Member

Pinging @ArashPartow for response. Is work still being done for this PR?

@JonLiu1993
Copy link
Member

@BillyONeal @vicroms , the VTK upstream master currently contains the FindExprTk.patch changes,
But VTK has not released the latest stable version at present. I use the latest commit of VTK to update VTK on the local computer and try to upgrade the port exprtk in PR #29665 successfully.
I wonder if we now wait for VTK to release the latest stable version, or make a patch for this fix and apply it to the current version of VTK?

@BillyONeal
Copy link
Member

I wonder if we now wait for VTK to release the latest stable version, or make a patch for this fix and apply it to the current version of VTK?

I would be willing to take the patch provided it is demonstrated that upstream is already likely to ship the thing updated soon but build needs to be working first of course :)

@JonLiu1993
Copy link
Member

Convert this PR to draft since there is no progress. Please ping us if this PR is ready for review again.

@JonLiu1993 JonLiu1993 marked this pull request as draft May 6, 2023 10:21
@dan-shaw
Copy link
Contributor

dan-shaw commented Jun 7, 2023

Closing this PR as it has not been updated for the past few months

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
category:port-feature The issue is with a library, which is requesting new capabilities that didn’t exist
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants