git: c432a007529f - stable/13 - pkgbase: Fix cherry-pick conflict

Emmanuel Vadot manu at FreeBSD.org
Thu Aug 19 07:10:41 UTC 2021


The branch stable/13 has been updated by manu:

URL: https://cgit.FreeBSD.org/src/commit/?id=c432a007529f8d7315ac30da36fb0ac1128ec977

commit c432a007529f8d7315ac30da36fb0ac1128ec977
Author:     Emmanuel Vadot <manu at FreeBSD.org>
AuthorDate: 2021-08-19 07:09:39 +0000
Commit:     Emmanuel Vadot <manu at FreeBSD.org>
CommitDate: 2021-08-19 07:09:39 +0000

    pkgbase: Fix cherry-pick conflict
    
    17fe7de111dd was supposed to remove the option from src.opts.mk
---
 share/mk/src.opts.mk | 1 -
 1 file changed, 1 deletion(-)

diff --git a/share/mk/src.opts.mk b/share/mk/src.opts.mk
index 6fb8c6c855a1..f5f582688161 100644
--- a/share/mk/src.opts.mk
+++ b/share/mk/src.opts.mk
@@ -208,7 +208,6 @@ __DEFAULT_NO_OPTIONS = \
     LOADER_FIREWIRE \
     LOADER_VERBOSE \
     LOADER_VERIEXEC_PASS_MANIFEST \
-    MANSPLITPKG \
     OFED_EXTRA \
     OPENLDAP \
     OPENSSL_KTLS \


More information about the dev-commits-src-branches mailing list