From owner-svn-ports-head@freebsd.org Sat Oct 12 20:49:36 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 8DA9814450F; Sat, 12 Oct 2019 20:49:36 +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 46rH4c2ppMz4Wt0; Sat, 12 Oct 2019 20:49:36 +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 1A0C19225; Sat, 12 Oct 2019 20:49:36 +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 x9CKnZTc085159; Sat, 12 Oct 2019 20:49:35 GMT (envelope-from pkubaj@FreeBSD.org) Received: (from pkubaj@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x9CKnZTD085158; Sat, 12 Oct 2019 20:49:35 GMT (envelope-from pkubaj@FreeBSD.org) Message-Id: <201910122049.x9CKnZTD085158@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pkubaj set sender to pkubaj@FreeBSD.org using -f From: Piotr Kubaj Date: Sat, 12 Oct 2019 20:49:35 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r514354 - head/Mk X-SVN-Group: ports-head X-SVN-Commit-Author: pkubaj X-SVN-Commit-Paths: head/Mk X-SVN-Commit-Revision: 514354 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: Sat, 12 Oct 2019 20:49:36 -0000 Author: pkubaj Date: Sat Oct 12 20:49:35 2019 New Revision: 514354 URL: https://svnweb.freebsd.org/changeset/ports/514354 Log: Mk/bsd.port.mk: use GNU LD from ports on powerpc64 elfv2 when GNU LD is required The reason is that on elfv2 systems we still have ld.bfd in base, but it's only used for 32-bit binaries (LLD currently doesn't support linking 32-bit PPC binaries). ld.bfd from base supports only elfv1 and using it breaks linking many ports that set LLD_UNSAFE. Use Binutils from ports in such case. PR: 239743 Submitted by: jbeich Approved by: portmgr Differential Revision: https://reviews.freebsd.org/D21996 Modified: head/Mk/bsd.port.mk Modified: head/Mk/bsd.port.mk ============================================================================== --- head/Mk/bsd.port.mk Sat Oct 12 20:29:09 2019 (r514353) +++ head/Mk/bsd.port.mk Sat Oct 12 20:49:35 2019 (r514354) @@ -1842,6 +1842,11 @@ PKG_DEPENDS+= ${LOCALBASE}/sbin/pkg:${PKG_ORIGIN} .if defined(LLD_UNSAFE) && ${/usr/bin/ld:L:tA} == /usr/bin/ld.lld LDFLAGS+= -fuse-ld=bfd BINARY_ALIAS+= ld=${LD} +. if ${ARCH} == powerpc64 +# Base ld.bfd can't do ELFv2 which powerpc64 with Clang in base uses +USE_BINUTILS= yes +LDFLAGS+= -B${LOCALBASE}/bin +. endif . if !defined(USE_BINUTILS) . if exists(/usr/bin/ld.bfd) LD= /usr/bin/ld.bfd