From 7f1a23814cffc7c5615e784fd061dc11d92241ac Mon Sep 17 00:00:00 2001 From: Jan Beich Date: Mon, 4 Mar 2019 12:22:42 +0000 Subject: [PATCH] sysutils/gsmartcontrol: unbreak with libc++ 8 In file included from dchannel.cpp:12: In file included from ../../src/hz/format_unit.h:17: In file included from /usr/include/c++/v1/string:505: In file included from /usr/include/c++/v1/string_view:176: In file included from /usr/include/c++/v1/__string:57: In file included from /usr/include/c++/v1/algorithm:640: In file included from /usr/include/c++/v1/initializer_list:47: In file included from /usr/include/c++/v1/cstddef:38: ../../version:1:1: error: expected unqualified-id 1.1.3 ^ PR: 236192 --- sysutils/gsmartcontrol/Makefile | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/sysutils/gsmartcontrol/Makefile b/sysutils/gsmartcontrol/Makefile index 16ef22c80a05..f0ec31be7631 100644 --- a/sysutils/gsmartcontrol/Makefile +++ b/sysutils/gsmartcontrol/Makefile @@ -35,4 +35,14 @@ CONFIGURE_ARGS= --disable-libglade OPTIONS_DEFINE= DOCS +post-patch: +# Avoid conflict with C++20 by ignoring <...> under WRKSRC + @${REINPLACE_CMD} -i .c++20 '/ADDITIONAL_INCLUDES/s/-I/-iquote/g' \ + ${WRKSRC}/configure + @${REINPLACE_CMD} -i .c++20 's/-I/-iquote/g' \ + ${WRKSRC}/src/Makefile.in \ + ${WRKSRC}/src/*/Makefile.in + @${REINPLACE_CMD} -i .c++20 '/config\.h/y/<>/""/' \ + ${WRKSRC}/src/global_macros.h + .include