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>
This commit is contained in:
Ilya Arzhannikov 2021-04-07 22:04:42 +02:00 committed by GitHub
parent 3c21d6fa7e
commit bf92aea42e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 39 additions and 1 deletions

View File

@ -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

View File

@ -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 = \

View File

@ -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(

View File

@ -3090,7 +3090,7 @@
},
"libgpg-error": {
"baseline": "1.39",
"port-version": 0
"port-version": 1
},
"libgpod": {
"baseline": "2019-08-29",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "36b77502b20b311f354f24c02f27fd5dd4896663",
"version-string": "1.39",
"port-version": 1
},
{
"git-tree": "e5779f2d8e3f5c155d4b2e0b05661a9e0032c00a",
"version-string": "1.39",