From owner-svn-ports-head@freebsd.org Thu Aug 29 19:37:18 2019 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 43253DE66D; Thu, 29 Aug 2019 19:37:18 +0000 (UTC) (envelope-from pkubaj@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 46KCYV0ssnz46cx; Thu, 29 Aug 2019 19:37:18 +0000 (UTC) (envelope-from pkubaj@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 EF4A024B87; Thu, 29 Aug 2019 19:37:17 +0000 (UTC) (envelope-from pkubaj@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x7TJbHNs096059; Thu, 29 Aug 2019 19:37:17 GMT (envelope-from pkubaj@FreeBSD.org) Received: (from pkubaj@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x7TJbHbX096058; Thu, 29 Aug 2019 19:37:17 GMT (envelope-from pkubaj@FreeBSD.org) Message-Id: <201908291937.x7TJbHbX096058@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pkubaj set sender to pkubaj@FreeBSD.org using -f From: Piotr Kubaj Date: Thu, 29 Aug 2019 19:37:17 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r510181 - head/lang/maude X-SVN-Group: ports-head X-SVN-Commit-Author: pkubaj X-SVN-Commit-Paths: head/lang/maude X-SVN-Commit-Revision: 510181 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.29 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: Thu, 29 Aug 2019 19:37:18 -0000 Author: pkubaj Date: Thu Aug 29 19:37:17 2019 New Revision: 510181 URL: https://svnweb.freebsd.org/changeset/ports/510181 Log: lang/maude: fix build on GCC architectures Don't link unconditinally with $NCURSESLIB. When NCURSESLIB is /usr/lib and the system compiler is base GCC, GCC from ports (currently GCC9) is used. Passing -L/usr/lib makes GCC try to link to base libstdc++ instead the one from ports. Also add USES=localbase:ldflags. PR: 239481 Approved by: linimon (mentor), greg@unrelenting.technology (maintainer) Differential Revision: https://reviews.freebsd.org/D21397 Modified: head/lang/maude/Makefile Modified: head/lang/maude/Makefile ============================================================================== --- head/lang/maude/Makefile Thu Aug 29 18:44:54 2019 (r510180) +++ head/lang/maude/Makefile Thu Aug 29 19:37:17 2019 (r510181) @@ -19,13 +19,12 @@ LIB_DEPENDS= libbdd.so:science/buddy \ libgmp.so:math/gmp \ libsigsegv.so:devel/libsigsegv -USES= alias autoreconf bison ncurses +USES= alias autoreconf bison compiler:c++11-lang localbase:ldflags \ + ncurses WRKSRC= ${WRKDIR}/maude-${PORTVERSION} GNU_CONFIGURE= yes -CPPFLAGS+= -I${NCURSESINC} -I${LOCALBASE}/include -LDFLAGS+= -L${NCURSESLIB} -L${LOCALBASE}/lib CONFIGURE_ARGS= --datadir=${DATADIR} MAKE_JOBS_UNSAFE= yes @@ -40,8 +39,13 @@ CVC4_CONFIGURE_WITH= cvc4 PORTDOCS= AUTHORS COPYING ChangeLog INSTALL NEWS README -.include +.include +.if ${NCURSESLIB} != /usr/lib +CPPFLAGS+= -I${NCURSESINC} +LDFLAGS+= -L${NCURSESLIB} +.endif + .if ${PORT_OPTIONS:MFULL_MAUDE} MASTER_SITES+= http://maude.cs.illinois.edu/w/images/c/ca/:fm FULL_MAUDE= full-maude.maude @@ -71,4 +75,4 @@ post-install-DOCS-on: post-install-FULL_MAUDE-on: ${INSTALL_DATA} ${WRKDIR}/${FULL_MAUDE} ${STAGEDIR}${DATADIR} -.include +.include