From nobody Fri Dec 13 23:04:26 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 4Y94fM02T0z5gHTT; Fri, 13 Dec 2024 23:04:27 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y94fL6ZPQz4mjf; Fri, 13 Dec 2024 23:04:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734131066; 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=yErTZeargmnwW3dtejqsP3F7ovUIyFoXBao5J1dmymg=; b=tCN+NjLKzde3oVgKzHqgFLkf2Au4o+zhae7Hd/xNRbVpzwJu2cYP6AV0OYnAs9tQ6JKHXC TxcY8svyr0ujRrNXWUzM4/kflpulRiZEzXq2Ts1az3Y0ACR8pmiHdSHWq+a0p8H1Niswfz gfoZntYXB2Grno9MyqMKJHANEaw+xDhi5n5GxdQ0V30aCfdlO0csgdEmdMwGem7J9JGFnw eQCSfVgScc0NBeHHgmc1HoLMCShwgMxZCqdKbQWAUCj2e1bOdOtorI4RUPNWvbaT3JrPO8 JyOyT2YIPJonR6jgZVvoH3YsrMDMXnG3cqk/lNMZc6FQU9PLMdL2RNDcXkhc7A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734131066; 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=yErTZeargmnwW3dtejqsP3F7ovUIyFoXBao5J1dmymg=; b=lOm1nAGwdVHma5XS4Hk8tEYwSpak3JQysh2iCZv4+aKzc/UvI6/N0vLhecnTTW44Ng6hw3 YhSFVks6pseJcwC+Wj5aJQWj56CiGm37fyUwjNtadetIOxmn21RGhOQ5i1EoN9T/6LFJJ3 +UIM75IeBDCWChTfM7JFfPnM9vxKvVSTmE0a5Y30cPkBdkr6w2VsLAfteNNTNjZi4EIdly oOBm8fyOndGy1LMdIrwSVblNNtrHLwpZtsFpMMBpA8uWKgZX7zkF7IJqiT2DD83a3CoXRm 1eERcOt/4sAroQSoHWGzMjkhoZJZmXa8vSC1HajHz/aDg+dwtYq2iLyDb0Du+A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734131066; a=rsa-sha256; cv=none; b=mWFOq31jZVY3XjBk5vYDZk6HEsivyBgQqtILMAp8ZhhHqmv9xPD+iz+0q3BKZ9E/9U5Djy 3nD22Q0nNMkJ3hJxov8W84aEfPmVqL8wW865ujxnfBbXDOu89Qsm5SdZVo2ijlsJ4T3K3j ZwQFCz/CISh4ZMxgQuzQvLJ4toXK4M3lqvFZVzEMGy/yEr2/Uuiy9prh5xHh8eH+IH2PKS nWvMLfWd/qqctRcXfUHE9CA0uF3ayD+oPHWIehzBTHfKXh6k1Izkcrym0NbVcWoguGZ5QT ULFPMfab4JwJVWvQ7niAyznq5CwEQZrXE39LM6iza4n/NKkOF3nScs/NfV8dhA== 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 4Y94fL68pNzxXk; Fri, 13 Dec 2024 23:04:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4BDN4Qlc029114; Fri, 13 Dec 2024 23:04:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BDN4QSd029112; Fri, 13 Dec 2024 23:04:26 GMT (envelope-from git) Date: Fri, 13 Dec 2024 23:04:26 GMT Message-Id: <202412132304.4BDN4QSd029112@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 42ee30f19cc7 - main - depend-cleanup.sh: Need to delete jemalloc.3 in objtree 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 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 42ee30f19cc7ad85187cbf97155dbd5207a04845 Auto-Submitted: auto-generated 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