[libgcrypt] Fix arm64-osx compilation, add Windows support by wrobelda · Pull Request #20433 · microsoft/vcpkg

wrobelda · 2021-09-29T16:28:30Z

Describe the pull request

What does your PR fix?
- fixes libgcrypt macOS arm64 compilation (see OpenSP on Apple Silicon issue #20347)
- adds libgcrypt Windows support using SMP fork
Which triplets are supported/not supported? Have you updated the CI baseline?

No change, plus:
- added libgcrypt arm64-osx and Windows
Does your PR follow the maintainer guide?

I am still working on this PR
If you have added/updated a port: Have you run ./vcpkg x-add-version --all and committed the result?

I am still working on this PR

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 9b6135efafdc26c77f35a8dc4e6db18a8174e662 -- versions
./vcpkg x-add-version --all

Diff

diff --git a/versions/baseline.json b/versions/baseline.json
index 854de77..113d31f 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -3377,8 +3377,8 @@
       "port-version": 1
     },
     "libgcrypt": {
-      "baseline": "1.8.7",
-      "port-version": 2
+      "baseline": "1.9.3",
+      "port-version": 0
     },
     "libgd": {
       "baseline": "2.3.2",
diff --git a/versions/l-/libgcrypt.json b/versions/l-/libgcrypt.json
index 75cf88e..ec1b61f 100644
--- a/versions/l-/libgcrypt.json
+++ b/versions/l-/libgcrypt.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "78b0c3c53165c3a9cb9337c3959167a28770480c",
+      "version-string": "1.9.3",
+      "port-version": 0
+    },
     {
       "git-tree": "43a3a46962e0195eefd661d621f1a69c267d067e",
       "version-string": "1.8.7",

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 9b6135efafdc26c77f35a8dc4e6db18a8174e662 -- versions
./vcpkg x-add-version --all

Diff

diff --git a/versions/l-/libgcrypt.json b/versions/l-/libgcrypt.json
index 2b1e37c..06e8a93 100644
--- a/versions/l-/libgcrypt.json
+++ b/versions/l-/libgcrypt.json
@@ -5,11 +5,6 @@
       "version": "1.9.4",
       "port-version": 0
     },
-    {
-      "git-tree": "667d5a01ac92b62b72940ddeaa9d05014c40125e",
-      "version": "1.9.3",
-      "port-version": 0
-    },
     {
       "git-tree": "43a3a46962e0195eefd661d621f1a69c267d067e",
       "version-string": "1.8.7",

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 9b6135efafdc26c77f35a8dc4e6db18a8174e662 -- versions
./vcpkg x-add-version --all

Diff

diff --git a/versions/l-/libgcrypt.json b/versions/l-/libgcrypt.json
index 503112d..acf1031 100644
--- a/versions/l-/libgcrypt.json
+++ b/versions/l-/libgcrypt.json
@@ -5,11 +5,6 @@
       "version": "1.9.4",
       "port-version": 0
     },
-    {
-      "git-tree": "667d5a01ac92b62b72940ddeaa9d05014c40125e",
-      "version": "1.9.3",
-      "port-version": 0
-    },
     {
       "git-tree": "43a3a46962e0195eefd661d621f1a69c267d067e",
       "version-string": "1.8.7",

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 9b6135efafdc26c77f35a8dc4e6db18a8174e662 -- versions
./vcpkg x-add-version --all

Diff

diff --git a/versions/l-/libgcrypt.json b/versions/l-/libgcrypt.json
index 94dd70d..348dbed 100644
--- a/versions/l-/libgcrypt.json
+++ b/versions/l-/libgcrypt.json
@@ -5,11 +5,6 @@
       "version": "1.9.4",
       "port-version": 0
     },
-    {
-      "git-tree": "667d5a01ac92b62b72940ddeaa9d05014c40125e",
-      "version": "1.9.3",
-      "port-version": 0
-    },
     {
       "git-tree": "43a3a46962e0195eefd661d621f1a69c267d067e",
       "version-string": "1.8.7",

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 9b6135efafdc26c77f35a8dc4e6db18a8174e662 -- versions
./vcpkg x-add-version --all

Diff

diff --git a/versions/l-/libgcrypt.json b/versions/l-/libgcrypt.json
index 08cab38..193e08d 100644
--- a/versions/l-/libgcrypt.json
+++ b/versions/l-/libgcrypt.json
@@ -5,11 +5,6 @@
       "version": "1.9.4",
       "port-version": 0
     },
-    {
-      "git-tree": "667d5a01ac92b62b72940ddeaa9d05014c40125e",
-      "version": "1.9.3",
-      "port-version": 0
-    },
     {
       "git-tree": "43a3a46962e0195eefd661d621f1a69c267d067e",
       "version-string": "1.8.7",

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 9b6135efafdc26c77f35a8dc4e6db18a8174e662 -- versions
./vcpkg x-add-version --all

Diff

diff --git a/versions/l-/libgcrypt.json b/versions/l-/libgcrypt.json
index da27137..237b6dd 100644
--- a/versions/l-/libgcrypt.json
+++ b/versions/l-/libgcrypt.json
@@ -5,11 +5,6 @@
       "version": "1.9.4",
       "port-version": 0
     },
-    {
-      "git-tree": "667d5a01ac92b62b72940ddeaa9d05014c40125e",
-      "version": "1.9.3",
-      "port-version": 0
-    },
     {
       "git-tree": "43a3a46962e0195eefd661d621f1a69c267d067e",
       "version-string": "1.8.7",

wrobelda · 2021-09-30T06:18:30Z

@JackBoosY this is a WIP, I already added Windows support to the port since creating this issue, so this isn't a "community-triplet" exclusively.

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 9b6135efafdc26c77f35a8dc4e6db18a8174e662 -- versions
./vcpkg x-add-version --all

Diff

diff --git a/versions/l-/libgcrypt.json b/versions/l-/libgcrypt.json
index 1e06a78..fdfee70 100644
--- a/versions/l-/libgcrypt.json
+++ b/versions/l-/libgcrypt.json
@@ -5,11 +5,6 @@
       "version": "1.9.4",
       "port-version": 0
     },
-    {
-      "git-tree": "667d5a01ac92b62b72940ddeaa9d05014c40125e",
-      "version": "1.9.3",
-      "port-version": 0
-    },
     {
       "git-tree": "43a3a46962e0195eefd661d621f1a69c267d067e",
       "version-string": "1.8.7",

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 8ad33ead9075cd8d6d357e0b870ba8d501efe35c -- versions
./vcpkg x-add-version --all

Diff

diff --git a/versions/l-/libgcrypt.json b/versions/l-/libgcrypt.json
index 1e06a78..fdfee70 100644
--- a/versions/l-/libgcrypt.json
+++ b/versions/l-/libgcrypt.json
@@ -5,11 +5,6 @@
       "version": "1.9.4",
       "port-version": 0
     },
-    {
-      "git-tree": "667d5a01ac92b62b72940ddeaa9d05014c40125e",
-      "version": "1.9.3",
-      "port-version": 0
-    },
     {
       "git-tree": "43a3a46962e0195eefd661d621f1a69c267d067e",
       "version-string": "1.8.7",

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 8ad33ead9075cd8d6d357e0b870ba8d501efe35c -- versions
./vcpkg x-add-version --all

Diff

diff --git a/versions/l-/libgcrypt.json b/versions/l-/libgcrypt.json
index 41d1399..dab3318 100644
--- a/versions/l-/libgcrypt.json
+++ b/versions/l-/libgcrypt.json
@@ -5,11 +5,6 @@
       "version": "1.9.4",
       "port-version": 0
     },
-    {
-      "git-tree": "667d5a01ac92b62b72940ddeaa9d05014c40125e",
-      "version": "1.9.3",
-      "port-version": 0
-    },
     {
       "git-tree": "43a3a46962e0195eefd661d621f1a69c267d067e",
       "version-string": "1.8.7",

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 8ad33ead9075cd8d6d357e0b870ba8d501efe35c -- versions
./vcpkg x-add-version --all

Diff

diff --git a/versions/l-/libgcrypt.json b/versions/l-/libgcrypt.json
index 9503686..8177b3e 100644
--- a/versions/l-/libgcrypt.json
+++ b/versions/l-/libgcrypt.json
@@ -5,11 +5,6 @@
       "version": "1.9.4",
       "port-version": 0
     },
-    {
-      "git-tree": "667d5a01ac92b62b72940ddeaa9d05014c40125e",
-      "version": "1.9.3",
-      "port-version": 0
-    },
     {
       "git-tree": "43a3a46962e0195eefd661d621f1a69c267d067e",
       "version-string": "1.8.7",

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 8ad33ead9075cd8d6d357e0b870ba8d501efe35c -- versions
./vcpkg x-add-version --all

Diff

diff --git a/versions/l-/libgcrypt.json b/versions/l-/libgcrypt.json
index 50640c3..6f08d7c 100644
--- a/versions/l-/libgcrypt.json
+++ b/versions/l-/libgcrypt.json
@@ -5,11 +5,6 @@
       "version": "1.9.4",
       "port-version": 0
     },
-    {
-      "git-tree": "667d5a01ac92b62b72940ddeaa9d05014c40125e",
-      "version": "1.9.3",
-      "port-version": 0
-    },
     {
       "git-tree": "43a3a46962e0195eefd661d621f1a69c267d067e",
       "version-string": "1.8.7",

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 8ad33ead9075cd8d6d357e0b870ba8d501efe35c -- versions
./vcpkg x-add-version --all

Diff

diff --git a/versions/l-/libgcrypt.json b/versions/l-/libgcrypt.json
index 64b12d2..2af367e 100644
--- a/versions/l-/libgcrypt.json
+++ b/versions/l-/libgcrypt.json
@@ -5,11 +5,6 @@
       "version": "1.9.4",
       "port-version": 0
     },
-    {
-      "git-tree": "667d5a01ac92b62b72940ddeaa9d05014c40125e",
-      "version": "1.9.3",
-      "port-version": 0
-    },
     {
       "git-tree": "43a3a46962e0195eefd661d621f1a69c267d067e",
       "version-string": "1.8.7",

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 8ad33ead9075cd8d6d357e0b870ba8d501efe35c -- versions
./vcpkg x-add-version --all

Diff

diff --git a/versions/l-/libgcrypt.json b/versions/l-/libgcrypt.json
index bd98870..568c1eb 100644
--- a/versions/l-/libgcrypt.json
+++ b/versions/l-/libgcrypt.json
@@ -5,11 +5,6 @@
       "version": "1.9.4",
       "port-version": 0
     },
-    {
-      "git-tree": "667d5a01ac92b62b72940ddeaa9d05014c40125e",
-      "version": "1.9.3",
-      "port-version": 0
-    },
     {
       "git-tree": "43a3a46962e0195eefd661d621f1a69c267d067e",
       "version-string": "1.8.7",

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 8ad33ead9075cd8d6d357e0b870ba8d501efe35c -- versions
./vcpkg x-add-version --all

Diff

diff --git a/versions/l-/libgcrypt.json b/versions/l-/libgcrypt.json
index bd98870..568c1eb 100644
--- a/versions/l-/libgcrypt.json
+++ b/versions/l-/libgcrypt.json
@@ -5,11 +5,6 @@
       "version": "1.9.4",
       "port-version": 0
     },
-    {
-      "git-tree": "667d5a01ac92b62b72940ddeaa9d05014c40125e",
-      "version": "1.9.3",
-      "port-version": 0
-    },
     {
       "git-tree": "43a3a46962e0195eefd661d621f1a69c267d067e",
       "version-string": "1.8.7",

wrobelda · 2021-10-06T17:55:38Z

@JackBoosY, @phoebeHu, FYI,i this is ready for a review since a while.

ports/libgcrypt/portfile.cmake

JackBoosY · 2021-10-08T03:07:22Z

ports/libgcrypt/portfile.cmake

+
+    file(REMOVE "${CURRENT_PACKAGES_DIR}/lib/COPYING.LIB" "${CURRENT_PACKAGES_DIR}/debug/lib/COPYING.LIB")
+else()
+    vcpkg_from_git(


Can we use the single repo in the different triplets?

We could, but again, this mimics all the other ports that use ShiftMediaProject forks such that they are only used for Windows builds.

JackBoosY · 2021-10-08T05:56:37Z

ports/libgcrypt/portfile.cmake

+    message(WARNING "libgcrypt on Windows uses a fork managed by the ShiftMediaProject: https://shiftmediaproject.github.io/")
+    vcpkg_from_github(
+        OUT_SOURCE_PATH SOURCE_PATH
+        REPO ShiftMediaProject/libgcrypt


Also I noticed that this repo is not official.

It is not, hence the warning message. As explained previously, this is how other ports are prepared (gmp, nettle, gcrypt, gnutls) and is the easiest way of obtaining those libs on Windows.

We can intercept the places available on this repo, and we do not accept the use of unofficial repo.

OK, this seems somewhat arbitrary: you have 3 other ports in the repo that already use this particular fork, so you did make an exception: https://github.com/microsoft/vcpkg/search?q=shiftmediaproject

If you mean that we should instead diff the upstream and the fork, we would end up with a massive patch. I don't see how is that different from using the fork itself – the latter provides same transparency and is less hassle.

@JackBoosY also see: #18029

OK, this seems somewhat arbitrary: you have 3 other ports in the repo that already use this particular fork, so you did make an exception: https://github.com/microsoft/vcpkg/search?q=shiftmediaproject

Well, I think we should have a vote about that.

@strega-nil-ms what do you think about that?

Closing this as "Won't merge" based on the discussion here: #18029 (comment)

wrobelda force-pushed the gnupg_osx_arm64 branch from 42ef89e to ef2f7c8 Compare September 29, 2021 16:29

github-actions bot requested changes Sep 29, 2021

View reviewed changes

github-actions bot approved these changes Sep 29, 2021

View reviewed changes

github-actions bot requested changes Sep 29, 2021

View reviewed changes

wrobelda force-pushed the gnupg_osx_arm64 branch from 39c31cc to abd51d9 Compare September 29, 2021 17:35

github-actions bot requested changes Sep 29, 2021

View reviewed changes

wrobelda force-pushed the gnupg_osx_arm64 branch from abd51d9 to 0b5f941 Compare September 29, 2021 17:48

github-actions bot requested changes Sep 29, 2021

View reviewed changes

PhoebeHui assigned PhoebeHui and JackBoosY Sep 30, 2021

JackBoosY added the category:community-triplet A PR or issue related to community triplets not officially validated by the vcpkg team. label Sep 30, 2021

wrobelda changed the title ~~[gnupg and deps] Fix arm64-osx compilation, other fixes~~ [gnupg and deps] Fix arm64-osx compilation, add Windows support Sep 30, 2021

JackBoosY added category:port-feature The issue is with a library, which is requesting new capabilities that didn’t exist and removed category:community-triplet A PR or issue related to community triplets not officially validated by the vcpkg team. labels Sep 30, 2021

github-actions bot requested changes Sep 30, 2021

View reviewed changes

wrobelda force-pushed the gnupg_osx_arm64 branch from 2eefd18 to a7da8bf Compare September 30, 2021 12:04

github-actions bot requested changes Sep 30, 2021

View reviewed changes

wrobelda force-pushed the gnupg_osx_arm64 branch from a7da8bf to fd886fb Compare September 30, 2021 12:14

github-actions bot requested changes Sep 30, 2021

View reviewed changes

wrobelda force-pushed the gnupg_osx_arm64 branch 2 times, most recently from 1af6140 to 80b8ff8 Compare September 30, 2021 12:21

github-actions bot requested changes Sep 30, 2021

View reviewed changes

wrobelda force-pushed the gnupg_osx_arm64 branch from 80b8ff8 to 54c6b2c Compare September 30, 2021 12:39

github-actions bot requested changes Sep 30, 2021

View reviewed changes

wrobelda added 6 commits September 30, 2021 20:42

[libgcrypt] add Windows support using SMP/libgcrypt

ddb6427

[libgcrypt] update versions

2708271

[libgcrypt] add missing gpg-error lib to .pc

0b49958

[libgcrypt] update versions

1d9fa76

[libgcrypt] fix static, UWP builds

0fb6557

[libgcrypt] update versions

8f239b3

wrobelda force-pushed the gnupg_osx_arm64 branch from 2f3ba85 to 8f239b3 Compare September 30, 2021 17:43

wrobelda marked this pull request as ready for review September 30, 2021 17:43

github-actions bot requested changes Sep 30, 2021

View reviewed changes

[libgcrypt] remove 1.9.3 version

ebd7a23

github-actions bot approved these changes Oct 1, 2021

View reviewed changes

github-actions bot approved these changes Oct 7, 2021

View reviewed changes

wrobelda added 2 commits October 7, 2021 16:36

[libgnutls] also copy autotools macro

b06a0b6

[libgcrypt] update versions

c2d27bd

wrobelda force-pushed the gnupg_osx_arm64 branch from 6e0b791 to c2d27bd Compare October 7, 2021 14:36

github-actions bot approved these changes Oct 7, 2021

View reviewed changes

wrobelda mentioned this pull request Oct 7, 2021

[libgwenhywfar] Update to 5.7.3, Fix static consumers, enable Windows #20572

Closed

3 tasks

JackBoosY suggested changes Oct 8, 2021

View reviewed changes

ports/libgcrypt/portfile.cmake Show resolved Hide resolved

JackBoosY added the requires:author-response label Oct 8, 2021

JackBoosY suggested changes Oct 8, 2021

View reviewed changes

JackBoosY added requires:vcpkg-team-review This PR or issue requires someone on the vcpkg team to take a further look. and removed requires:author-response labels Oct 9, 2021

wrobelda mentioned this pull request Oct 12, 2021

[shiftmedia-gnutls] new port (Windows fork of GnuTLS) #18029

Merged

wrobelda closed this Oct 13, 2021

wrobelda mentioned this pull request Oct 19, 2021

[libgcrypt] update to 1.9.4, fix arm64-osx compilation #20854

Merged

Sibras mentioned this pull request Mar 8, 2022

Vcpkg Install? ShiftMediaProject/libgcrypt#4

Closed

wrobelda mentioned this pull request Aug 16, 2022

[shiftmedia-libgcrypt] new port (Windows fork of Libgcrypt) #26364

Merged

Conversation

wrobelda commented Sep 29, 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!

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!

wrobelda commented Sep 30, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

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!

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!

wrobelda commented Oct 6, 2021

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

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

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

wrobelda commented Sep 29, 2021 •

edited

Loading

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

wrobelda commented Sep 30, 2021 •

edited

Loading

wrobelda Oct 8, 2021 •

edited

Loading