From nobody Sat Dec 14 11:47:35 2024 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 4Y9Pbm5tm5z5h6dH; Sat, 14 Dec 2024 11:48:20 +0000 (UTC) (envelope-from herbert@gojira.at) Received: from mail.bsd4all.net (mail.bsd4all.net [94.130.200.20]) (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 ECDSA (P-384) client-digest SHA384) (Client CN "mail.bsd4all.net", Issuer "E6" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y9Pbl0dSSz4h75; Sat, 14 Dec 2024 11:48:18 +0000 (UTC) (envelope-from herbert@gojira.at) Authentication-Results: mx1.freebsd.org; dkim=pass header.d=gojira.at header.s=mail202005 header.b=EiBVHYkl; spf=pass (mx1.freebsd.org: domain of herbert@gojira.at designates 94.130.200.20 as permitted sender) smtp.mailfrom=herbert@gojira.at; dmarc=none Date: Sat, 14 Dec 2024 12:47:35 +0100 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=gojira.at; s=mail202005; t=1734176890; bh=+tR1KbDDUbGk8JuiV4NowAHGBtbmfNm60UcPcPa/2gg=; h=Date:Message-ID:From:To:Subject:MIME-Version:Content-Type; b=EiBVHYklXrd2tUOPoMW9OdGxMv7Vf8wWb4K75mkCu07pONbGr/tw+m1gRowG8Me8/ 3DIrtthaVDsp0zmtrF88vuyCfDde2xiarinzV7CgGrc2zrhEE6Z/tnF2diN09Gt+LN 2KUDKJQTScQYIkKOCmRYnCJXXqLQAS5kDqWE0NoCDCRZR2yDsvxSzOgwwaVfcPCoGT fdIrW0FcB2itmMbTK4BncIJVOTIGwXGy+z+CldWjfJXuw2HScLOec922DQuq0/Yre9 /Cq8LVbYI4qpETqRiiV0lwhpu4rqmbc8g4+x3uB1UBN9tYwmaQsk+wniltoQ3zEZnz lI3TJ0jESBtow== Message-ID: <87y10icwq0.wl-herbert@gojira.at> From: "Herbert J. Skuhra" To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: 42ee30f19cc7 - main - depend-cleanup.sh: Need to delete jemalloc.3 in objtree In-Reply-To: <202412132304.4BDN4QSd029112@gitrepo.freebsd.org> References: <202412132304.4BDN4QSd029112@gitrepo.freebsd.org> User-Agent: Wanderlust/2.15.9 (Almost Unreal) Emacs/31.0 Mule/6.0 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 (generated by SEMI-EPG 1.14.7 - "Harue") Content-Type: text/plain; charset=US-ASCII X-Spamd-Result: default: False [-2.50 / 15.00]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_HAM_LONG(-1.00)[-1.000]; MID_CONTAINS_FROM(1.00)[]; NEURAL_HAM_SHORT(-1.00)[-0.997]; R_DKIM_ALLOW(-0.20)[gojira.at:s=mail202005]; R_SPF_ALLOW(-0.20)[+ip4:94.130.200.20]; MIME_GOOD(-0.10)[text/plain]; ARC_NA(0.00)[]; ASN(0.00)[asn:24940, ipnet:94.130.0.0/16, country:DE]; MIME_TRACE(0.00)[0:+]; FROM_HAS_DN(0.00)[]; DMARC_NA(0.00)[gojira.at]; RCPT_COUNT_THREE(0.00)[3]; FROM_EQ_ENVFROM(0.00)[]; RCVD_COUNT_ZERO(0.00)[0]; TO_DN_NONE(0.00)[]; MLMMJ_DEST(0.00)[dev-commits-src-all@FreeBSD.org,dev-commits-src-main@FreeBSD.org]; TO_MATCH_ENVRCPT_ALL(0.00)[]; DKIM_TRACE(0.00)[gojira.at:+] X-Rspamd-Queue-Id: 4Y9Pbl0dSSz4h75 X-Spamd-Bar: -- On Sat, 14 Dec 2024 00:04:26 +0100, Warner Losh wrote: > > The branch main has been updated by imp: > > URL: https://cgit.FreeBSD.org/src/commit/?id=42ee30f19cc7ad85187cbf97155dbd5207a04845 > > commit 42ee30f19cc7ad85187cbf97155dbd5207a04845 > Author: Warner Losh > AuthorDate: 2024-12-13 17:46:59 +0000 > Commit: Warner Losh > CommitDate: 2024-12-13 23:04:34 +0000 > > depend-cleanup.sh: Need to delete jemalloc.3 in objtree > > With the jemalloc.3 move into the tree (it's a generated file that we > don't/can't generate as part of the build), we need to remove it from > the .OBJDIR or make gets confused about how to build it (honestly for > reasons unknown). > > Sponsored by: Netflix > --- > tools/build/depend-cleanup.sh | 8 ++++++++ > 1 file changed, 8 insertions(+) > > diff --git a/tools/build/depend-cleanup.sh b/tools/build/depend-cleanup.sh > index 6e7585f0afe6..81acf517f9d7 100755 > --- a/tools/build/depend-cleanup.sh > +++ b/tools/build/depend-cleanup.sh > @@ -231,3 +231,11 @@ clean_dep lib/libcrypt crypt-md5 c > clean_dep lib/libcrypt crypt-nthash c > clean_dep lib/libcrypt crypt-sha256 c > clean_dep lib/libcrypt crypt-sha512 c > + > +# 20241213 b55f5e1c4ae3 jemalloc: Move generated jemalloc.3 into lib/libc tree > +if [ -e "$OBJTOP"/lib/libc/jemalloc.3 ]; then > + # Have to cleanup the jemalloc.3 in the obj tree since make gets > + # confused and won't use the one in lib/libc/malloc/jemalloc/jemalloc.3 > + echo "Removing stale jemalloc.3 object" > + run rm -f "$OBJTOP"/lib/libc/jemalloc.3 > +fi Does this actually work? Should this be if [ -h "$OBJTOP"/lib/libc/jemalloc.3 ]; then ?