Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 29 Aug 2019 19:37:17 +0000 (UTC)
From:      Piotr Kubaj <pkubaj@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r510181 - head/lang/maude
Message-ID:  <201908291937.x7TJbHbX096058@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
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 <bsd.port.options.mk>
+.include <bsd.port.pre.mk>
 
+.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 <bsd.port.mk>
+.include <bsd.port.post.mk>



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