Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 20 Aug 2020 18:53:58 +0000 (UTC)
From:      Cy Schubert <cy@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r545548 - in head: shells/44bsd-csh sysutils/heirloom
Message-ID:  <202008201853.07KIrwWV068907@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: cy
Date: Thu Aug 20 18:53:58 2020
New Revision: 545548
URL: https://svnweb.freebsd.org/changeset/ports/545548

Log:
  Fix build after llvm 11 import into 13-current.

Modified:
  head/shells/44bsd-csh/Makefile   (contents, props changed)
  head/sysutils/heirloom/Makefile   (contents, props changed)

Modified: head/shells/44bsd-csh/Makefile
==============================================================================
--- head/shells/44bsd-csh/Makefile	Thu Aug 20 18:50:32 2020	(r545547)
+++ head/shells/44bsd-csh/Makefile	Thu Aug 20 18:53:58 2020	(r545548)
@@ -15,6 +15,7 @@ EXTRACT_DEPENDS=	rcs:devel/rcs57
 BROKEN_aarch64=	Fails to link: missing sbrk
 
 USES=		tar:bzip2
+LDFLAGS=	-Wl,--allow-multiple-definition
 NO_WRKSUBDIR=	yes
 PORTDOCS=	paper.ascii.gz
 

Modified: head/sysutils/heirloom/Makefile
==============================================================================
--- head/sysutils/heirloom/Makefile	Thu Aug 20 18:50:32 2020	(r545547)
+++ head/sysutils/heirloom/Makefile	Thu Aug 20 18:53:58 2020	(r545548)
@@ -14,8 +14,9 @@ BUILD_DEPENDS=	ksh:shells/pdksh
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		gmake ncurses tar:bzip2
-MAKE_ARGS=	CC=${CC} CFLAGS="${CFLAGS}" ROOT="${STAGEDIR}" \
-		LCURS="-L${LOCALBASE}/lib -lncurses"
+LDFLAGS+=	-Wl,--allow-multiple-definition
+MAKE_ARGS=	CC=${CC} CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" \
+		ROOT="${STAGEDIR}" LCURS="-L${LOCALBASE}/lib -lncurses"
 MAKEFILE=	makefile
 ALL_TARGET=	#
 DATADIR=	${PREFIX}/${PORTNAME}



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