From owner-svn-ports-head@freebsd.org Tue Sep 1 15:40:33 2015 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id EA7C39C6204; Tue, 1 Sep 2015 15:40:33 +0000 (UTC) (envelope-from rakuco@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id C1F76AF2; Tue, 1 Sep 2015 15:40:33 +0000 (UTC) (envelope-from rakuco@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t81FeXwd064775; Tue, 1 Sep 2015 15:40:33 GMT (envelope-from rakuco@FreeBSD.org) Received: (from rakuco@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t81FeX5d064774; Tue, 1 Sep 2015 15:40:33 GMT (envelope-from rakuco@FreeBSD.org) Message-Id: <201509011540.t81FeX5d064774@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: rakuco set sender to rakuco@FreeBSD.org using -f From: Raphael Kubo da Costa Date: Tue, 1 Sep 2015 15:40:33 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r395768 - head/math/gringo X-SVN-Group: ports-head 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.20 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, 01 Sep 2015 15:40:34 -0000 Author: rakuco Date: Tue Sep 1 15:40:32 2015 New Revision: 395768 URL: https://svnweb.freebsd.org/changeset/ports/395768 Log: Require a C++11-compliant standard library and make it work with GCC < 4.9. Despite ports r340913, the port still fails to build on FreeBSD 9.3 with lang/gcc (GCC 4.8): libreify/src/parser.cc: In member function 'void Reify::Parser::parseProgram()': libreify/src/parser.cc:130:51: error: 'to_string' is not a member of 'std' Apply a workaround for bug 193528 found in other ports to make that function visible to GCC 4.8 (GCC 4.9 and later are fine). Additionally, the port actually requires a C++11 standard library in addition to a C++11-compliant compiler, so adjust the USES line and later simplify the process of choosing which compiler to use. Approved by: vsevolod (maintainer) Differential Revision: https://reviews.freebsd.org/D3545 Modified: head/math/gringo/Makefile Modified: head/math/gringo/Makefile ============================================================================== --- head/math/gringo/Makefile Tue Sep 1 15:28:21 2015 (r395767) +++ head/math/gringo/Makefile Tue Sep 1 15:40:32 2015 (r395768) @@ -14,22 +14,19 @@ LICENSE= GPLv3 BUILD_DEPENDS= re2c:${PORTSDIR}/devel/re2c -USES= scons bison compiler:c++11-lang +USES= bison compiler:c++11-lib scons MAKE_ARGS+= ${MAKE_ENV} CXXFLAGS+= -std=c++11 MAKE_ENV+= WITH_LUA=no -PLIST_FILES= bin/${PORTNAME} bin/clingo - -.include +# Unhide std::to_string() with GCC < 4.9 (ports/193528) +CXXFLAGS+= -D_GLIBCXX_USE_C99 -.if ${OSVERSION} < 1000000 -USE_GCC= yes -.endif +PLIST_FILES= bin/${PORTNAME} bin/clingo do-install: ${INSTALL_PROGRAM} ${INSTALL_WRKSRC}/build/debug/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/${PORTNAME} ${INSTALL_PROGRAM} ${INSTALL_WRKSRC}/build/debug/clingo ${STAGEDIR}${PREFIX}/bin/clingo -.include +.include