From nobody Wed Oct 02 15:55:56 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 4XJfY91Smtz5Xjpt; Wed, 02 Oct 2024 15:55:57 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XJfY90xVyz40qh; Wed, 2 Oct 2024 15:55:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727884557; 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=4W5yyUrvzCYnlbW+P9PP5g1/Rg6oJYdyng53mTR11N8=; b=WRox+LjhTjozuCYKcryNwkyjXZGLJTC4BuXAfFkS6WAJa/IuwMqUUX0Cvbl/Zu/n++JndY eNeSzeBF179+wtFQX5EZELXlbylYPctUeyfA4ERchmFqB9rjQHLa+ZJYzmWl1JtRnAuhox r/4ULyj8iQ1qBYD7LZ4HFKfS1gsVB2TfibenSvReQtTq2KuVRDP+ZvO6sFFjf/yoOeLK6d /r+yB8qe4/4DXh3rQY1u8NrXHW0UjU4v94MwffDHs2Z/ZWno07HkevXL0L81Oj91w5LRz1 VVvWaefufKkmIgLRB5oCNjN6T6M6uo7z1GGErnxyJX6POLn+0XJhcNGLThVTHA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727884557; 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=4W5yyUrvzCYnlbW+P9PP5g1/Rg6oJYdyng53mTR11N8=; b=scQ8SysvOKGiOIUlPS+NR/yaCXKiJfjQ2InJJeDIbky1s7I16L3h5Yk+7P0WtrZa6xiVPP omTbUK1HM6cofhAUM4cPU8Kh5rDEgCCp+lZJxd26et9gmKZNFcZZFxDcD2SnVqcBGfXig+ YJHU+Mc3Y0TgshqCpEsrf9Zx2H2NEXZ+WDkTrA66/cloidJk5s62L9vWh15ZXdJA2GkPCE 1oDD1lCjEcLzMimv+x7O+Gr7SHXHSarqujQeW+sGydENvmdZH+Z/FGTrTZqrspMCVf2Ina WQk5FJAmGFQ8AugmWWJz90Vs2t8nFiLLQt7Wtggesy5wsm3lJQw24emfNjH1+A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727884557; a=rsa-sha256; cv=none; b=h0hBwvotxRHe039vafnB0KPu/39lWn8majhvoRrjAzKgzCt/Off663QmnbXcboO5uuWmxv 9DvTHNJsVpyRFG5jeUbWlrGFha689lX1eK7ncoMV5V3eWmGQPGlp7jNatqTtrL+PqlfScq 2zkz6slsC4azx6sgRWL56Pg243Pc72eTRZmoMEgNPWCPCvS3VjnPqOi17JboshJKCkJ+HD UTyP/OOya1keCK+YRVG7YERIrs1gB3BWagVVC68BBnRXjSFzlz+bL83iaS0c6T6HkDAXD3 7UdlztUkklkNwP0JpNDlRfqMa2v6Gkv9Tpc6UOy5MmUyOSpTPfSiElx4pukF4w== 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 4XJfY90YP9z1RDg; Wed, 2 Oct 2024 15:55:57 +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 492Ftu8Q050867; Wed, 2 Oct 2024 15:55:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 492Ftu50050864; Wed, 2 Oct 2024 15:55:56 GMT (envelope-from git) Date: Wed, 2 Oct 2024 15:55:56 GMT Message-Id: <202410021555.492Ftu50050864@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: 2201f7c49f11 - main - Build BSD diff3 if GNU diff3 is disabled. 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: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2201f7c49f11acc636d8d8be4b660a42a4ae4e58 Auto-Submitted: auto-generated The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=2201f7c49f11acc636d8d8be4b660a42a4ae4e58 commit 2201f7c49f11acc636d8d8be4b660a42a4ae4e58 Author: Dag-Erling Smørgrav AuthorDate: 2024-10-02 15:54:53 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2024-10-02 15:55:06 +0000 Build BSD diff3 if GNU diff3 is disabled. MFC after: 3 weeks Sponsored by: Klara, Inc. Reviewed by: kevans Differential Revision: https://reviews.freebsd.org/D46799 --- tools/build/mk/OptionalObsoleteFiles.inc | 5 ----- tools/build/options/WITHOUT_GNU_DIFF | 5 ++++- tools/build/options/WITH_GNU_DIFF | 2 ++ usr.bin/Makefile | 3 +++ 4 files changed, 9 insertions(+), 6 deletions(-) diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc index c0118bcbf6cb..121905ad9158 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -2073,11 +2073,6 @@ OLD_FILES+=usr/tests/usr.bin/dc/inout OLD_DIRS+=usr/tests/usr.bin/dc .endif -.if ${MK_GNU_DIFF} == no -OLD_FILES+=usr/bin/diff3 -OLD_FILES+=usr/share/man/man1/diff3.1.gz -.endif - .if ${MK_GOOGLETEST} == no OLD_FILES+=usr/include/private/gmock/gmock-actions.h OLD_FILES+=usr/include/private/gmock/gmock-cardinalities.h diff --git a/tools/build/options/WITHOUT_GNU_DIFF b/tools/build/options/WITHOUT_GNU_DIFF index 889e878668f6..4ea9f6f4a363 100644 --- a/tools/build/options/WITHOUT_GNU_DIFF +++ b/tools/build/options/WITHOUT_GNU_DIFF @@ -1,2 +1,5 @@ Do not build GNU -.Xr diff3 1 . +.Xr diff3 1 ; +build BSD +.Xr diff3 1 +instead. diff --git a/tools/build/options/WITH_GNU_DIFF b/tools/build/options/WITH_GNU_DIFF index 6ccea1c7f28e..cc7fbf25119a 100644 --- a/tools/build/options/WITH_GNU_DIFF +++ b/tools/build/options/WITH_GNU_DIFF @@ -1,2 +1,4 @@ Build and install GNU +.Xr diff3 1 +instead of BSD .Xr diff3 1 . diff --git a/usr.bin/Makefile b/usr.bin/Makefile index 039dd8ed2f87..88786a0dd7e0 100644 --- a/usr.bin/Makefile +++ b/usr.bin/Makefile @@ -212,6 +212,9 @@ SUBDIR+= gh-bc SUBDIR.${MK_OPENSSL}+= bc SUBDIR.${MK_OPENSSL}+= dc .endif +.if ${MK_GNU_DIFF} == "no" +SUBDIR+= diff3 +.endif SUBDIR.${MK_HESIOD}+= hesinfo SUBDIR.${MK_ICONV}+= iconv SUBDIR.${MK_ICONV}+= mkcsmapper