From nobody Tue Apr 23 12:27:20 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 4VP1bD73dGz5H8LY; Tue, 23 Apr 2024 12:27:20 +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 4VP1bD5njMz4cBD; Tue, 23 Apr 2024 12:27:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713875240; 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=qPko+7xHlKKJO/qDmnGyLw5nT0z8IzYRhEqGts1+6XQ=; b=X6o9oLtjGD/gyLmvj4Kbzjg5qSFur86+PKHxOQRogNSIso0kdXsZ7xSg0WDAgbZ3qmroy3 zcteBmcjFpXB9KI1H+sEbKDLAe8LjWVcgE/m/TEPaZnOrV6t6zdxj3kSOjiaRAOQev2jmP qUU2iKNalNuQaFM4+ptuvsHq8b6VF1p6SHDhMuGRP4PhLMlvMYtDohandh5179u1R8EL2L DaEreKSnX02qdh6JqWYjkD6cTRcDJ3DTUQiQ1XPLoX5TimfRKJ7sS10KVAYRM9MkRtD0FD 4TZDD2j2hrMRlpjH1yVFiohct6lKywtevvpmb1+BtzT7VTYWVJ2z4pywG9Yvuw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713875240; a=rsa-sha256; cv=none; b=XqBKWYyKDRHiyfsTXu2YO1ti4SUIjsNTLzVN92oap/YhjQxlFLuf4VZ8Z0T9eQXa4DnbOk /9uoNRGe08pPlVqNVfQBPUO+NKI7bQVRmSjWW0nQjpY+MwsHF5lCK3FQt6LK0VRgnzE0mt 9jznm0XRpnk7Q7LHGWQtBazkPsl8YNt/XdYAGaJ+oq7Hjh4QNpHhgc0JDf7/qti/atQbIw 4uzgYjvTQGBH75j8LFTY6gpbOkqjdQxetLfW2Atg1wvksLJEZ9xY9YAKsHPxCIPI52EWie pia95g/uzllwOAzpAttpIBOXVNVCpkOtsZFHTG6mT06L9X+L53Bm4EInhluewQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713875240; 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=qPko+7xHlKKJO/qDmnGyLw5nT0z8IzYRhEqGts1+6XQ=; b=oPHCuvbK2YGeM4I2KdPVEniO8jxthmnX1pjtOUdj/R7mucJ7Lh5E0zc1NZkHx7eEPnZCPG wCdLyJAvvWbePjYgFBQTegoBve+ZHN75flAzL1OUwaLs7NsnMYmeFRuSp+UAqZ/+UrA29D p0eMwd4qcDsDTm+3MIHzRcfavPnYgFNCHCZUe3wFoLCyis6pdj/1TkzUNfvYHTUhKEsdVO e38KhhNHmY/PGHabosAt5NDLP27tPDia5NBZkpLtaI9MKPo8vBuzhyPguqTzL+tVBqZHYS miOE8cTLri2fzRNNh3FDMQxvm2PRb64vm52W4r4VNf4DXLv3scoFNInTu5/0ZA== 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 4VP1bD55qXzXXd; Tue, 23 Apr 2024 12:27:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 43NCRKtY030631; Tue, 23 Apr 2024 12:27:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43NCRKnq030628; Tue, 23 Apr 2024 12:27:20 GMT (envelope-from git) Date: Tue, 23 Apr 2024 12:27:20 GMT Message-Id: <202404231227.43NCRKnq030628@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: 91d35fb663e0 - main - Remove WITHOUT_CAPSICUM build support 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: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 91d35fb663e0276abc4963ae559e4759ea929842 Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=91d35fb663e0276abc4963ae559e4759ea929842 commit 91d35fb663e0276abc4963ae559e4759ea929842 Author: Ed Maste AuthorDate: 2024-04-23 11:20:59 +0000 Commit: Ed Maste CommitDate: 2024-04-23 12:26:28 +0000 Remove WITHOUT_CAPSICUM build support Capsicum is non-optional as of c24c117b9644 ("Remove WITHOUT_{CAPSICUM,CASPER} options"). `#ifndef WITHOUT_CAPSICUM` is left in the source for the benefit of downstream consumers, but is never defined in FreeBSD. Reviewed by: oshogbo Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D42077 --- share/mk/src.opts.mk | 5 ----- tools/build/options/WITHOUT_CAPSICUM | 1 - usr.bin/xz/Makefile | 4 ---- 3 files changed, 10 deletions(-) diff --git a/share/mk/src.opts.mk b/share/mk/src.opts.mk index 2ea0cbf24268..3d3a1299fac9 100644 --- a/share/mk/src.opts.mk +++ b/share/mk/src.opts.mk @@ -218,7 +218,6 @@ __DEFAULT_NO_OPTIONS = \ ZONEINFO_LEAPSECONDS_SUPPORT \ __REQUIRED_OPTIONS = \ - CAPSICUM \ CASPER # LEFT/RIGHT. Left options which default to "yes" unless their corresponding @@ -383,10 +382,6 @@ BROKEN_OPTIONS+= TESTS # Force some options off if their dependencies are off. # Order is somewhat important. # -.if ${MK_CAPSICUM} == "no" -MK_CASPER:= no -.endif - .if ${MK_SOURCELESS} == "no" MK_SOURCELESS_HOST:= no MK_SOURCELESS_UCODE:= no diff --git a/tools/build/options/WITHOUT_CAPSICUM b/tools/build/options/WITHOUT_CAPSICUM deleted file mode 100644 index 19d821f6c981..000000000000 --- a/tools/build/options/WITHOUT_CAPSICUM +++ /dev/null @@ -1 +0,0 @@ -This option has no effect. diff --git a/usr.bin/xz/Makefile b/usr.bin/xz/Makefile index e3cbafb0ebc3..5b61202a981e 100644 --- a/usr.bin/xz/Makefile +++ b/usr.bin/xz/Makefile @@ -43,10 +43,6 @@ CFLAGS+= -DHAVE_CONFIG_H \ -I${LZMALIBDIR} \ -I${XZDIR}/common -.if ${MK_CAPSICUM} == "no" -CFLAGS+= -DWITHOUT_CAPSICUM -.endif - LIBADD= lzma .include