-
Notifications
You must be signed in to change notification settings - Fork 6.7k
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
[libspatialite] Use pkgconfig for nmake and autotools #20480
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
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
},
59a9789
to
1973af8
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
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
},
1973af8
to
3a6ec29
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
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
},
3a6ec29
to
86c373e
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
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.***
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
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. |
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. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
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.***
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 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
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.***
Works for IIUC |
8aacf71
to
2f541d2
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
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.***
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
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.***
0da2ba9
to
f3fb791
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
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.***
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
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.***
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
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
},
4634499
to
a570500
Compare
/azp run |
Azure Pipelines successfully started running 1 pipeline(s). |
8cfe9dd
to
a11cdd1
Compare
6b6669a
to
a11cdd1
Compare
So, geos needs libm on linux:
Let's update geos first... |
|
@PhoebeHui Ping for review. Needed for proceeding with #20443. |
Also needed for #21261. |
Ping again @PhoebeHui. This and #20443 was meant to be finished before #16494. |
@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. |
All features test passed with x64-windows and x64-linux. Everything looks correct in .pc files after checked the output. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM.
This looks great! Thanks for the PR! |
Thank you @PhoebeHui @vicroms. |
What does your PR fix?
Needed to allow features in dependencies.
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