From owner-svn-src-all@freebsd.org Wed Mar 6 20:13:04 2019 Return-Path: Delivered-To: svn-src-all@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 302991525E3F; Wed, 6 Mar 2019 20:13:04 +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 C81EE6E770; Wed, 6 Mar 2019 20:13:03 +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 A0FB28987; Wed, 6 Mar 2019 20:13:03 +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 x26KD3uQ067724; Wed, 6 Mar 2019 20:13:03 GMT (envelope-from jhb@FreeBSD.org) Received: (from jhb@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x26KD2xi067720; Wed, 6 Mar 2019 20:13:02 GMT (envelope-from jhb@FreeBSD.org) Message-Id: <201903062013.x26KD2xi067720@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jhb set sender to jhb@FreeBSD.org using -f From: John Baldwin Date: Wed, 6 Mar 2019 20:13:02 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r344854 - in head: gnu/usr.bin gnu/usr.bin/binutils share/man/man5 share/mk X-SVN-Group: head X-SVN-Commit-Author: jhb X-SVN-Commit-Paths: in head: gnu/usr.bin gnu/usr.bin/binutils share/man/man5 share/mk X-SVN-Commit-Revision: 344854 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: C81EE6E770 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.98 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; NEURAL_HAM_SHORT(-0.98)[-0.980,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 06 Mar 2019 20:13:04 -0000 Author: jhb Date: Wed Mar 6 20:13:02 2019 New Revision: 344854 URL: https://svnweb.freebsd.org/changeset/base/344854 Log: Divorce MK_GDB from MK_BINUTILS. This permits legacy GDB to still be built and installed if WITHOUT_BINUTILS is set (e.g. if base/binutils is installed). Reviewed by: emaste MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D19480 Modified: head/gnu/usr.bin/Makefile head/gnu/usr.bin/binutils/Makefile head/share/man/man5/src.conf.5 head/share/mk/src.opts.mk Modified: head/gnu/usr.bin/Makefile ============================================================================== --- head/gnu/usr.bin/Makefile Wed Mar 6 20:10:23 2019 (r344853) +++ head/gnu/usr.bin/Makefile Wed Mar 6 20:13:02 2019 (r344854) @@ -7,7 +7,10 @@ SUBDIR.${MK_GCC}+= gperf .endif -SUBDIR.${MK_BINUTILS}+= binutils +.if ${MK_GDB} != "no" || ${MK_BINUTILS} != "no" +SUBDIR+= binutils +.endif + SUBDIR.${MK_DIALOG}+= dialog SUBDIR.${MK_GCC}+= cc SUBDIR.${MK_GNU_DIFF}+= diff3 Modified: head/gnu/usr.bin/binutils/Makefile ============================================================================== --- head/gnu/usr.bin/binutils/Makefile Wed Mar 6 20:10:23 2019 (r344853) +++ head/gnu/usr.bin/binutils/Makefile Wed Mar 6 20:13:02 2019 (r344854) @@ -2,18 +2,19 @@ .include -SUBDIR= doc\ - libiberty \ +SUBDIR= libiberty \ libbfd \ - libopcodes \ - libbinutils \ - as \ - objdump + libopcodes +SUBDIR.${MK_BINUTILS}+= doc +SUBDIR.${MK_BINUTILS}+= libbinutils +SUBDIR.${MK_BINUTILS}+= as +SUBDIR.${MK_BINUTILS}+= objdump + # When we use ld.lld as /usr/bin/ld, do not install the non-ifunc-capable # GNU binutils 2.17.50 ld. .if ${MK_LLD_IS_LD} == "no" -SUBDIR+=ld +SUBDIR.${MK_BINUTILS}+=ld .endif SUBDIR_DEPEND_libbinutils=libbfd # for bfdver.h Modified: head/share/man/man5/src.conf.5 ============================================================================== --- head/share/man/man5/src.conf.5 Wed Mar 6 20:10:23 2019 (r344853) +++ head/share/man/man5/src.conf.5 Wed Mar 6 20:13:02 2019 (r344854) @@ -187,12 +187,6 @@ The resulting system cannot build programs from source .Pp This is a default setting on arm64/aarch64 and riscv/riscv64. -When set, it enforces these options: -.Pp -.Bl -item -compact -.It -.Va WITHOUT_GDB -.El .It Va WITH_BINUTILS Set to build and install GNU .Xr as 1 , Modified: head/share/mk/src.opts.mk ============================================================================== --- head/share/mk/src.opts.mk Wed Mar 6 20:10:23 2019 (r344853) +++ head/share/mk/src.opts.mk Wed Mar 6 20:13:02 2019 (r344854) @@ -430,10 +430,6 @@ MK_${var}:= no MK_LLVM_LIBUNWIND:= no .endif -.if ${MK_BINUTILS} == "no" -MK_GDB:= no -.endif - .if ${MK_CAPSICUM} == "no" MK_CASPER:= no .endif