From owner-svn-ports-head@freebsd.org Sat Jul 7 21:09:11 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 4716D102B3C1; Sat, 7 Jul 2018 21:09:11 +0000 (UTC) (envelope-from tobik@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 E97D08C561; Sat, 7 Jul 2018 21:09:10 +0000 (UTC) (envelope-from tobik@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 C7BB81C966; Sat, 7 Jul 2018 21:09:10 +0000 (UTC) (envelope-from tobik@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w67L9AlP067118; Sat, 7 Jul 2018 21:09:10 GMT (envelope-from tobik@FreeBSD.org) Received: (from tobik@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w67L9AKL067116; Sat, 7 Jul 2018 21:09:10 GMT (envelope-from tobik@FreeBSD.org) Message-Id: <201807072109.w67L9AKL067116@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tobik set sender to tobik@FreeBSD.org using -f From: Tobias Kortkamp Date: Sat, 7 Jul 2018 21:09:10 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r474139 - in head/science/simlib: . files X-SVN-Group: ports-head X-SVN-Commit-Author: tobik X-SVN-Commit-Paths: in head/science/simlib: . files X-SVN-Commit-Revision: 474139 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: Sat, 07 Jul 2018 21:09:11 -0000 Author: tobik Date: Sat Jul 7 21:09:10 2018 New Revision: 474139 URL: https://svnweb.freebsd.org/changeset/ports/474139 Log: science/simlib: Fix build - Doesn't build with Clang 6 errors.cc:14:42: error: invalid suffix on literal; C++11 requires a space between literal and identifier [-Wreserved-user-defined-literal] /* 0 */ "SIMLIB/C++ Simulation Library, "SIMLIB_COPYRIGHT"\0" ^ http://beefy12.nyi.freebsd.org/data/head-amd64-default/p473790_s335878/logs/simlib-3.02_1.log - nm crashes during the build on FreeBSD >= 11.1. Use binutils from ports as a workaround. [1] Assertion failed: (ddata->output.size > 0), function cpp_demangle_read_sname, file /usr/src/contrib/elftoolchain/libelftc/libelftc_dem_gnu3.c, line 2137. http://beefy9.nyi.freebsd.org/data/111amd64-default/473790/logs/simlib-3.02_1.log PR: 223333 [1] Added: head/science/simlib/files/patch-src_errors.txt (contents, props changed) Modified: head/science/simlib/Makefile Modified: head/science/simlib/Makefile ============================================================================== --- head/science/simlib/Makefile Sat Jul 7 21:06:14 2018 (r474138) +++ head/science/simlib/Makefile Sat Jul 7 21:09:10 2018 (r474139) @@ -20,6 +20,15 @@ CXXFLAGS+= -fPIC NOT_FOR_ARCHS= aarch64 armv6 armv7 mips mips64 powerpc powerpc64 sparc64 NOT_FOR_ARCHS_REASON= contains not working ${ARCH}-dependent assembly code +.include + +.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1101000 +# nm crashes during the build: +# Assertion failed: (ddata->output.size > 0), function cpp_demangle_read_sname, file /usr/src/contrib/elftoolchain/libelftc/libelftc_dem_gnu3.c, line 2137. +USE_BINUTILS= yes +BINARY_ALIAS= nm=${NM} +.endif + post-patch: @${REINPLACE_CMD} -e 's|make|gmake|g' ${WRKSRC}/Makefile @${REINPLACE_CMD} -e 's#%%PREFIX%%#${PREFIX}#g' \ Added: head/science/simlib/files/patch-src_errors.txt ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/science/simlib/files/patch-src_errors.txt Sat Jul 7 21:09:10 2018 (r474139) @@ -0,0 +1,13 @@ +src/errors.txt is used to generate src/errors.cc + +--- src/errors.txt.orig 2018-07-07 20:48:53 UTC ++++ src/errors.txt +@@ -14,7 +14,7 @@ _ErrMsg(_ErrEnum) + + //////////////////////////////////////////////////////////////////////////// + +-Copyright SIMLIB/C++ Simulation Library, "SIMLIB_COPYRIGHT" ++Copyright SIMLIB/C++ Simulation Library, " SIMLIB_COPYRIGHT " + UnknownError Undocumented error + InternalError Internal error + MemoryError No memory