aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ports/libgcrypt/CONTROL1
-rw-r--r--ports/libgcrypt/fix-flags.patch13
-rw-r--r--ports/libgcrypt/portfile.cmake1
-rw-r--r--versions/baseline.json2
-rw-r--r--versions/l-/libgcrypt.json5
5 files changed, 21 insertions, 1 deletions
diff --git a/ports/libgcrypt/CONTROL b/ports/libgcrypt/CONTROL
index 1a1ae7916..af3a0fb17 100644
--- a/ports/libgcrypt/CONTROL
+++ b/ports/libgcrypt/CONTROL
@@ -1,5 +1,6 @@
Source: libgcrypt
Version: 1.8.7
+Port-Version: 1
Homepage: https://gnupg.org/software/libgcrypt/index.html
Description: A library implementing the so-called Assuan protocol
Build-Depends: libgpg-error
diff --git a/ports/libgcrypt/fix-flags.patch b/ports/libgcrypt/fix-flags.patch
new file mode 100644
index 000000000..7ccf41c63
--- /dev/null
+++ b/ports/libgcrypt/fix-flags.patch
@@ -0,0 +1,13 @@
+diff --git a/cipher/Makefile.am b/cipher/Makefile.am
+index 95c4510..d43350c 100644
+--- a/cipher/Makefile.am
++++ b/cipher/Makefile.am
+@@ -112,7 +112,7 @@ gost-sb.h: gost-s-box
+ ./gost-s-box $@
+
+ gost-s-box: gost-s-box.c
+- $(CC_FOR_BUILD) -o $@ $(srcdir)/gost-s-box.c
++ $(CC_FOR_BUILD) $(CFLAGS) -o $@ $(srcdir)/gost-s-box.c
+
+
+ if ENABLE_O_FLAG_MUNGING
diff --git a/ports/libgcrypt/portfile.cmake b/ports/libgcrypt/portfile.cmake
index 7c5784a01..658418e2c 100644
--- a/ports/libgcrypt/portfile.cmake
+++ b/ports/libgcrypt/portfile.cmake
@@ -8,6 +8,7 @@ vcpkg_from_github(
HEAD_REF master
PATCHES
fix-pkgconfig.patch
+ fix-flags.patch
)
vcpkg_configure_make(
diff --git a/versions/baseline.json b/versions/baseline.json
index a673849c0..e2afff481 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -3066,7 +3066,7 @@
},
"libgcrypt": {
"baseline": "1.8.7",
- "port-version": 0
+ "port-version": 1
},
"libgd": {
"baseline": "2.2.5-4",
diff --git a/versions/l-/libgcrypt.json b/versions/l-/libgcrypt.json
index fc0e2c247..bdaa3c37b 100644
--- a/versions/l-/libgcrypt.json
+++ b/versions/l-/libgcrypt.json
@@ -1,6 +1,11 @@
{
"versions": [
{
+ "git-tree": "394e5b7b433e4b18e9276c48b7331fbea30034ba",
+ "version-string": "1.8.7",
+ "port-version": 1
+ },
+ {
"git-tree": "3a7be352162b1187194ba75ff3514361213f77a6",
"version-string": "1.8.7",
"port-version": 0