diff options
author | dholland <dholland@pkgsrc.org> | 2017-09-12 05:58:41 +0000 |
---|---|---|
committer | dholland <dholland@pkgsrc.org> | 2017-09-12 05:58:41 +0000 |
commit | e6765d915d8c354dd7fb666a582ed7346e53599e (patch) | |
tree | 25cc4e02c5b382a83be0ae9d410c99e66bb7cc8f /security | |
parent | 72ea584029948e071e040b7cf3ca7bcb75e98f40 (diff) | |
download | pkgsrc-e6765d915d8c354dd7fb666a582ed7346e53599e.tar.gz |
Add additional baling wire to cpp hackery to make it not explode on gcc5.
Diffstat (limited to 'security')
-rw-r--r-- | security/libprelude/distinfo | 3 | ||||
-rw-r--r-- | security/libprelude/patches/patch-src_libprelude-error_Makefile.in | 17 |
2 files changed, 19 insertions, 1 deletions
diff --git a/security/libprelude/distinfo b/security/libprelude/distinfo index 1c576c2d562..88333a8c882 100644 --- a/security/libprelude/distinfo +++ b/security/libprelude/distinfo @@ -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-an) = 1f92ed4028087d9a357fcf3788978495d63a13e3 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 --git a/security/libprelude/patches/patch-src_libprelude-error_Makefile.in b/security/libprelude/patches/patch-src_libprelude-error_Makefile.in new file mode 100644 index 00000000000..56095b1bfac --- /dev/null +++ b/security/libprelude/patches/patch-src_libprelude-error_Makefile.in @@ -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 |