aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIlya Arzhannikov <iarzhannikov@artec-group.com>2021-04-30 20:32:35 +0200
committerGitHub <noreply@github.com>2021-04-30 11:32:35 -0700
commitd32e92dd1678792c07c4d8adb6ce6a8d9e59a2ac (patch)
tree8e7487edfde7c16fcf891ff9a1a278d13d0a09d1
parent9b2d7568d8b372d2f69f9204af4e6c1102f7aa06 (diff)
downloadvcpkg-d32e92dd1678792c07c4d8adb6ce6a8d9e59a2ac.tar.gz
vcpkg-d32e92dd1678792c07c4d8adb6ce6a8d9e59a2ac.zip
[Libassuan] Add cflags to tool build command (#17020)
* add patch with cflags added to tool command * x-add-version libassuan Co-authored-by: Ilya Arzhannikov <iarzhannikov@artec3d.com>
-rw-r--r--ports/libassuan/CONTROL1
-rw-r--r--ports/libassuan/fix-flags.patch13
-rw-r--r--ports/libassuan/portfile.cmake1
-rw-r--r--versions/baseline.json2
-rw-r--r--versions/l-/libassuan.json5
5 files changed, 21 insertions, 1 deletions
diff --git a/ports/libassuan/CONTROL b/ports/libassuan/CONTROL
index e6bb54b5f..a82da4811 100644
--- a/ports/libassuan/CONTROL
+++ b/ports/libassuan/CONTROL
@@ -1,5 +1,6 @@
Source: libassuan
Version: 2.5.3
+Port-Version: 1
Homepage: https://gnupg.org/software/libassuan/index.html
Description: A library implementing the so-called Assuan protocol
Build-Depends: libgpg-error
diff --git a/ports/libassuan/fix-flags.patch b/ports/libassuan/fix-flags.patch
new file mode 100644
index 000000000..8402c2e0a
--- /dev/null
+++ b/ports/libassuan/fix-flags.patch
@@ -0,0 +1,13 @@
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 089bc97..2d31b6a 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -149,7 +149,7 @@ install-exec-hook:
+ endif
+
+ mkheader: mkheader.c Makefile
+- $(CC_FOR_BUILD) -I. -I$(srcdir) -o $@ $(srcdir)/mkheader.c
++ $(CC_FOR_BUILD) -I. -I$(srcdir) $(CFLAGS) -o $@ $(srcdir)/mkheader.c
+
+ assuan.h: assuan.h.in mkheader $(parts_of_assuan_h)
+ ./mkheader $(host_os) $(srcdir)/assuan.h.in \
diff --git a/ports/libassuan/portfile.cmake b/ports/libassuan/portfile.cmake
index 50f26d494..bcfb1c912 100644
--- a/ports/libassuan/portfile.cmake
+++ b/ports/libassuan/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 451afb18e..1f0002e40 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -2966,7 +2966,7 @@
},
"libassuan": {
"baseline": "2.5.3",
- "port-version": 0
+ "port-version": 1
},
"libb2": {
"baseline": "0.98.1",
diff --git a/versions/l-/libassuan.json b/versions/l-/libassuan.json
index c431aea69..90b1a9022 100644
--- a/versions/l-/libassuan.json
+++ b/versions/l-/libassuan.json
@@ -1,6 +1,11 @@
{
"versions": [
{
+ "git-tree": "c81f7935c5aeb61c86b14c014b4642436f8bac29",
+ "version-string": "2.5.3",
+ "port-version": 1
+ },
+ {
"git-tree": "4f706c770799458ae92ef15394a9f0b1bd25fdf8",
"version-string": "2.5.3",
"port-version": 0