diff options
| author | Ilya Arzhannikov <iarzhannikov@artec-group.com> | 2021-04-07 22:04:42 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-07 13:04:42 -0700 |
| commit | bf92aea42eba797c284d158bfe158b65ec3290e0 (patch) | |
| tree | aaffe74169c32846819d4e67df889f144415c090 | |
| parent | 3c21d6fa7eaf35f70a63894e4e2e9d5a8c6dce8c (diff) | |
| download | vcpkg-bf92aea42eba797c284d158bfe158b65ec3290e0.tar.gz vcpkg-bf92aea42eba797c284d158bfe158b65ec3290e0.zip | |
Libgpg-error add cflags to tools build commands (#17023)
* add patch with cflags added to tool command
* x-add-version libgpg-error
Co-authored-by: Ilya Arzhannikov <iarzhannikov@artec3d.com>
| -rw-r--r-- | ports/libgpg-error/CONTROL | 1 | ||||
| -rw-r--r-- | ports/libgpg-error/add_cflags_to_tools.patch | 30 | ||||
| -rw-r--r-- | ports/libgpg-error/portfile.cmake | 2 | ||||
| -rw-r--r-- | versions/baseline.json | 2 | ||||
| -rw-r--r-- | versions/l-/libgpg-error.json | 5 |
5 files changed, 39 insertions, 1 deletions
diff --git a/ports/libgpg-error/CONTROL b/ports/libgpg-error/CONTROL index 754d20d3d..c5a308456 100644 --- a/ports/libgpg-error/CONTROL +++ b/ports/libgpg-error/CONTROL @@ -1,5 +1,6 @@ Source: libgpg-error Version: 1.39 +Port-Version: 1 Homepage: https://gnupg.org/software/libgpg-error/index.html Description: A common dependency of all GnuPG components Supports: !windows diff --git a/ports/libgpg-error/add_cflags_to_tools.patch b/ports/libgpg-error/add_cflags_to_tools.patch new file mode 100644 index 000000000..53c86bef8 --- /dev/null +++ b/ports/libgpg-error/add_cflags_to_tools.patch @@ -0,0 +1,30 @@ +diff --git a/src/Makefile.am b/src/Makefile.am +index fc3acc3..9a86251 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -279,14 +279,14 @@ gpg-error.def: Makefile gpg-error.def.in + # It is correct to use $(CC_FOR_BUILD) here. We want to run the + # program at build time. + mkerrcodes$(EXEEXT_FOR_BUILD): mkerrcodes.c mkerrcodes.h Makefile +- $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) \ ++ $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(CFLAGS) $(LDFLAGS_FOR_BUILD) \ + $(CPPFLAGS_FOR_BUILD) -I. -I$(srcdir) -o $@ $(srcdir)/mkerrcodes.c + + if HAVE_W32CE_SYSTEM + # It is correct to use $(CC_FOR_BUILD) here. We want to run the + # program at build time. + mkw32errmap$(EXEEXT_FOR_BUILD): mkw32errmap.c mkw32errmap.tab.h Makefile +- $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) \ ++ $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(CFLAGS) $(LDFLAGS_FOR_BUILD) \ + $(CPPFLAGS_FOR_BUILD) -I. -I$(srcdir) -o $@ $(srcdir)/mkw32errmap.c + endif + +@@ -300,7 +300,7 @@ errnos-sym.h: Makefile mkstrtable.awk errnos.in + + + mkheader$(EXEEXT_FOR_BUILD): mkheader.c Makefile +- $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) \ ++ $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(CFLAGS) $(LDFLAGS_FOR_BUILD) \ + $(CPPFLAGS_FOR_BUILD) -g -I. -I$(srcdir) -o $@ $(srcdir)/mkheader.c + + parts_of_gpg_error_h = \ diff --git a/ports/libgpg-error/portfile.cmake b/ports/libgpg-error/portfile.cmake index a6dc3e843..90d199cbf 100644 --- a/ports/libgpg-error/portfile.cmake +++ b/ports/libgpg-error/portfile.cmake @@ -6,6 +6,8 @@ vcpkg_from_github( REF libgpg-error-1.39
SHA512 c8ca3fc9f1bec90a84214c8fed6073f5a0f6f6880c166a8737a24e0eee841ed5f0f3c94028b50b76535cb2e06f0362b19638e429b4cdc399487d6001b977bbbe
HEAD_REF master
+ PATCHES
+ add_cflags_to_tools.patch
)
vcpkg_configure_make(
diff --git a/versions/baseline.json b/versions/baseline.json index 4eb00a41e..58acf5ac9 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3090,7 +3090,7 @@ }, "libgpg-error": { "baseline": "1.39", - "port-version": 0 + "port-version": 1 }, "libgpod": { "baseline": "2019-08-29", diff --git a/versions/l-/libgpg-error.json b/versions/l-/libgpg-error.json index 7935378c3..dc514eb6e 100644 --- a/versions/l-/libgpg-error.json +++ b/versions/l-/libgpg-error.json @@ -1,6 +1,11 @@ { "versions": [ { + "git-tree": "36b77502b20b311f354f24c02f27fd5dd4896663", + "version-string": "1.39", + "port-version": 1 + }, + { "git-tree": "e5779f2d8e3f5c155d4b2e0b05661a9e0032c00a", "version-string": "1.39", "port-version": 0 |