From owner-svn-ports-head@freebsd.org Wed Feb 20 00:48:37 2019 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id A482514DFB10; Wed, 20 Feb 2019 00:48:37 +0000 (UTC) (envelope-from jhb@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 40E4F84612; Wed, 20 Feb 2019 00:48:37 +0000 (UTC) (envelope-from jhb@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 34EDA25AF9; Wed, 20 Feb 2019 00:48:37 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x1K0mbaR017386; Wed, 20 Feb 2019 00:48:37 GMT (envelope-from jhb@FreeBSD.org) Received: (from jhb@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x1K0maeo017385; Wed, 20 Feb 2019 00:48:36 GMT (envelope-from jhb@FreeBSD.org) Message-Id: <201902200048.x1K0maeo017385@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jhb set sender to jhb@FreeBSD.org using -f From: John Baldwin Date: Wed, 20 Feb 2019 00:48:36 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r493400 - in head: base/binutils devel/binutils X-SVN-Group: ports-head X-SVN-Commit-Author: jhb X-SVN-Commit-Paths: in head: base/binutils devel/binutils X-SVN-Commit-Revision: 493400 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 40E4F84612 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.96 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_LONG(-1.00)[-0.999,0]; NEURAL_HAM_SHORT(-0.96)[-0.959,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] 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: Wed, 20 Feb 2019 00:48:37 -0000 Author: jhb (src,doc committer) Date: Wed Feb 20 00:48:36 2019 New Revision: 493400 URL: https://svnweb.freebsd.org/changeset/ports/493400 Log: Permit base/binutils to be built as a native package. - Don't require CROSS_TOOLCHAIN and CROSS_SYSROOT for base/binutils. - Fix some places in devel/binutils to test the PREFIX instead of CROSS_TOOLCHAIN to determine if base/binutils is being built. - When base/binutils is built natively, the binaries are installed with the target name prefix already. Reviewed by: bapt Differential Revision: https://reviews.freebsd.org/D19128 Modified: head/base/binutils/Makefile head/devel/binutils/Makefile Modified: head/base/binutils/Makefile ============================================================================== --- head/base/binutils/Makefile Tue Feb 19 23:03:41 2019 (r493399) +++ head/base/binutils/Makefile Wed Feb 20 00:48:36 2019 (r493400) @@ -10,14 +10,6 @@ COMMENT= GNU binary tools for base MASTERDIR= ${.CURDIR}/../../devel/binutils PLIST= ${.CURDIR}/pkg-plist -.if !defined(CROSS_TOOLCHAIN) -.error Please define CROSS_TOOLCHAIN before building -.endif - -.if !defined(CROSS_SYSROOT) -.error Please define CROSS_SYSROOT before building -.endif - TARGETARCH= ${ARCH:S/amd64/x86_64/} BUTARGET= ${TARGETARCH}-unknown-${OPSYS:tl}${OSREL} Modified: head/devel/binutils/Makefile ============================================================================== --- head/devel/binutils/Makefile Tue Feb 19 23:03:41 2019 (r493399) +++ head/devel/binutils/Makefile Wed Feb 20 00:48:36 2019 (r493400) @@ -14,7 +14,7 @@ LICENSE= GPLv3 LGPL3 LICENSE_COMB= multi EXTRA_PATCHES= ${FILESDIR}/binutils-do-not-provide-shared-section-symbols.patch:-p1 -.if !defined(CROSS_TOOLCHAIN) +.if defined(PREFIX) && ${PREFIX} != "/usr" BUILD_DEPENDS= ${LOCALBASE}/lib/libgmp.so:math/gmp \ ${LOCALBASE}/lib/libmpfr.so:math/mpfr @@ -122,28 +122,30 @@ post-install: ${RM} ${STAGEDIR}${PREFIX}/${BUTARGET}/lib/ldscripts/i386bsd.* @if [ -d ${STAGEDIR}${PREFIX}/${INFO_PATH:H} ] ; then rm -rf ${STAGEDIR}${PREFIX}/${INFO_PATH:H}; fi ${LN} -fs ../../bin/${BUTARGET}-size ${STAGEDIR}${PREFIX}/${BUTARGET}/bin/size +.if ${PREFIX} == "/usr" .if defined(CROSS_TOOLCHAIN) ${MV} ${STAGEDIR}/usr/bin/as ${STAGEDIR}/usr/bin/${BUTARGET}-as - ${LN} -fs /usr/bin/${BUTARGET}-as ${STAGEDIR}/usr/bin/as ${MV} ${STAGEDIR}/usr/bin/ld ${STAGEDIR}/usr/bin/${BUTARGET}-ld - ${LN} -fs /usr/bin/${BUTARGET}-ld ${STAGEDIR}/usr/bin/ld ${MV} ${STAGEDIR}/usr/bin/ld.bfd ${STAGEDIR}/usr/bin/${BUTARGET}-ld.bfd - ${LN} -fs /usr/bin/${BUTARGET}-ld.bfd ${STAGEDIR}/usr/bin/ld.bfd ${MV} ${STAGEDIR}/usr/bin/objcopy ${STAGEDIR}/usr/bin/${BUTARGET}-objcopy - ${LN} -fs /usr/bin/${BUTARGET}-objcopy ${STAGEDIR}/usr/bin/objcopy ${MV} ${STAGEDIR}/usr/bin/objdump ${STAGEDIR}/usr/bin/${BUTARGET}-objdump - ${LN} -fs /usr/bin/${BUTARGET}-objdump ${STAGEDIR}/usr/bin/objdump ${MV} ${STAGEDIR}/${MANDIR}1/as.1 ${STAGEDIR}/${MANDIR}1/${BUTARGET}-as.1 ${GZIP_CMD} ${STAGEDIR}/${MANDIR}1/${BUTARGET}-as.1 - ${LN} -fs ${BUTARGET}-as.1.gz ${STAGEDIR}/${MANDIR}1/as.1.gz ${MV} ${STAGEDIR}/${MANDIR}1/ld.1 ${STAGEDIR}/${MANDIR}1/${BUTARGET}-ld.1 ${GZIP_CMD} ${STAGEDIR}/${MANDIR}1/${BUTARGET}-ld.1 - ${LN} -fs ${BUTARGET}-ld.1.gz ${STAGEDIR}/${MANDIR}1/ld.1.gz ${MV} ${STAGEDIR}/${MANDIR}1/objcopy.1 ${STAGEDIR}/${MANDIR}1/${BUTARGET}-objcopy.1 ${GZIP_CMD} ${STAGEDIR}/${MANDIR}1/${BUTARGET}-objcopy.1 - ${LN} -fs ${BUTARGET}-objcopy.1.gz ${STAGEDIR}/${MANDIR}1/objcopy.1.gz ${MV} ${STAGEDIR}/${MANDIR}1/objdump.1 ${STAGEDIR}/${MANDIR}1/${BUTARGET}-objdump.1 ${GZIP_CMD} ${STAGEDIR}/${MANDIR}1/${BUTARGET}-objdump.1 +.endif + ${LN} -fs /usr/bin/${BUTARGET}-as ${STAGEDIR}/usr/bin/as + ${LN} -fs /usr/bin/${BUTARGET}-ld ${STAGEDIR}/usr/bin/ld + ${LN} -fs /usr/bin/${BUTARGET}-ld.bfd ${STAGEDIR}/usr/bin/ld.bfd + ${LN} -fs /usr/bin/${BUTARGET}-objcopy ${STAGEDIR}/usr/bin/objcopy + ${LN} -fs /usr/bin/${BUTARGET}-objdump ${STAGEDIR}/usr/bin/objdump + ${LN} -fs ${BUTARGET}-as.1.gz ${STAGEDIR}/${MANDIR}1/as.1.gz + ${LN} -fs ${BUTARGET}-ld.1.gz ${STAGEDIR}/${MANDIR}1/ld.1.gz + ${LN} -fs ${BUTARGET}-objcopy.1.gz ${STAGEDIR}/${MANDIR}1/objcopy.1.gz ${LN} -fs ${BUTARGET}-objdump.1.gz ${STAGEDIR}/${MANDIR}1/objdump.1.gz @${RM} -r ${STAGEDIR}${PREFIX}/include @${RM} -r ${STAGEDIR}${PREFIX}/lib