From owner-svn-ports-head@freebsd.org Tue Jul 24 20:22:16 2018 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id DA7B310552F7; Tue, 24 Jul 2018 20:22:16 +0000 (UTC) (envelope-from yuri@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 90A277E732; Tue, 24 Jul 2018 20:22:16 +0000 (UTC) (envelope-from yuri@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 7238F107DD; Tue, 24 Jul 2018 20:22:16 +0000 (UTC) (envelope-from yuri@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w6OKMG9r052962; Tue, 24 Jul 2018 20:22:16 GMT (envelope-from yuri@FreeBSD.org) Received: (from yuri@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w6OKMGnq052961; Tue, 24 Jul 2018 20:22:16 GMT (envelope-from yuri@FreeBSD.org) Message-Id: <201807242022.w6OKMGnq052961@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: yuri set sender to yuri@FreeBSD.org using -f From: Yuri Victorovich Date: Tue, 24 Jul 2018 20:22:16 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r475273 - in head/science/mpqc: . files X-SVN-Group: ports-head X-SVN-Commit-Author: yuri X-SVN-Commit-Paths: in head/science/mpqc: . files X-SVN-Commit-Revision: 475273 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 24 Jul 2018 20:22:17 -0000 Author: yuri Date: Tue Jul 24 20:22:15 2018 New Revision: 475273 URL: https://svnweb.freebsd.org/changeset/ports/475273 Log: science/mpqc: Fix build Two fixes: * Force some stl-related define values because configured values are wrong * Force the C++-98 standard because of breakage on newer clangs/systems Reported by: fallout Deleted: head/science/mpqc/files/patch-src_lib_util_keyval_ipv2__scan.cc head/science/mpqc/files/patch-src_lib_util_keyval_ipv2__scan.ll Modified: head/science/mpqc/Makefile Modified: head/science/mpqc/Makefile ============================================================================== --- head/science/mpqc/Makefile Tue Jul 24 20:14:36 2018 (r475272) +++ head/science/mpqc/Makefile Tue Jul 24 20:22:15 2018 (r475273) @@ -3,7 +3,7 @@ PORTNAME= mpqc PORTVERSION= 2.3.1 -PORTREVISION= 34 +PORTREVISION= 35 CATEGORIES= science parallel MASTER_SITES= SF @@ -32,6 +32,7 @@ INSTALL_TARGET= install install_devel DESTDIRNAME= installroot SHEBANG_FILES= src/bin/mpqc/ccarunproc src/bin/mpqc/mpqcrunproc USE_LDCONFIG= yes +USE_CXXSTD= c++98 # workaround https://github.com/ValeevGroup/mpqc/issues/57 OPTIONS_DEFINE= ATLAS DOXYGEN EXAMPLES ICC MPICH OPTIFLAGS OPTIONS_DEFAULT= DOXYGEN @@ -69,6 +70,12 @@ post-patch: -e 's/pthread_join(0,0)/pthread_create(0,0,0,0)/' \ -e 's|/usr/bin/wish|${LOCALBASE}/bin/wish|' \ ${WRKSRC}/configure + +post-configure: # workaround: https://github.com/ValeevGroup/mpqc/issues/56 + @${REINPLACE_CMD} -e ' \ + s|/\* #undef USING_NAMESPACE_STD \*/|#define USING_NAMESPACE_STD 1|; \ + s|/\* #undef HAVE_SGETN \*/|#define HAVE_SGETN 1|' \ + ${WRKSRC}/src/lib/scconfig.h do-build-DOXYGEN-on: @(cd ${WRKSRC}/doc && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS})