From nobody Thu May 4 18:59:29 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QC35Y6XjBz49QMn; Thu, 4 May 2023 18:59:29 +0000 (UTC) (envelope-from git@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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QC35Y5qnDz4Kj2; Thu, 4 May 2023 18:59:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683226769; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MQ0hVVh78RGszCM56nkkeCgE3sDFAPnse7kT8QrqIEU=; b=f9Ewpu/rZ1eVr0UsyD9hJmyK64gHgTKvbz5XbZNqO3UOqf2Y6Q6TXYrqd+TNyXVJ/ASADL mH1wIW9hQaTAMhVNfcuRYurct8U7zrPxpi7Gw2oanU35Hu/HK4JHCNs/728kGJzvi/2t4l AqnehVip81zsjhlzeDiZNnymyZ0+fCp2TTj8a2X/66vOyFnqfUmPTgGvluS1vluwRp7lcR dKr746ebYCuU59F5d6x2uqpRlzPFG/2oZuuqtDSTgKkt1iEp+TBJK+8KePI2cKTU0dy2f1 P2HuOb0tPDuexA8lLBEO7Qbhyo5Pk7ZLPDJ1IQsUBUZgirOy0VcRsT74l6B3Ww== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683226769; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MQ0hVVh78RGszCM56nkkeCgE3sDFAPnse7kT8QrqIEU=; b=v9imvS1yyaiDVwoiFuZlsfnO60FkemAxLIdnfbZh2uXXcHG3iAr7kujH6VaIFS2eXDY5CU q56JKJQdJUs7pabr3nEoW5/SHS1WduKRL1Zz+el4/PPH6Bl0MTULMBqXJPzSZCo04xZm5v VX2Bod9rYkeSCjhaNVwXqV85tmGAv3t4wSGUnfGayaFcczEJA8FhfQX/uBf4fMPnXGRkuT tZi674JZdzwsPOkG+nENFEklqgX8WRJ89Mhern4K9rROV4Z3h33bk0IApYbc++oAtd6wQr 1J8zbZRL5ZwjEByjT8LV12p2EKQt69/4Z5pC9rdga5C+vaC3RPzmi6u3eZhftw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683226769; a=rsa-sha256; cv=none; b=f2gkFrO0nVhTaXc96eLtoo7LSgOVh2qKAkkcvBgHMeD4fCi/Gd7x/X6CjlHx7poJvcST+E zPBN3QsOokxLaN7Fwk4a8zU7XlN8KTRc7ofUpJWZYhlUvWn4m450dkFneWEWa8w3qeDVFI SFFqukt/kswuASIDtqBIKfiTpOLdFPJ48M/NfLeUQLpL/+/AwZICAGcjavAq/lGE3/e0T3 ORf/SOauKDXlexchNoQQmdbFEfJ4BCJQTO89OWxm6YRh/61YyZTrjpipyUQRC7AINnejLM 3U5jYlDAjJuArQ7S+rQXh/Rk7gOm97x8fonb77kT2M8/hGfdkoGd7eblupGAVA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QC35Y4pDdzNZX; Thu, 4 May 2023 18:59:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 344IxTKd083378; Thu, 4 May 2023 18:59:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 344IxTX9083377; Thu, 4 May 2023 18:59:29 GMT (envelope-from git) Date: Thu, 4 May 2023 18:59:29 GMT Message-Id: <202305041859.344IxTX9083377@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Simon J. Gerraty" Subject: git: e5e345a4b0aa - main - local.dirdeps.mk skip N_host_libs for non-FreeBSD host List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: sjg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e5e345a4b0aa9ac50ed23f90851fc5c68e94e0fd Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by sjg: URL: https://cgit.FreeBSD.org/src/commit/?id=e5e345a4b0aa9ac50ed23f90851fc5c68e94e0fd commit e5e345a4b0aa9ac50ed23f90851fc5c68e94e0fd Author: Simon J. Gerraty AuthorDate: 2023-05-04 18:58:39 +0000 Commit: Simon J. Gerraty CommitDate: 2023-05-04 18:58:39 +0000 local.dirdeps.mk skip N_host_libs for non-FreeBSD host The N_host_libs dance only makes sense if host is FreeBSD. Even then, if MK_host_egacy is yes we need libmd libnetbsd does not need libutil when using libegacy Sponsored by: Juniper Networks, Inc. --- lib/libnetbsd/Makefile.depend | 1 - lib/libnetbsd/Makefile.depend.options | 1 + share/mk/local.dirdeps.mk | 34 ++++++++++++++++---------- targets/pseudo/host-tools/Makefile.depend.host | 2 +- 4 files changed, 23 insertions(+), 15 deletions(-) diff --git a/lib/libnetbsd/Makefile.depend b/lib/libnetbsd/Makefile.depend index cf2961c09880..18be76b0cb6f 100644 --- a/lib/libnetbsd/Makefile.depend +++ b/lib/libnetbsd/Makefile.depend @@ -4,7 +4,6 @@ DIRDEPS = \ include \ include/xlocale \ - lib/libutil \ .include diff --git a/lib/libnetbsd/Makefile.depend.options b/lib/libnetbsd/Makefile.depend.options index 4dcc6c412671..95c6de3baf00 100644 --- a/lib/libnetbsd/Makefile.depend.options +++ b/lib/libnetbsd/Makefile.depend.options @@ -1,5 +1,6 @@ DIRDEPS_OPTIONS = host_egacy +DIRDEPS.host_egacy.no = lib/libutil DIRDEPS.host_egacy.yes = tools/build .include diff --git a/share/mk/local.dirdeps.mk b/share/mk/local.dirdeps.mk index d0ae1c0171cb..f2328d6cd99c 100644 --- a/share/mk/local.dirdeps.mk +++ b/share/mk/local.dirdeps.mk @@ -18,30 +18,38 @@ M_dep_qual_fixes += C;($m),[^/.,]*$$;\1; .endfor #.info M_dep_qual_fixes=${M_dep_qual_fixes} +# Some things we never want to build for host +DIRDEPS_FILTER.host = \ + Ninclude* \ + Nlib/csu* \ + Nlib/libc \ + Nlib/[mn]* \ + Ngnu/lib/lib[a-r]* \ + Nsecure/lib* \ + Nusr.bin/xinstall* \ + +.if ${.MAKE.OS} == "FreeBSD" +# Host libraries should mostly be excluded from the build so the +# host version in /usr/lib is used. +# Internal libraries need to be allowed to be built though +# since they are never installed. + # Cheat for including src.libnames.mk ____: # Pull in _INTERNALLIBS .include -# Host libraries should mostly be excluded from the build so the -# host version in /usr/lib is used. Internal libraries need to be -# allowed to be built though since they are never installed. _need_host_libs= .for lib in ${_INTERNALLIBS} _need_host_libs+= ${LIB${lib:tu}DIR:S,^${OBJTOP}/,,} .endfor +.if ${MK_host_egacy} == "yes" +_need_host_libs+= lib/libmd +.endif N_host_libs:= ${cd ${SRCTOP} && echo lib/lib*:L:sh:${_need_host_libs:${M_ListToSkip}}:${M_ListToSkip}} -DIRDEPS_FILTER.host = \ - ${N_host_libs} \ - Ninclude* \ - Nlib/csu* \ - Nlib/libc \ - Nlib/[mn]* \ - Ngnu/lib/lib[a-r]* \ - Nsecure/lib* \ - Nusr.bin/xinstall* \ - +DIRDEPS_FILTER.host+= ${N_host_libs} +.endif DIRDEPS_FILTER+= \ Nbin/cat.host \ diff --git a/targets/pseudo/host-tools/Makefile.depend.host b/targets/pseudo/host-tools/Makefile.depend.host index 39324fc6d49d..7ec04928d055 100644 --- a/targets/pseudo/host-tools/Makefile.depend.host +++ b/targets/pseudo/host-tools/Makefile.depend.host @@ -1,4 +1,5 @@ DIRDEPS= \ + sbin/md5 \ usr.bin/awk \ usr.bin/cap_mkdb \ usr.bin/file2c \ @@ -12,6 +13,5 @@ DIRDEPS= \ usr.sbin/makefs \ usr.sbin/nmtree \ - .include