|
|
|
|
@ -5,7 +5,7 @@ Contains ad hoc patches for cross building.
|
|
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
|
|
|
From: Mark Brand <mabrand@mabrand.nl>
|
|
|
|
|
Date: Sat, 15 Dec 2018 16:51:30 +0100
|
|
|
|
|
Subject: [PATCH 1/4] more tolerant parsing for mingw in host triplet
|
|
|
|
|
Subject: [PATCH 1/3] more tolerant parsing for mingw in host triplet
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
diff --git a/src/mkheader.c b/src/mkheader.c
|
|
|
|
|
@ -22,146 +22,10 @@ index 1111111..2222222 100644
|
|
|
|
|
include_file (fname, lnr, "w32-add.h", write_line);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
|
|
|
From: Tony Theodore <tonyt@logyst.com>
|
|
|
|
|
Date: Wed, 24 Apr 2019 23:18:54 +1000
|
|
|
|
|
Subject: [PATCH 2/4] awk: Prepare for Gawk 5.0.
|
|
|
|
|
|
|
|
|
|
taken from:
|
|
|
|
|
https://dev.gnupg.org/rE7865041c77f4f7005282f10f9b6666b19072fbdf
|
|
|
|
|
|
|
|
|
|
diff --git a/lang/cl/mkerrcodes.awk b/lang/cl/mkerrcodes.awk
|
|
|
|
|
index 1111111..2222222 100644
|
|
|
|
|
--- a/lang/cl/mkerrcodes.awk
|
|
|
|
|
+++ b/lang/cl/mkerrcodes.awk
|
|
|
|
|
@@ -122,7 +122,7 @@ header {
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
!header {
|
|
|
|
|
- sub (/\#.+/, "");
|
|
|
|
|
+ sub (/#.+/, "");
|
|
|
|
|
sub (/[ ]+$/, ""); # Strip trailing space and tab characters.
|
|
|
|
|
|
|
|
|
|
if (/^$/)
|
|
|
|
|
diff --git a/src/Makefile.am b/src/Makefile.am
|
|
|
|
|
index 1111111..2222222 100644
|
|
|
|
|
--- a/src/Makefile.am
|
|
|
|
|
+++ b/src/Makefile.am
|
|
|
|
|
@@ -293,7 +293,7 @@ code-from-errno.h: mkerrcodes$(EXEEXT_FOR_BUILD) Makefile
|
|
|
|
|
|
|
|
|
|
errnos-sym.h: Makefile mkstrtable.awk errnos.in
|
|
|
|
|
$(AWK) -f $(srcdir)/mkstrtable.awk -v textidx=2 -v nogettext=1 \
|
|
|
|
|
- -v prefix=GPG_ERR_ -v namespace=errnos_ \
|
|
|
|
|
+ -v prefix=GPG_ERR_ -v pkg_namespace=errnos_ \
|
|
|
|
|
$(srcdir)/errnos.in >$@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
diff --git a/src/mkerrcodes.awk b/src/mkerrcodes.awk
|
|
|
|
|
index 1111111..2222222 100644
|
|
|
|
|
--- a/src/mkerrcodes.awk
|
|
|
|
|
+++ b/src/mkerrcodes.awk
|
|
|
|
|
@@ -85,7 +85,7 @@ header {
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
!header {
|
|
|
|
|
- sub (/\#.+/, "");
|
|
|
|
|
+ sub (/#.+/, "");
|
|
|
|
|
sub (/[ ]+$/, ""); # Strip trailing space and tab characters.
|
|
|
|
|
|
|
|
|
|
if (/^$/)
|
|
|
|
|
diff --git a/src/mkerrcodes1.awk b/src/mkerrcodes1.awk
|
|
|
|
|
index 1111111..2222222 100644
|
|
|
|
|
--- a/src/mkerrcodes1.awk
|
|
|
|
|
+++ b/src/mkerrcodes1.awk
|
|
|
|
|
@@ -81,7 +81,7 @@ header {
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
!header {
|
|
|
|
|
- sub (/\#.+/, "");
|
|
|
|
|
+ sub (/#.+/, "");
|
|
|
|
|
sub (/[ ]+$/, ""); # Strip trailing space and tab characters.
|
|
|
|
|
|
|
|
|
|
if (/^$/)
|
|
|
|
|
diff --git a/src/mkerrcodes2.awk b/src/mkerrcodes2.awk
|
|
|
|
|
index 1111111..2222222 100644
|
|
|
|
|
--- a/src/mkerrcodes2.awk
|
|
|
|
|
+++ b/src/mkerrcodes2.awk
|
|
|
|
|
@@ -91,7 +91,7 @@ header {
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
!header {
|
|
|
|
|
- sub (/\#.+/, "");
|
|
|
|
|
+ sub (/#.+/, "");
|
|
|
|
|
sub (/[ ]+$/, ""); # Strip trailing space and tab characters.
|
|
|
|
|
|
|
|
|
|
if (/^$/)
|
|
|
|
|
diff --git a/src/mkerrnos.awk b/src/mkerrnos.awk
|
|
|
|
|
index 1111111..2222222 100644
|
|
|
|
|
--- a/src/mkerrnos.awk
|
|
|
|
|
+++ b/src/mkerrnos.awk
|
|
|
|
|
@@ -83,7 +83,7 @@ header {
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
!header {
|
|
|
|
|
- sub (/\#.+/, "");
|
|
|
|
|
+ sub (/#.+/, "");
|
|
|
|
|
sub (/[ ]+$/, ""); # Strip trailing space and tab characters.
|
|
|
|
|
|
|
|
|
|
if (/^$/)
|
|
|
|
|
diff --git a/src/mkstrtable.awk b/src/mkstrtable.awk
|
|
|
|
|
index 1111111..2222222 100644
|
|
|
|
|
--- a/src/mkstrtable.awk
|
|
|
|
|
+++ b/src/mkstrtable.awk
|
|
|
|
|
@@ -77,7 +77,7 @@
|
|
|
|
|
#
|
|
|
|
|
# The variable prefix can be used to prepend a string to each message.
|
|
|
|
|
#
|
|
|
|
|
-# The variable namespace can be used to prepend a string to each
|
|
|
|
|
+# The variable pkg_namespace can be used to prepend a string to each
|
|
|
|
|
# variable and macro name.
|
|
|
|
|
|
|
|
|
|
BEGIN {
|
|
|
|
|
@@ -102,7 +102,7 @@ header {
|
|
|
|
|
print "/* The purpose of this complex string table is to produce";
|
|
|
|
|
print " optimal code with a minimum of relocations. */";
|
|
|
|
|
print "";
|
|
|
|
|
- print "static const char " namespace "msgstr[] = ";
|
|
|
|
|
+ print "static const char " pkg_namespace "msgstr[] = ";
|
|
|
|
|
header = 0;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
@@ -110,7 +110,7 @@ header {
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
!header {
|
|
|
|
|
- sub (/\#.+/, "");
|
|
|
|
|
+ sub (/#.+/, "");
|
|
|
|
|
sub (/[ ]+$/, ""); # Strip trailing space and tab characters.
|
|
|
|
|
|
|
|
|
|
if (/^$/)
|
|
|
|
|
@@ -150,7 +150,7 @@ END {
|
|
|
|
|
else
|
|
|
|
|
print " gettext_noop (\"" last_msgstr "\");";
|
|
|
|
|
print "";
|
|
|
|
|
- print "static const int " namespace "msgidx[] =";
|
|
|
|
|
+ print "static const int " pkg_namespace "msgidx[] =";
|
|
|
|
|
print " {";
|
|
|
|
|
for (i = 0; i < coded_msgs; i++)
|
|
|
|
|
print " " pos[i] ",";
|
|
|
|
|
@@ -158,7 +158,7 @@ END {
|
|
|
|
|
print " };";
|
|
|
|
|
print "";
|
|
|
|
|
print "static GPG_ERR_INLINE int";
|
|
|
|
|
- print namespace "msgidxof (int code)";
|
|
|
|
|
+ print pkg_namespace "msgidxof (int code)";
|
|
|
|
|
print "{";
|
|
|
|
|
print " return (0 ? 0";
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
|
|
|
From: Tony Theodore <tonyt@logyst.com>
|
|
|
|
|
Date: Wed, 6 Nov 2019 19:00:10 +1100
|
|
|
|
|
Subject: [PATCH 3/4] avoid whitespace in gpg-error.def linker script for
|
|
|
|
|
Subject: [PATCH 2/3] avoid whitespace in gpg-error.def linker script for
|
|
|
|
|
mingw32
|
|
|
|
|
|
|
|
|
|
https://lists.gnupg.org/pipermail/gnupg-devel/2016-February/030798.html
|
|
|
|
|
@ -182,7 +46,7 @@ index 1111111..2222222 100644
|
|
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
|
|
|
From: Tony Theodore <tonyt@logyst.com>
|
|
|
|
|
Date: Wed, 6 Nov 2019 19:11:35 +1100
|
|
|
|
|
Subject: [PATCH 4/4] fix for automake < 1.12
|
|
|
|
|
Subject: [PATCH 3/3] fix for automake < 1.12
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
diff --git a/configure.ac b/configure.ac
|
|
|
|
|
|
Mark Brand
4 years ago