[libspatialite] Use pkgconfig for nmake and autotools by dg0yt · Pull Request #20480 · microsoft/vcpkg

dg0yt · 2021-10-02T19:47:07Z

What does your PR fix?
- Use pkg-config for determining libraries to pass even to nmake, instead of hardcoding.
  Needed to allow features in dependencies.
- Fix building with mingw
- Install pc file for windows
- Add feature interface
Which triplets are supported/not supported? Have you updated the CI baseline?

all, yes
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

github-actions

This is a new experimental fast check for PR issues. Please let us know if this bot is helpful!

After committing all other changes, the version database must be updated

git add -u && git commit
git checkout 2a31089e777fc187f1cc05338250b8e1810cfb52 -- versions
./vcpkg x-add-version --all

Diff

diff --git a/versions/l-/libspatialite.json b/versions/l-/libspatialite.json
index 1e8dd8d..54f66e8 100644
--- a/versions/l-/libspatialite.json
+++ b/versions/l-/libspatialite.json
@@ -1,7 +1,7 @@
 {
   "versions": [
     {
-      "git-tree": "22ad27813f5f3bc3382718115ce3eb5a45174afd",
+      "git-tree": "6dc8227e99fb6e52b3102f8a076c32f78a0e7285",
       "version": "5.0.1",
       "port-version": 0
     },

github-actions

This is a new experimental fast check for PR issues. Please let us know if this bot is helpful!

After committing all other changes, the version database must be updated

git add -u && git commit
git checkout 2a31089e777fc187f1cc05338250b8e1810cfb52 -- versions
./vcpkg x-add-version --all

Diff

diff --git a/versions/l-/libspatialite.json b/versions/l-/libspatialite.json
index 1e8dd8d..e7ff6b2 100644
--- a/versions/l-/libspatialite.json
+++ b/versions/l-/libspatialite.json
@@ -1,7 +1,7 @@
 {
   "versions": [
     {
-      "git-tree": "22ad27813f5f3bc3382718115ce3eb5a45174afd",
+      "git-tree": "4cdba16dd948881b12ad8b7b841d69e60a6a5e33",
       "version": "5.0.1",
       "port-version": 0
     },

github-actions

This is a new experimental fast check for PR issues. Please let us know if this bot is helpful!

After committing all other changes, the version database must be updated

git add -u && git commit
git checkout 2a31089e777fc187f1cc05338250b8e1810cfb52 -- versions
./vcpkg x-add-version --all

Diff

diff --git a/versions/l-/libspatialite.json b/versions/l-/libspatialite.json
index 1e8dd8d..645efc9 100644
--- a/versions/l-/libspatialite.json
+++ b/versions/l-/libspatialite.json
@@ -1,7 +1,7 @@
 {
   "versions": [
     {
-      "git-tree": "22ad27813f5f3bc3382718115ce3eb5a45174afd",
+      "git-tree": "e53c784258eff41f93fd2c94368935f3861dbc10",
       "version": "5.0.1",
       "port-version": 0
     },

github-actions

This is a new experimental fast check for PR issues. Please let us know if this bot is helpful!

PRs must add only one version and must not modify any published versions

When making any changes to a library, the version or port-version in vcpkg.json or CONTROL must be modified.

Error: Local changes detected for libspatialite but no changes to version or port version.
-- Version: 5.0.0#3
-- Old SHA: d7d124e4fcb212dba3d650817056ce23b6dc2a2f
-- New SHA: 1451d331c4c79f5baab92209c85283a9d6ed9eaa
-- Did you remember to update the version or port version?
-- Pass `--overwrite-version` to bypass this check.
***No files were updated.***

Neumann-A · 2021-10-03T06:50:58Z

I have the feeling you want to pass '--msvc-syntax' to pkg-config and avoid the transformation?

dg0yt · 2021-10-03T08:12:19Z

I have the feeling you want to pass '--msvc-syntax' to pkg-config and avoid the transformation?

Possibly, yes. TBH I know the option but I don't know enough about nmake to know for sure. I only see explicit FOO_LIBS=D:/some_path/z.lib, while the output from pkg-config is:

$ pkg-config.exe --libs --msvc-syntax zlib
/libpath:D:/msys64/mingw64/lib z.lib

If it is so easy, why all these explicit paths e.g. in https://github.com/microsoft/vcpkg/blob/master/ports/gdal/dependency_win.cmake? I'm really curious, because this nmake dependency stuff is a blocker for improvements.

Neumann-A · 2021-10-03T08:37:28Z

It simply predates the pkg-config stuff and nobody tried to change it yet because it could be a headache to get it to work again. I only introduced the pkg-config stuff in qt5-base because it fixed a CI build order/dependency regression.

github-actions

This is a new experimental fast check for PR issues. Please let us know if this bot is helpful!

PRs must add only one version and must not modify any published versions

When making any changes to a library, the version or port-version in vcpkg.json or CONTROL must be modified.

Error: Local changes detected for geos but no changes to version or port version.
-- Version: 3.9.1#2
-- Old SHA: 149daa68785ac3796019e4489a6d966fb8cc4cc5
-- New SHA: 12e0860d9b7dc52b93f83b7d6f94e4bb5a1c85c4
-- Did you remember to update the version or port version?
-- Pass `--overwrite-version` to bypass this check.
***No files were updated.***
Error: Local changes detected for libspatialite but no changes to version or port version.
-- Version: 5.0.0#3
-- Old SHA: d7d124e4fcb212dba3d650817056ce23b6dc2a2f
-- New SHA: 82b7c49ffb68f8997a440a9ecdbf4611ea6ee12e
-- Did you remember to update the version or port version?
-- Pass `--overwrite-version` to bypass this check.
***No files were updated.***

dg0yt · 2021-10-03T08:49:49Z

Okay, I will give it a try as long as CI is idle.

In the geographic ports, there is a lot of nmake+autotools meeting a lot of features, with significant effect on dependencies and license options. This really needs to be improved.

For x_vcpkg_pkgconfig_get_modules I have a draft change to catch and report errors (via RESULT_VARIABLE). I would suggest to add a REQUIRED keyword to enable this behaviour.

github-actions

This is a new experimental fast check for PR issues. Please let us know if this bot is helpful!

PRs must add only one version and must not modify any published versions

When making any changes to a library, the version or port-version in vcpkg.json or CONTROL must be modified.

Error: Local changes detected for geos but no changes to version or port version.
-- Version: 3.9.1#2
-- Old SHA: 149daa68785ac3796019e4489a6d966fb8cc4cc5
-- New SHA: 12e0860d9b7dc52b93f83b7d6f94e4bb5a1c85c4
-- Did you remember to update the version or port version?
-- Pass `--overwrite-version` to bypass this check.
***No files were updated.***
Error: Local changes detected for libspatialite but no changes to version or port version.
-- Version: 5.0.0#3
-- Old SHA: d7d124e4fcb212dba3d650817056ce23b6dc2a2f
-- New SHA: 4f419d5594288c1c7f1222ce108cd0270010bc08
-- Did you remember to update the version or port version?
-- Pass `--overwrite-version` to bypass this check.
***No files were updated.***

dg0yt · 2021-10-03T09:35:25Z

Okay, I will give it a try as long as CI is idle.

Works for libspatialite. This makes it much easier. 👍

IIUC vcpkg_build_nmake doesn't do anyhing to pass /LIBPATH or adjust ENV{LIB} for vcpkg's installed dir.

github-actions

This is a new experimental fast check for PR issues. Please let us know if this bot is helpful!

PRs must add only one version and must not modify any published versions

When making any changes to a library, the version or port-version in vcpkg.json or CONTROL must be modified.

Error: Local changes detected for libspatialite but no changes to version or port version.
-- Version: 5.0.0#3
-- Old SHA: d7d124e4fcb212dba3d650817056ce23b6dc2a2f
-- New SHA: 2664ab3ce1be58c38cef34ff16d1247e389d7420
-- Did you remember to update the version or port version?
-- Pass `--overwrite-version` to bypass this check.
***No files were updated.***

github-actions

This is a new experimental fast check for PR issues. Please let us know if this bot is helpful!

PRs must add only one version and must not modify any published versions

When making any changes to a library, the version or port-version in vcpkg.json or CONTROL must be modified.

Error: Local changes detected for libspatialite but no changes to version or port version.
-- Version: 5.0.0#3
-- Old SHA: d7d124e4fcb212dba3d650817056ce23b6dc2a2f
-- New SHA: aab1a670f15a9de47dacf9fc60a4299ec899bf4f
-- Did you remember to update the version or port version?
-- Pass `--overwrite-version` to bypass this check.
***No files were updated.***

github-actions

This is a new experimental fast check for PR issues. Please let us know if this bot is helpful!

PRs must add only one version and must not modify any published versions

When making any changes to a library, the version or port-version in vcpkg.json or CONTROL must be modified.

Error: Local changes detected for libspatialite but no changes to version or port version.
-- Version: 5.0.1
-- Old SHA: 22ad27813f5f3bc3382718115ce3eb5a45174afd
-- New SHA: 83a71b0c02ca4a4c375c087e6ca5cad14c4227e6
-- Did you remember to update the version or port version?
-- Pass `--overwrite-version` to bypass this check.
***No files were updated.***

github-actions

This is a new experimental fast check for PR issues. Please let us know if this bot is helpful!

PRs must add only one version and must not modify any published versions

When making any changes to a library, the version or port-version in vcpkg.json or CONTROL must be modified.

Error: Local changes detected for libspatialite but no changes to version or port version.
-- Version: 5.0.1
-- Old SHA: 22ad27813f5f3bc3382718115ce3eb5a45174afd
-- New SHA: 2afa3fd80bdef276fd25f649850ad52258e33438
-- Did you remember to update the version or port version?
-- Pass `--overwrite-version` to bypass this check.
***No files were updated.***

github-actions

This is a new experimental fast check for PR issues. Please let us know if this bot is helpful!

PRs must add only one version and must not modify any published versions

When making any changes to a library, the version or port-version in vcpkg.json or CONTROL must be modified.

Error: Local changes detected for libspatialite but no changes to version or port version.
-- Version: 5.0.1
-- Old SHA: 22ad27813f5f3bc3382718115ce3eb5a45174afd
-- New SHA: 2afa3fd80bdef276fd25f649850ad52258e33438
-- Did you remember to update the version or port version?
-- Pass `--overwrite-version` to bypass this check.
***No files were updated.***

After committing all other changes, the version database must be updated

git add -u && git commit
git checkout 973a7d517c09c8cfb7e6a548fcc260ca34ba7b60 -- versions
./vcpkg x-add-version --all

Diff

diff --git a/versions/l-/librttopo.json b/versions/l-/librttopo.json
index 12aa9b6..5c3773f 100644
--- a/versions/l-/librttopo.json
+++ b/versions/l-/librttopo.json
@@ -1,7 +1,7 @@
 {
   "versions": [
     {
-      "git-tree": "8b8db2d9576ec296a5f4c8b60fa341cc58405cec",
+      "git-tree": "d747c88d429ff781b11627623d0958967f912a41",
       "version": "1.1.0",
       "port-version": 5
     },

BillyONeal · 2021-10-14T22:43:10Z

/azp run

azure-pipelines · 2021-10-14T22:43:34Z

Azure Pipelines successfully started running 1 pipeline(s).

dg0yt · 2021-10-28T18:27:09Z

So, geos needs libm on linux:

/usr/bin/ld: /home/dg0yt/Projekte/vcpkg/vcpkg/installed/x64-linux/debug/lib/libgeosd.a(BufferOp.cpp.o): undefined reference to symbol 'pow@@GLIBC_2.2.5'
/usr/x86_64-linux-gnu/lib/libm.so.6: error adding symbols: DSO missing from command line

Let's update geos first...

dg0yt · 2021-10-29T07:42:28Z

Let's update geos first...

#21051

dg0yt · 2021-11-12T07:37:50Z

@PhoebeHui Ping for review. Needed for proceeding with #20443.

dg0yt · 2021-11-12T18:22:02Z

Also needed for #21261.

dg0yt · 2021-11-15T12:34:58Z

Ping again @PhoebeHui. This and #20443 was meant to be finished before #16494.

PhoebeHui · 2021-11-18T11:08:30Z

@dg0yt, I'm sorry for my late response, I will test these features in my local machine firstly. And invite other members help review at the same time.

PhoebeHui · 2021-11-19T02:37:38Z

All features test passed with x64-windows and x64-linux. Everything looks correct in .pc files after checked the output.

PhoebeHui

LGTM.

vicroms · 2021-11-19T05:36:37Z

This looks great! Thanks for the PR!

dg0yt · 2021-11-19T06:13:24Z

Thank you @PhoebeHui @vicroms.

github-actions bot requested changes Oct 2, 2021

View reviewed changes

dg0yt force-pushed the libspatialite-nmake branch from 59a9789 to 1973af8 Compare October 2, 2021 21:01

github-actions bot requested changes Oct 2, 2021

View reviewed changes

dg0yt force-pushed the libspatialite-nmake branch from 1973af8 to 3a6ec29 Compare October 2, 2021 21:04

github-actions bot requested changes Oct 2, 2021

View reviewed changes

dg0yt force-pushed the libspatialite-nmake branch from 3a6ec29 to 86c373e Compare October 3, 2021 05:30

github-actions bot requested changes Oct 3, 2021

View reviewed changes

dg0yt mentioned this pull request Oct 4, 2021

[geos] Install pc file also for Windows #20502

Merged

dg0yt force-pushed the libspatialite-nmake branch from 8aacf71 to 2f541d2 Compare October 4, 2021 05:34

github-actions bot requested changes Oct 4, 2021

View reviewed changes

github-actions bot requested changes Oct 5, 2021

View reviewed changes

ras0219-msft mentioned this pull request Oct 5, 2021

[libspatialite] Revise portfile and update to 5.0.1 #20445

Merged

dg0yt force-pushed the libspatialite-nmake branch from 0da2ba9 to f3fb791 Compare October 6, 2021 07:28

github-actions bot requested changes Oct 6, 2021

View reviewed changes

PhoebeHui self-assigned this Oct 8, 2021

PhoebeHui added the category:port-feature The issue is with a library, which is requesting new capabilities that didn’t exist label Oct 8, 2021

github-actions bot requested changes Oct 9, 2021

View reviewed changes

dg0yt force-pushed the libspatialite-nmake branch from 4634499 to a570500 Compare October 13, 2021 07:26

dg0yt mentioned this pull request Oct 15, 2021

[proj4] Install pc file #20458

Merged

Enable CI for libspatialite:x64-windows-static-md

0d5cd53

dg0yt added 2 commits October 28, 2021 18:10

spatialite-tools need libspatialite[rttopo]

674d310

Update versions

a11cdd1

dg0yt force-pushed the libspatialite-nmake branch from 8cfe9dd to a11cdd1 Compare October 28, 2021 16:12

github-actions bot approved these changes Oct 28, 2021

View reviewed changes

dg0yt force-pushed the libspatialite-nmake branch from 6b6669a to a11cdd1 Compare October 28, 2021 17:08

github-actions bot approved these changes Oct 28, 2021

View reviewed changes

dg0yt mentioned this pull request Nov 1, 2021

[geos] Update to 3.10.0 #21051

Merged

Merge branch 'master' of https://github.com/microsoft/vcpkg

a78f297

github-actions bot approved these changes Nov 9, 2021

View reviewed changes

dg0yt marked this pull request as ready for review November 10, 2021 01:45

dg0yt mentioned this pull request Nov 11, 2021

[proj4] Update to 8.1.1, revise features and dependencies #20443

Merged

dg0yt mentioned this pull request Nov 15, 2021

[proj4] Update to 8.0.0 #16494

Merged

dg0yt mentioned this pull request Nov 17, 2021

[gdal] Add features for hdf5, netcdf, postgresql #21231

Merged

PhoebeHui assigned JackBoosY Nov 18, 2021

PhoebeHui requested a review from vicroms November 18, 2021 11:08

PhoebeHui added the requires:all-feature-testing label Nov 18, 2021

PhoebeHui removed the requires:all-feature-testing label Nov 19, 2021

PhoebeHui approved these changes Nov 19, 2021

View reviewed changes

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

vicroms merged commit 94b2a07 into microsoft:master Nov 19, 2021

dg0yt deleted the libspatialite-nmake branch December 11, 2021 16:18

Conversation

dg0yt commented Oct 2, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

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!

github-actions bot left a comment

Choose a reason for hiding this comment

Uh oh!

github-actions bot left a comment

Choose a reason for hiding this comment

Uh oh!

github-actions bot left a comment

Choose a reason for hiding this comment

Uh oh!

github-actions bot left a comment

Choose a reason for hiding this comment

Uh oh!

Neumann-A commented Oct 3, 2021

Uh oh!

dg0yt commented Oct 3, 2021

Uh oh!

Neumann-A commented Oct 3, 2021

Uh oh!

github-actions bot left a comment

Choose a reason for hiding this comment

Uh oh!

dg0yt commented Oct 3, 2021

Uh oh!

github-actions bot left a comment

Choose a reason for hiding this comment

Uh oh!

dg0yt commented Oct 3, 2021

Uh oh!

github-actions bot left a comment

Choose a reason for hiding this comment

Uh oh!

github-actions bot left a comment

Choose a reason for hiding this comment

Uh oh!

github-actions bot left a comment

Choose a reason for hiding this comment

Uh oh!

github-actions bot left a comment

Choose a reason for hiding this comment

Uh oh!

github-actions bot left a comment

Choose a reason for hiding this comment

Uh oh!

BillyONeal commented Oct 14, 2021

Uh oh!

azure-pipelines bot commented Oct 14, 2021

Uh oh!

dg0yt commented Oct 28, 2021

Uh oh!

dg0yt commented Oct 29, 2021

Uh oh!

dg0yt commented Nov 12, 2021

Uh oh!

dg0yt commented Nov 12, 2021

Uh oh!

dg0yt commented Nov 15, 2021

Uh oh!

PhoebeHui commented Nov 18, 2021

Uh oh!

PhoebeHui commented Nov 19, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

PhoebeHui left a comment

Choose a reason for hiding this comment

Uh oh!

vicroms commented Nov 19, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

dg0yt commented Nov 19, 2021

Uh oh!

Reviewers

Assignees

dg0yt commented Oct 2, 2021 •

edited

Loading

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

PhoebeHui commented Nov 19, 2021 •

edited

Loading

vicroms commented Nov 19, 2021 •

edited

Loading