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

[geos,libspatialite] Fix various quirks #35574

Merged
merged 2 commits into from
Dec 12, 2023
Merged

Conversation

dg0yt
Copy link
Contributor

@dg0yt dg0yt commented Dec 9, 2023

geos

Don't hard-code libstdc++ dependency.

libspatialite

Always build as if cross-compiling. Fixes #33840, rpath trouble in dynamic triplets.
Drop obsolete feature.
Don't depend on default features of libxml2.

@@ -66,11 +66,11 @@ index 6eff1eb14..8827f6ac6 100644
;;
--static-clibs)
- echo -L${libdir} -lgeos_c -lgeos -lstdc++ -lm
+ echo -L${libdir} -lgeos_c -lgeos -lstdc++ @EXTRA_LIBS@
+ echo -L${libdir} -lgeos_c -lgeos @EXTRA_LIBS@
Copy link
Contributor Author

Choose a reason for hiding this comment

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

The patch puts the desired C++ lib into EXTRA_LIBS.

Comment on lines -44 to -46
"geocallbacks": {
"description": "Geometry callbacks support."
},
Copy link
Contributor Author

Choose a reason for hiding this comment

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

This option no longer exists in the package.

@dg0yt dg0yt marked this pull request as ready for review December 9, 2023 06:21
@jimwang118 jimwang118 added the category:port-bug The issue is with a library, which is something the port should already support label Dec 11, 2023
@jimwang118
Copy link
Contributor

All features passed with following triplets:

x86-windows
x64-windows
x64-windows-static

@jimwang118 jimwang118 added the info:reviewed Pull Request changes follow basic guidelines label Dec 11, 2023
@vicroms vicroms merged commit 603643d into microsoft:master Dec 12, 2023
15 checks passed
autoantwort pushed a commit to autoantwort/vcpkg that referenced this pull request Dec 13, 2023
* [geos] Fix geos-config

* [libspatialite] Fix quirks
@dg0yt dg0yt deleted the geos-dynamic branch December 13, 2023 03:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
category:port-bug The issue is with a library, which is something the port should already support info:reviewed Pull Request changes follow basic guidelines
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[libspatialite] Build error
3 participants