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

[libspatialindex] Update to 1.9.3 #18040

Closed
wants to merge 1 commit into from

Conversation

m-kuhn
Copy link
Contributor

@m-kuhn m-kuhn commented May 21, 2021

No description provided.

@JonLiu1993 JonLiu1993 self-assigned this May 21, 2021
@JonLiu1993 JonLiu1993 added the category:port-update The issue is with a library, which is requesting update new revision label May 21, 2021
Copy link
Member

@JonLiu1993 JonLiu1993 left a comment

Choose a reason for hiding this comment

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

When updating the port, we need to update the CONTROL file and portfile.cmake

@m-kuhn
Copy link
Contributor Author

m-kuhn commented May 21, 2021

When updating the port, we need to update the CONTROL file and portfile.cmake

Anything I can do?

@m-kuhn
Copy link
Contributor Author

m-kuhn commented May 21, 2021

Update with what exactly?

@JonLiu1993
Copy link
Member

Update with what exactly?

Please run the command "./vcpkg x-add-version libspatialindex --overwrite-version" and submit again

@m-kuhn
Copy link
Contributor Author

m-kuhn commented May 21, 2021

Thanks for the hint, PR updated

@m-kuhn m-kuhn force-pushed the libspatialindex_1_9_3 branch 2 times, most recently from 99967f5 to 6cfb3ab Compare May 21, 2021 06:14
@dg0yt
Copy link
Contributor

dg0yt commented May 21, 2021

Hi Matthias,

you must first commit all changes in port/*, then do the x-add-version stuff in a separate commit.

Best regards, Kai

@JonLiu1993
Copy link
Member

@m-kuhn , @dg0yt gave you a good suggestion

@m-kuhn
Copy link
Contributor Author

m-kuhn commented May 21, 2021

Thanks Kai, I hope ci is happy now.

@dg0yt
Copy link
Contributor

dg0yt commented May 21, 2021

Thanks Kai, I hope ci is happy now.

Not yet. A single commit is never enough.
Re-run vcpkg x-add-version --overwrite-version libspatialindex. Then add the changes in a separate commit.
The point is that this adds a reference to a particular git tree element (versions/* refering to a particular state of ports/*). If you squash the changes, you would need to know the resulting reference in advance, but this is impossible.

Normally I would also suggest to first run vcpkg format-manifest ports/libspatialindex/CONTROL in order to convert away from the deprecated CONTROL format, but I don't want to ask too much at the moment ;-)

@dg0yt
Copy link
Contributor

dg0yt commented May 21, 2021

Please add commits as requested, and push normally. Force-pushing a single commit is going to fail. The last commit must be the change from vcpkg x-add-version.

@m-kuhn
Copy link
Contributor Author

m-kuhn commented May 21, 2021

I think the culprit here is static builds

DLLs should not be present in a static build, but the following DLLs were found:

D:/packages/libspatialindex_x64-windows-static-md/bin/spatialindex-64.dll
D:/packages/libspatialindex_x64-windows-static-md/bin/spatialindex_c-64.dll
D:/packages/libspatialindex_x64-windows-static-md/debug/bin/spatialindex-64d.dll
D:/packages/libspatialindex_x64-windows-static-md/debug/bin/spatialindex_c-64d.dll

There should be no bin\ directory in a static build, but D:\packages\libspatialindex_x64-windows-static-md\bin is present.
There should be no debug\bin\ directory in a static build, but D:\packages\libspatialindex_x64-windows-static-md\debug\bin is present.
If the creation of bin\ and/or debug\bin\ cannot be disabled, use this in the portfile to remove them

@JonLiu1993
Copy link
Member

@m-kuhn ,Thanks for your pr, Duplicate of #17506

@JonLiu1993 JonLiu1993 closed this May 21, 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
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants