From owner-svn-ports-head@freebsd.org Thu Aug 20 18:53:59 2020 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 4672B3C5EA7; Thu, 20 Aug 2020 18:53:59 +0000 (UTC) (envelope-from cy@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 4BXYhl15Wxz3Zgb; Thu, 20 Aug 2020 18:53:59 +0000 (UTC) (envelope-from cy@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 08A3818FDA; Thu, 20 Aug 2020 18:53:59 +0000 (UTC) (envelope-from cy@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 07KIrw3C068909; Thu, 20 Aug 2020 18:53:58 GMT (envelope-from cy@FreeBSD.org) Received: (from cy@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 07KIrwWV068907; Thu, 20 Aug 2020 18:53:58 GMT (envelope-from cy@FreeBSD.org) Message-Id: <202008201853.07KIrwWV068907@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: cy set sender to cy@FreeBSD.org using -f From: Cy Schubert Date: Thu, 20 Aug 2020 18:53:58 +0000 (UTC) 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 X-SVN-Group: ports-head X-SVN-Commit-Author: cy X-SVN-Commit-Paths: in head: shells/44bsd-csh sysutils/heirloom X-SVN-Commit-Revision: 545548 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.33 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, 20 Aug 2020 18:53:59 -0000 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}