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.

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

[libspatialindex] Update to 1.9.3 #17506

Merged
merged 12 commits into from
May 26, 2021
Merged

[libspatialindex] Update to 1.9.3 #17506

merged 12 commits into from
May 26, 2021

Conversation

longhuan2018
Copy link
Contributor

update libspatialindex to 1.9.3

@NancyLi1013 NancyLi1013 self-assigned this Apr 26, 2021
@NancyLi1013 NancyLi1013 added the category:port-update The issue is with a library, which is requesting update new revision label Apr 26, 2021
NancyLi1013
NancyLi1013 suggested changes Apr 26, 2021
View reviewed changes
ports/libspatialindex/portfile.cmake Outdated Show resolved Hide resolved
ports/libspatialindex/portfile.cmake Outdated Show resolved Hide resolved
@NancyLi1013
Copy link
Contributor

Failed on x64-windows-static and x64-windows-static-md:

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

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

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

    if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
        file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin")
    endif()

Found 2 error(s). Please correct the portfile:

NancyLi1013
NancyLi1013 suggested changes Apr 30, 2021
View reviewed changes
ports/libspatialindex/portfile.cmake Outdated Show resolved Hide resolved
ports/libspatialindex/portfile.cmake Outdated Show resolved Hide resolved
longhuan2018 and others added 3 commits April 30, 2021 09:52
@longhuan2018 @NancyLi1013
Update ports/libspatialindex/portfile.cmake
86857f5 
Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com>
@longhuan2018 @NancyLi1013
Update ports/libspatialindex/portfile.cmake
e6ddd12 
Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com>
@longhuan2018
Update libspatialindex.json
430a5ca
NancyLi1013
NancyLi1013 suggested changes May 7, 2021
View reviewed changes
ports/libspatialindex/portfile.cmake Outdated Show resolved Hide resolved
@longhuan2018 @NancyLi1013
Update ports/libspatialindex/portfile.cmake
5a6a0e5 
Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com>
@NancyLi1013
Copy link
Contributor

Please run vcpkg x-add-version libspatialindex to solve the failures on x86-windows.

@NancyLi1013 NancyLi1013 added info:reviewed Pull Request changes follow basic guidelines and removed requires:author-response labels May 8, 2021
@NancyLi1013
Copy link
Contributor

LGTM now, thanks for your update @longhuan2018.

@JonLiu1993 JonLiu1993 mentioned this pull request May 21, 2021
Closed
@m-kuhn m-kuhn mentioned this pull request May 21, 2021
Merged
m-kuhn added a commit to opengisch/libspatialindex that referenced this pull request May 22, 2021
@m-kuhn
Fix building static libs
97b986f 
Port of microsoft/vcpkg#17506
m-kuhn added a commit to opengisch/libspatialindex that referenced this pull request May 22, 2021
@m-kuhn
Fix building static libs
bba86e1 
Port of microsoft/vcpkg#17506
m-kuhn added a commit to opengisch/libspatialindex that referenced this pull request May 22, 2021
@m-kuhn
Fix building static libs
12f3e54 
Port of microsoft/vcpkg#17506
@m-kuhn m-kuhn mentioned this pull request May 22, 2021
Merged
@m-kuhn
Copy link
Contributor

m-kuhn commented May 22, 2021

@longhuan2018 I created a PR upstream in anticipation of an easier upgrade path in the future

@m-kuhn m-kuhn mentioned this pull request May 22, 2021
Closed
m-kuhn added a commit to opengisch/libspatialindex that referenced this pull request May 24, 2021
@m-kuhn
Fix building static libs
5a23e27 
Port of microsoft/vcpkg#17506
@strega-nil-ms
Copy link
Contributor

LGTM, thanks @longhuan2018 :)

@strega-nil-ms strega-nil-ms merged commit 8c242b4 into microsoft:master May 26, 2021
m-kuhn added a commit to opengisch/libspatialindex that referenced this pull request Jun 14, 2022
@m-kuhn
Fix building static libs
a6f5ebd 
Port of microsoft/vcpkg#17506
hobu pushed a commit to libspatialindex/libspatialindex that referenced this pull request Jun 17, 2022
@m-kuhn
Fix building static libs (#223)
ab1a031 
* Fix building static libs

Port of microsoft/vcpkg#17506

* Add static builds to ci

* Fix win vars

* Test for static builds

* Update test.yml
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@NancyLi1013 NancyLi1013 NancyLi1013 approved these changes

Assignees

@NancyLi1013 NancyLi1013

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
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@longhuan2018 @NancyLi1013 @m-kuhn @strega-nil-ms