diff options
| author | joerg <joerg@pkgsrc.org> | 2020-04-20 00:45:07 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2020-04-20 00:45:07 +0000 |
| commit | eb51b63d8360a98e93a20ef8db621be3f4d583f1 (patch) | |
| tree | b629626d71c0094b56f23c3afcea8774af45005b /shells | |
| parent | be5ec216a6846fbf71431ca2af54b756d876102e (diff) | |
| download | pkgsrc-eb51b63d8360a98e93a20ef8db621be3f4d583f1.tar.gz | |
Deal with <version> from C++17. Drop unnecessary static_assert that
fails for legacy reasons for NetBSD.
Diffstat (limited to 'shells')
| -rw-r--r-- | shells/fish/Makefile | 5 | ||||
| -rw-r--r-- | shells/fish/distinfo | 3 | ||||
| -rw-r--r-- | shells/fish/patches/patch-src_proc.h | 16 |
3 files changed, 22 insertions, 2 deletions
diff --git a/shells/fish/Makefile b/shells/fish/Makefile index 1acf0ea78d2..5317ad7e0cd 100644 --- a/shells/fish/Makefile +++ b/shells/fish/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.22 2020/02/18 22:00:49 maya Exp $ +# $NetBSD: Makefile,v 1.23 2020/04/20 00:45:07 joerg Exp $ DISTNAME= fish-3.1.0 CATEGORIES= shells @@ -42,6 +42,9 @@ PLIST.realpath= yes PLIST.open= yes .endif +post-extract: + ${RM} ${WRKSRC}/version + .include "../../devel/pcre2/buildlink3.mk" .include "../../devel/gettext-lib/buildlink3.mk" .include "../../devel/gettext-tools/buildlink3.mk" diff --git a/shells/fish/distinfo b/shells/fish/distinfo index 85aab741ea6..1807c5d8e89 100644 --- a/shells/fish/distinfo +++ b/shells/fish/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.16 2020/02/18 22:00:49 maya Exp $ +$NetBSD: distinfo,v 1.17 2020/04/20 00:45:07 joerg Exp $ SHA1 (fish-3.1.0.tar.gz) = ff863d58bcd5151f1235f8adaacebc2564f11fd4 RMD160 (fish-3.1.0.tar.gz) = 75fbb9270035b6f172d3b1d7781430eb1e638c83 @@ -8,4 +8,5 @@ SHA1 (patch-cmake_ConfigureChecks.cmake) = f673d726b42a60adff60b7e53783a1a2d0e76 SHA1 (patch-config__cmake.h.in) = 0d522168dceebb60a0e759df3e2b39595f64d156 SHA1 (patch-src_common.cpp) = 130e632f41db5974aeec657f0830079b8d9c28ef SHA1 (patch-src_fallback.cpp) = 021d454b12e1b9ac45b5820236e5b0742f25e20d +SHA1 (patch-src_proc.h) = e8ef91a36e3ee134d3220f2396deee292ff93a40 SHA1 (patch-src_wutil.cpp) = f016ef23b3e3ad7937e944bf341cc6ce0a3f0257 diff --git a/shells/fish/patches/patch-src_proc.h b/shells/fish/patches/patch-src_proc.h new file mode 100644 index 00000000000..6e60cb1781a --- /dev/null +++ b/shells/fish/patches/patch-src_proc.h @@ -0,0 +1,16 @@ +$NetBSD: patch-src_proc.h,v 1.1 2020/04/20 00:45:07 joerg Exp $ + +WIFEXITED() is not ICE for legacy reasons, so just skip the assert. + +--- src/proc.h.orig 2020-04-19 18:24:08.756343798 +0000 ++++ src/proc.h +@@ -70,7 +70,9 @@ class proc_status_t { + static proc_status_t from_exit_code(int ret) { + // Some paranoia. + constexpr int zerocode = w_exitcode(0, 0); ++#ifndef __NetBSD__ + static_assert(WIFEXITED(zerocode), "Synthetic exit status not reported as exited"); ++#endif + return proc_status_t(w_exitcode(ret, 0 /* sig */)); + } + |