diff options
author | gutteridge <gutteridge@pkgsrc.org> | 2019-12-20 22:11:02 +0000 |
---|---|---|
committer | gutteridge <gutteridge@pkgsrc.org> | 2019-12-20 22:11:02 +0000 |
commit | ce637fca175ee0ed5bbfbe8cbc0a96148232ca45 (patch) | |
tree | 6a38df3e1547be19edaca0b5435315f4ef0deabc /security/libprelude | |
parent | 6b21e6be13b834f2122c23335bb1eca0d161238b (diff) | |
download | pkgsrc-ce637fca175ee0ed5bbfbe8cbc0a96148232ca45.tar.gz |
libprelude: fix build with GNU awk >= 5.0
Rename the awk variable "namespace" to "name_space", since the former
is now a reserved word with GNU awk 5.0, and was causing parsing
errors.
Diffstat (limited to 'security/libprelude')
-rw-r--r-- | security/libprelude/Makefile | 4 | ||||
-rw-r--r-- | security/libprelude/distinfo | 5 | ||||
-rw-r--r-- | security/libprelude/patches/patch-src_libprelude-error_Makefile.in | 16 | ||||
-rw-r--r-- | security/libprelude/patches/patch-src_libprelude-error_mkstrtable.awk | 42 |
4 files changed, 61 insertions, 6 deletions
diff --git a/security/libprelude/Makefile b/security/libprelude/Makefile index 9f4b5becb24..565724d3ea5 100644 --- a/security/libprelude/Makefile +++ b/security/libprelude/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.62 2019/08/11 13:22:46 wiz Exp $ +# $NetBSD: Makefile,v 1.63 2019/12/20 22:11:02 gutteridge Exp $ # -PKGREVISION= 18 +PKGREVISION= 19 COMMENT= LibPrelude libraries and c++ easy bindings LICENSE= gnu-gpl-v2 diff --git a/security/libprelude/distinfo b/security/libprelude/distinfo index 95886fbe8bb..0b7bf99e41f 100644 --- a/security/libprelude/distinfo +++ b/security/libprelude/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.41 2018/01/31 12:55:29 jperkin Exp $ +$NetBSD: distinfo,v 1.42 2019/12/20 22:11:02 gutteridge Exp $ SHA1 (libprelude-0.9.24.1.tar.gz) = b8c0c43efb33f3da741feac59b7a5482adf56282 RMD160 (libprelude-0.9.24.1.tar.gz) = 0a2688cf5c44e834c07eaba36d333155b2ca226d @@ -22,4 +22,5 @@ SHA1 (patch-bb) = ca80e503226a2e1adcc0976597a225a51a74b8f9 SHA1 (patch-bindings_low_level_perl_Prelude.c) = 919ad0340f590365857fe7495c9d6dfa3540c0cf SHA1 (patch-config.h.in) = 11b1031ece55e086dcf9ff94f32b9321fe92bd48 SHA1 (patch-src_include_prelude-plugin.h) = 4731b98059971577819906d84fe7f160c24c04f5 -SHA1 (patch-src_libprelude-error_Makefile.in) = 43c3e4cb2ff9fcc617f537d54063e0b5d507083f +SHA1 (patch-src_libprelude-error_Makefile.in) = 7cedf555b09f14b8cd37aea07789f0078302d735 +SHA1 (patch-src_libprelude-error_mkstrtable.awk) = 52078d284f2529eb08e29423afb738b8da5d98e4 diff --git a/security/libprelude/patches/patch-src_libprelude-error_Makefile.in b/security/libprelude/patches/patch-src_libprelude-error_Makefile.in index 56095b1bfac..800bc1e5843 100644 --- a/security/libprelude/patches/patch-src_libprelude-error_Makefile.in +++ b/security/libprelude/patches/patch-src_libprelude-error_Makefile.in @@ -1,10 +1,13 @@ -$NetBSD: patch-src_libprelude-error_Makefile.in,v 1.1 2017/09/12 05:58:41 dholland Exp $ +$NetBSD: patch-src_libprelude-error_Makefile.in,v 1.2 2019/12/20 22:11:02 gutteridge Exp $ Use -P when preprocessing error symbols to avoid getting line number output, which on gcc5 introduces extra line breaks and makes the downstream processing fail miserably. ---- src/libprelude-error/Makefile.in~ 2017-09-12 05:42:25.856481751 +0000 +Also, rename the awk variable "namespace" to "name_space", since the +former is now a reserved word with GNU awk 5.0. + +--- src/libprelude-error/Makefile.in.orig 2009-08-11 15:05:56.000000000 +0000 +++ src/libprelude-error/Makefile.in @@ -1201,7 +1201,7 @@ code-to-errno.h: Makefile mkerrnos.awk e @@ -15,3 +18,12 @@ downstream processing fail miserably. -rm _$@ # It is correct to use $(CC_FOR_BUILD) here. We want to run the +@@ -1214,7 +1214,7 @@ code-from-errno.h: mkerrcodes Makefile + + errnos-sym.h: Makefile mkstrtable.awk errnos.in + LANG="" $(AWK) -f $(srcdir)/mkstrtable.awk -v textidx=2 -v nogettext=1 \ +- -v prefix=PRELUDE_ERROR_ -v namespace=errnos_ \ ++ -v prefix=PRELUDE_ERROR_ -v name_space=errnos_ \ + $(srcdir)/errnos.in >$@ + + prelude-error.h: Makefile mkheader.awk err-sources.h.in err-codes.h.in errnos.in prelude-error.h.in diff --git a/security/libprelude/patches/patch-src_libprelude-error_mkstrtable.awk b/security/libprelude/patches/patch-src_libprelude-error_mkstrtable.awk new file mode 100644 index 00000000000..df191d8e989 --- /dev/null +++ b/security/libprelude/patches/patch-src_libprelude-error_mkstrtable.awk @@ -0,0 +1,42 @@ +$NetBSD: patch-src_libprelude-error_mkstrtable.awk,v 1.1 2019/12/20 22:11:02 gutteridge Exp $ + +Rename the awk variable "namespace" to "name_space", since the former +is now a reserved word with GNU awk 5.0. + +--- src/libprelude-error/mkstrtable.awk.orig 2009-05-12 07:49:42.000000000 +0000 ++++ src/libprelude-error/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 name_space 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 " name_space "msgstr[] = "; + header = 0; + } + else +@@ -150,14 +150,14 @@ END { + else + print " gettext_noop (\"" prefix last_msgstr "\");"; + print ""; +- print "static const int " namespace "msgidx[] ="; ++ print "static const int " name_space "msgidx[] ="; + print " {"; + for (i = 0; i < coded_msgs; i++) + print " " pos[i] ","; + print " " pos[coded_msgs]; + print " };"; + print ""; +- print "#define " namespace "msgidxof(code) (0 ? -1 \\"; ++ print "#define " name_space "msgidxof(code) (0 ? -1 \\"; + + # Gather the ranges. + skip = code[0]; |