[geos] Relocatable geos-config; dynamic builds on Unix by dg0yt · Pull Request #17616 · microsoft/vcpkg

dg0yt · 2021-05-01T17:16:19Z

What does your PR fix?

This PR
- makes geos-config relocatable, and adds a geos-config-debug for the debug build,
  as a step towards solving the gdal port issues ([GDAL] On Linux completly broken #9068, [gdal] linux build does not get dependencies from vcpkg #8943)
- fixes dynamic builds on Unix systems (x64-dynamic-linux build problem for geos (Geometry Engine Open Source) #16602, [geos] build failure dynamic linkage #11681)
Which triplets are supported/not supported? Have you updated the CI baseline?

unchanged, no
Does your PR follow the maintainer guide?

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

yes

I still need to test the latest state with my gdal branch, but it is ready for vcpkg CI. The question in #17607 are related, too.

ras0219-msft · 2021-05-03T18:44:43Z

ports/geos/portfile.cmake

+    string(REGEX REPLACE "(-lgeos(_c)?)d?( |\n)" "\\1d\\3" GEOS_CONFIG "${GEOS_CONFIG}")
+    file(WRITE "${CURRENT_PACKAGES_DIR}/debug/bin/geos-config" "${GEOS_CONFIG}")
+    file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/share/${PORT})
+    file(RENAME ${CURRENT_PACKAGES_DIR}/debug/bin/geos-config ${CURRENT_PACKAGES_DIR}/share/${PORT}/geos-config-debug)


Can you give an example of how this would be consumed? My understanding is that xyz-config scripts like this are usually referred to like "${XYZ_ROOT}/xyz-config" and so having xyz-config-debug won't be directly usable. Instead, we should provide debug/share/geos/geos-config and set GEOS_ROOT to debug/share/geos when in debug mode.

gdal configure says:

--with-geos=ARG Include GEOS support (ARG=yes, no or geos-config path)

and similar for curl, kea, sfcgal.

So this is to be consumed in the gdal portfile by:

list(APPEND OPTIONS_RELEASE --with-geos=${CURRENT_INSTALLED_DIR}/share/geos/geos-config) list(APPEND OPTIONS_DEBUG --with-geos=${CURRENT_INSTALLED_DIR}/share/geos/geos-config-debug)

I tested this locally, but this just one out of a pile of pending changes.

provide debug/share/geos/geos-config and set set GEOS_ROOT to debug/share/geos

If I adopt this: Outside vcpkg, the <package>_ROOT variable generally (e.g. in CMake find modules) means the installation prefix, i.e. ${CURRENT_INSTALLED_DIR}.
As a consumer in a port file, I would still have to assign the roots to per-build-type parameters because the build types are handled deeper down in the cmake call stack.

provide debug/share/geos/geos-config

I tried that when preparing the PR, and I verified today: It leads into a build error:

-- Performing post-build validation /debug/share should not exist. Please reorganize any important files, then use file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")

Which file is in ${CURRENT_PACKAGES_DIR}/debug/share?

Which file is in ${CURRENT_PACKAGES_DIR}/debug/share?

None with the current PR. @ras0219-msft proposed to have debug/share/geos/geos-config, and I reported what would be the result.

The alternative to fixing geos-config, curl-config etc. is forcing the consumers to use pkg-config where possible, by removing these files. Consumers also need to know whether to ask the scripts for static or standard flags, and this is solved for PKG_CONFIG.
E.g. port gdal will need a number of patches anyway, e.g. to use pkg-config for tiff.

JackBoosY · 2021-05-06T03:05:17Z

Ping @ras0219-msft for review this PR again.

dg0yt · 2021-05-08T10:13:02Z

More side notes:

This port sets the debug postfix ('d'). This might be contrary to the current maintainer guidelines. git grep geosd finds a small number of ports which depend on this.
pc files do not carry the debug postfix.
pc files are not passed to fixup. (Prefix pointing to packages.)
Static linking dependencies are incomplete in the pc files.

dg0yt · 2021-05-12T05:28:11Z

Will add pc file handling soon.

Fixup pc files. Add -lgeos to Libs.private to satisfy common usage requirement (already present in geos-config). Install executable geos-config into tools. Rewrite geos-config relocatability as patch.

dg0yt · 2021-05-22T14:59:17Z

New changes:

pc files rectified.
geos-config moved to tools/bin and tools/debug/bin.
Ported to vcpkg_configure_....
Building of benchmarks disabled.
Usage instructions added.

ports/geos/portfile.cmake

strega-nil-ms · 2021-05-26T20:28:59Z

Cool, LGTM! Thanks @dg0yt :)

dg0yt added 2 commits May 1, 2021 17:23

Provide geos-config, and fix dynamic builds on Unix

89893b6

x-add-version

9a238b5

dg0yt changed the title ~~[geos] Provide geos-config; fix dynamic builds on Unix~~ [geos] Relocatable geos-config; dynamic builds on Unix May 1, 2021

dg0yt marked this pull request as ready for review May 2, 2021 04:04

JackBoosY self-assigned this May 2, 2021

JackBoosY added category:port-bug The issue is with a library, which is something the port should already support category:port-feature The issue is with a library, which is requesting new capabilities that didn’t exist labels May 2, 2021

JackBoosY approved these changes May 2, 2021

View reviewed changes

JackBoosY added the info:needs-maintainer-attention Lets the current 'on rotation' vcpkg maintainer know they need to look at this. label May 2, 2021

dg0yt added 2 commits May 3, 2021 19:11

Fix debug suffix handling

8f8e29b

Update git-tree

0fbdfa8

ras0219-msft reviewed May 3, 2021

View reviewed changes

dg0yt mentioned this pull request May 5, 2021

[GDAL] On Linux completly broken #9068

Closed

JackBoosY removed the info:needs-maintainer-attention Lets the current 'on rotation' vcpkg maintainer know they need to look at this. label May 5, 2021

JackBoosY requested a review from ras0219-msft May 6, 2021 03:05

JackBoosY added the requires:discussion label May 10, 2021

dg0yt mentioned this pull request May 11, 2021

[curl] Fix linker flags in curl-config and libcurl.pc for osx #17790

Merged

dg0yt marked this pull request as draft May 12, 2021 05:27

This was referenced May 16, 2021

[vcpkg] Don't override pkg-config prefix #17205

Merged

[GEOS] Generate debug library names with d suffix #3371

Merged

dg0yt added 4 commits May 22, 2021 07:30

Don't build benchmarks

d222d85

Revise pc file and geos-config handling

6c2680b

Fixup pc files. Add -lgeos to Libs.private to satisfy common usage requirement (already present in geos-config). Install executable geos-config into tools. Rewrite geos-config relocatability as patch.

Port to non-deprecated cmake functions

9751a28

Add usage

ab8c1d3

dg0yt force-pushed the geos branch from e8a805c to db91499 Compare May 22, 2021 13:43

Update git-tree

f90497f

dg0yt force-pushed the geos branch from db91499 to f90497f Compare May 22, 2021 14:24

dg0yt marked this pull request as ready for review May 22, 2021 14:59

JackBoosY suggested changes May 24, 2021

View reviewed changes

ports/geos/portfile.cmake Show resolved Hide resolved

JackBoosY approved these changes May 24, 2021

View reviewed changes

JackBoosY added the info:needs-maintainer-attention Lets the current 'on rotation' vcpkg maintainer know they need to look at this. label May 24, 2021

strega-nil-ms merged commit f0b32c5 into microsoft:master May 26, 2021

This was referenced May 27, 2021

x64-dynamic-linux build problem for geos (Geometry Engine Open Source) #16602

Closed

[geos] build failure dynamic linkage #11681

Closed

dg0yt deleted the geos branch May 29, 2021 08:33

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[geos] Relocatable geos-config; dynamic builds on Unix#17616

[geos] Relocatable geos-config; dynamic builds on Unix#17616
strega-nil-ms merged 9 commits intomicrosoft:masterfrom
dg0yt:geos

dg0yt commented May 1, 2021

Uh oh!

ras0219-msft May 3, 2021

Uh oh!

dg0yt May 4, 2021

Uh oh!

dg0yt May 4, 2021

Uh oh!

dg0yt May 4, 2021

Uh oh!

JackBoosY May 5, 2021

Uh oh!

dg0yt May 5, 2021

Uh oh!

dg0yt May 5, 2021

Uh oh!

JackBoosY commented May 6, 2021

Uh oh!

dg0yt commented May 8, 2021

Uh oh!

dg0yt commented May 12, 2021

Uh oh!

dg0yt commented May 22, 2021

Uh oh!

Uh oh!

strega-nil-ms commented May 26, 2021

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

Conversation

dg0yt commented May 1, 2021

What does your PR fix?

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

Does your PR follow the maintainer guide?

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

Uh oh!

ras0219-msft May 3, 2021

Choose a reason for hiding this comment

Uh oh!

dg0yt May 4, 2021

Choose a reason for hiding this comment

Uh oh!

dg0yt May 4, 2021

Choose a reason for hiding this comment

Uh oh!

dg0yt May 4, 2021

Choose a reason for hiding this comment

Uh oh!

JackBoosY May 5, 2021

Choose a reason for hiding this comment

Uh oh!

dg0yt May 5, 2021

Choose a reason for hiding this comment

Uh oh!

dg0yt May 5, 2021

Choose a reason for hiding this comment

Uh oh!

JackBoosY commented May 6, 2021

Uh oh!

dg0yt commented May 8, 2021

Uh oh!

dg0yt commented May 12, 2021

Uh oh!

dg0yt commented May 22, 2021

Uh oh!

Uh oh!

strega-nil-ms commented May 26, 2021

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

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