160 lines
4.3 KiB
Diff
160 lines
4.3 KiB
Diff
From 7e06ec1a1c263dd673bccdb3dfd766eac5145e74 Mon Sep 17 00:00:00 2001
|
|
From: h00465007 <hexiujun1@huawei.com>
|
|
Date: Tue, 14 Jan 2020 23:44:16 +0800
|
|
Subject: [PATCH] fix unknown regexp buildin namespace error in gawk
|
|
|
|
---
|
|
lang/cl/mkerrcodes.awk | 2 +-
|
|
src/Makefile.am | 2 +-
|
|
src/Makefile.in | 2 +-
|
|
src/mkerrcodes.awk | 2 +-
|
|
src/mkerrcodes1.awk | 2 +-
|
|
src/mkerrcodes2.awk | 2 +-
|
|
src/mkerrnos.awk | 2 +-
|
|
src/mkstrtable.awk | 10 +++++-----
|
|
8 files changed, 12 insertions(+), 12 deletions(-)
|
|
|
|
diff --git a/lang/cl/mkerrcodes.awk b/lang/cl/mkerrcodes.awk
|
|
index ae29043..9a1fc18 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 ce1b882..f2590cb 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/Makefile.in b/src/Makefile.in
|
|
index e893436..38cc93c 100644
|
|
--- a/src/Makefile.in
|
|
+++ b/src/Makefile.in
|
|
@@ -1615,7 +1615,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 >$@
|
|
|
|
mkheader$(EXEEXT_FOR_BUILD): mkheader.c Makefile
|
|
diff --git a/src/mkerrcodes.awk b/src/mkerrcodes.awk
|
|
index 46d436c..e9c857c 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 a771a73..4578e29 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 ea58503..188f7a4 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 f79df66..15b1aad 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 c9de9c1..285e45f 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";
|
|
|
|
--
|
|
1.8.3.1
|
|
|