From nobody Fri May 05 12:15:01 2023 X-Original-To: dev-commits-src-main@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 4QCV4P4TCwz49Fml; Fri, 5 May 2023 12:15:01 +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 4QCV4P3d4vz3HC0; Fri, 5 May 2023 12:15:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683288901; 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=YRt9D9/uN5pjlBaNFu/oNcw1FWZJjFgE8wExrB1keDM=; b=d7dkwfcFP3tCjrGAH0InyzNxduQPs0qX3e677tnss9omqDWHhBW4qZGkLojiGTaducJkAF IqO1+sO7vwr9rlpxIDEGVmCrMR84Q09nrZ7gRgITuwmpwje84qmoazNPWuCocyEtzjxdq2 z0P15C0IyRVYU/eaEPVeBLeJS2T8HAyAtV//f+DAfcbrgRgchIlCvUNwpAG7YTWhWzMH26 qCvmzHS1yLEyCmydKxZU2sGjFiO8cNwzggwoM7CXiI1JlftQDe2xlz1Uqfb6dVkMKGFv7o rzreYOaK9d0znqHbFKAD+JSvCGjhoSpDSuwBM317NwqQRG4xkNEBG+hUn7ymTA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683288901; 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=YRt9D9/uN5pjlBaNFu/oNcw1FWZJjFgE8wExrB1keDM=; b=a0u4Yd6oU+a73kdmwQCCNgXCzdz68+Y4xaLOfXM6Y64beTnF0Pa+mpcMmPYhynuhG+WthZ qroiOHat45dS9RPfuPHTr/qWK91dLXDnQ5SHpodrwPchSbtGIjXQ6bZlCn48RZTj/GKlKe cyeAQBgu4h09qiLmi0AMIIZ27rnCM/1evyWdU82FNkKD+dVhOfbLvz0kuYTuQgexZGLCsd SFKJ593EpH2DGP9sApZmfr7iYaPkpjT6qKtIbJa42j+KAbG/LcbC6M9jrQL2WJUBmlynYk tOF4XnvqbN9pG2PURy7GLhcVMQi1ysgG30wQuffDay5pc/g0laNxKdmhNJwcFg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683288901; a=rsa-sha256; cv=none; b=LkdrsX6Egd5mJfwWhF4QEqW4VvkjwpAZLKyOc3vi4y+1w+InhWP+2hqSVjklwmx0D9KvWo HzS6x6gHqSHIlZSm/hPEmHuSVpRRObcZMVfMUAkeOGFRs92DsCezsePhFzBt/JgW/fHyJ6 FUsQCO+gIlrTFhmIpnSBNnnkHxnXjWXPSYKcVm7tWpOvwktzPD1VEXI7IBom7pvzTxRkcq HNLxAvDgYWc8NXntzBSb/weX4BxTwWK+TpLkSBoECnKlkpFtwybxbVtz3x2j/2R0OzwCRl C1V221txaH4KnwcTrFZVDTTfYmXUm1uvqaI6J+xTKl4fbFnLLN3qf7igQDgjIA== 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 4QCV4P2hKlztx8; Fri, 5 May 2023 12:15:01 +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 345CF1Aw099321; Fri, 5 May 2023 12:15:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 345CF1aY099320; Fri, 5 May 2023 12:15:01 GMT (envelope-from git) Date: Fri, 5 May 2023 12:15:01 GMT Message-Id: <202305051215.345CF1aY099320@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: f7057652618a - main - Makefile.inc1: use make builtin :ts instead of sed List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f7057652618a73d93911cf636c254d183db77f6f Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=f7057652618a73d93911cf636c254d183db77f6f commit f7057652618a73d93911cf636c254d183db77f6f Author: Ed Maste AuthorDate: 2022-04-10 22:52:48 +0000 Commit: Ed Maste CommitDate: 2023-05-05 12:14:35 +0000 Makefile.inc1: use make builtin :ts instead of sed Commit 3eb1b4da3cf7 replaced "xargs -n1" with a sed expression to convert from space to newline as a list separator for *-old-* targets. Dan Nelson followed up with a suggestion to use make's built-in :ts instead, which should be slightly more efficient. Reviewed by: sjg Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D39972 --- Makefile.inc1 | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index d059d5dd9fea..86e8da9467da 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -3245,10 +3245,9 @@ RM_I=-fv list-old-files: .PHONY @cd ${.CURDIR}; \ ${MAKE} -f ${.CURDIR}/Makefile.inc1 ${.MAKEFLAGS} ${.TARGET} \ - -V OLD_FILES -V "OLD_FILES:Musr/share/*.gz:R" \ - -V "OLD_FILES:Mlib/*.so.*:S,^lib,usr/lib32," \ - -V "OLD_FILES:Musr/lib/*:S,^usr/lib,usr/lib32," | \ - sed -E 's/[[:space:]]+/\n/g' | sort + -V "OLD_FILES:ts\n" -V "OLD_FILES:Musr/share/*.gz:R:ts\n" \ + -V "OLD_FILES:Mlib/*.so.*:S,^lib,usr/lib32,:ts\n" \ + -V "OLD_FILES:Musr/lib/*:S,^usr/lib,usr/lib32,:ts\n" | sort delete-old-files: .PHONY @echo ">>> Removing old files (only deletes safe to delete libs)" @@ -3312,10 +3311,10 @@ check-old-files: .PHONY list-old-libs: .PHONY @cd ${.CURDIR}; \ ${MAKE} -f ${.CURDIR}/Makefile.inc1 ${.MAKEFLAGS} ${.TARGET} \ - -V OLD_LIBS -V MOVED_LIBS -V "OLD_LIBS:Mlib/*:S,^lib,usr/lib32," \ - -V "OLD_LIBS:Musr/lib/*:S,^usr/lib,usr/lib32," \ - -V "OLD_LIBS:Mlib/casper/*:S,^lib/casper,usr/lib32," | \ - sed -E 's/[[:space:]]+/\n/g' | sort + -V "OLD_LIBS:ts\n" -V "MOVED_LIBS:ts\n" \ + -V "OLD_LIBS:Mlib/*:S,^lib,usr/lib32,:ts\n" \ + -V "OLD_LIBS:Musr/lib/*:S,^usr/lib,usr/lib32,:ts\n" \ + -V "OLD_LIBS:Mlib/casper/*:S,^lib/casper,usr/lib32,:ts\n" | sort delete-old-libs: .PHONY @echo ">>> Removing old libraries"