svn commit: r494594 - head/sysutils/gsmartcontrol

Jan Beich jbeich at FreeBSD.org
Mon Mar 4 12:22:43 UTC 2019


Author: jbeich
Date: Mon Mar  4 12:22:42 2019
New Revision: 494594
URL: https://svnweb.freebsd.org/changeset/ports/494594

Log:
  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

Modified:
  head/sysutils/gsmartcontrol/Makefile   (contents, props changed)

Modified: head/sysutils/gsmartcontrol/Makefile
==============================================================================
--- head/sysutils/gsmartcontrol/Makefile	Mon Mar  4 12:17:59 2019	(r494593)
+++ head/sysutils/gsmartcontrol/Makefile	Mon Mar  4 12:22:42 2019	(r494594)
@@ -35,4 +35,14 @@ CONFIGURE_ARGS=	--disable-libglade
 
 OPTIONS_DEFINE=	DOCS
 
+post-patch:
+# Avoid conflict with C++20 <version> 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 <bsd.port.mk>


More information about the svn-ports-all mailing list