Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 4 Mar 2019 18:35:03 +0000 (UTC)
From:      Jan Beich <jbeich@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r494631 - head/science/hypre
Message-ID:  <201903041835.x24IZ3I8086483@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: jbeich
Date: Mon Mar  4 18:35:02 2019
New Revision: 494631
URL: https://svnweb.freebsd.org/changeset/ports/494631

Log:
  science/hypre: unbreak with libc++ 8
  
  In file included from FEI_HYPRE_Impl.cxx:22:
  In file included from /usr/include/c++/v1/math.h:309:
  In file included from /usr/include/c++/v1/type_traits:406:
  In file included from /usr/include/c++/v1/cstddef:38:
  ./../../utilities/version:1:2: error: invalid preprocessing directive
   #!/bin/sh
    ^
  ./../../utilities/version:2:2: error: invalid preprocessing directive
   #BHEADER**********************************************************************
    ^
  ./../../utilities/version:3:3: error: invalid preprocessing directive
   # Copyright (c) 2008,  Lawrence Livermore National Security, LLC.
     ^
  [...]
  
  PR:		236192
  Approved by:	portmgr blanket

Modified:
  head/science/hypre/Makefile   (contents, props changed)

Modified: head/science/hypre/Makefile
==============================================================================
--- head/science/hypre/Makefile	Mon Mar  4 18:34:55 2019	(r494630)
+++ head/science/hypre/Makefile	Mon Mar  4 18:35:02 2019	(r494631)
@@ -52,6 +52,11 @@ SHL3=	${PORTVERSION}
 SHL2=	${SHL3:R}
 SHL1=	${SHL2:R}
 
+post-patch:
+# Avoid conflict with C++20 <version> by ignoring <...> under WRKSRC
+	@${REINPLACE_CMD} -i .c++20 '/utilities/s/-I/-iquote/' \
+		${WRKSRC}/FEI_mv/*/Makefile
+
 do-install:
 	${INSTALL_DATA} ${WRKSRC}/hypre/include/* ${STAGEDIR}${PREFIX}/include
 	${INSTALL_LIB} ${WRKSRC}/hypre/lib/libHYPRE-${SHL3}.so	\



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201903041835.x24IZ3I8086483>