[pkgsrc/trunk]: pkgsrc/security/libprelude Add additional baling wire to cpp ...

[dholland <dholland%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/40b25c7400f4
branches:  trunk
changeset: 368212:40b25c7400f4
user:      dholland <dholland%pkgsrc.org@localhost>
date:      Tue Sep 12 05:58:41 2017 +0000

description:
Add additional baling wire to cpp hackery to make it not explode on gcc5.

diffstat:

 security/libprelude/distinfo                                       |   3 +-
 security/libprelude/patches/patch-src_libprelude-error_Makefile.in |  17 ++++++++++
 2 files changed, 19 insertions(+), 1 deletions(-)

diffs (35 lines):

diff -r 3c0a5c969969 -r 40b25c7400f4 security/libprelude/distinfo
--- a/security/libprelude/distinfo      Tue Sep 12 05:55:31 2017 +0000
+++ b/security/libprelude/distinfo      Tue Sep 12 05:58:41 2017 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.38 2016/09/29 12:14:37 joerg Exp $
+$NetBSD: distinfo,v 1.39 2017/09/12 05:58:41 dholland Exp $
 
 SHA1 (libprelude-0.9.24.1.tar.gz) = b8c0c43efb33f3da741feac59b7a5482adf56282
 RMD160 (libprelude-0.9.24.1.tar.gz) = 0a2688cf5c44e834c07eaba36d333155b2ca226d
@@ -20,3 +20,4 @@
 SHA1 (patch-ba) = 333d6e3f842d80888be0cec3921417fe51a027bc
 SHA1 (patch-bb) = ca80e503226a2e1adcc0976597a225a51a74b8f9
 SHA1 (patch-src_include_prelude-plugin.h) = 4731b98059971577819906d84fe7f160c24c04f5
+SHA1 (patch-src_libprelude-error_Makefile.in) = 43c3e4cb2ff9fcc617f537d54063e0b5d507083f
diff -r 3c0a5c969969 -r 40b25c7400f4 security/libprelude/patches/patch-src_libprelude-error_Makefile.in
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/security/libprelude/patches/patch-src_libprelude-error_Makefile.in        Tue Sep 12 05:58:41 2017 +0000
@@ -0,0 +1,17 @@
+$NetBSD: patch-src_libprelude-error_Makefile.in,v 1.1 2017/09/12 05:58:41 dholland 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
++++ src/libprelude-error/Makefile.in
+@@ -1201,7 +1201,7 @@ code-to-errno.h: Makefile mkerrnos.awk e
+ 
+ mkerrcodes.h: Makefile mkerrcodes.awk
+       LANG="" $(AWK) -f $(srcdir)/mkerrcodes1.awk $(srcdir)/errnos.in >_$@
+-      $(CPP) _$@ | grep PRELUDE_ERROR_ | LANG="" $(AWK) -f $(srcdir)/mkerrcodes.awk >$@
++      $(CPP) -P _$@ | grep PRELUDE_ERROR_ | LANG="" $(AWK) -f $(srcdir)/mkerrcodes.awk >$@
+       -rm _$@
+ 
+ # It is correct to use $(CC_FOR_BUILD) here.  We want to run the