Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 16 Mar 2021 18:30:09 GMT
From:      Jung-uk Kim <jkim@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org
Subject:   git: 6827435548d2 - main - pkgbase: Fix building out-of-tree manual pages
Message-ID:  <202103161830.12GIU97h028045@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by jkim:

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

commit 6827435548d257c672f934db5c6ff01012d96995
Author:     Jung-uk Kim <jkim@FreeBSD.org>
AuthorDate: 2021-03-16 18:16:10 +0000
Commit:     Jung-uk Kim <jkim@FreeBSD.org>
CommitDate: 2021-03-16 18:29:48 +0000

    pkgbase: Fix building out-of-tree manual pages
    
    c7e6cb9e08d6 introduced MK_MANSPLITPKG but it was not available for
    building out-of-tree manual pages.  For example, x11/nvidia-driver fails
    with the following error:
    
    ===> doc (all)
    make[3]: "/usr/share/mk/bsd.man.mk" line 53: Malformed conditional (${MK_MANSPLITPKG} == "no")
    make[3]: Fatal errors encountered -- cannot continue
    
    Move the definition from src.opts.mk to bsd.opts.mk to make it visible.
---
 share/mk/bsd.opts.mk | 1 +
 share/mk/src.opts.mk | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/share/mk/bsd.opts.mk b/share/mk/bsd.opts.mk
index 9f9889d0a0f0..33d843593427 100644
--- a/share/mk/bsd.opts.mk
+++ b/share/mk/bsd.opts.mk
@@ -75,6 +75,7 @@ __DEFAULT_NO_OPTIONS = \
     INIT_ALL_PATTERN \
     INIT_ALL_ZERO \
     INSTALL_AS_USER \
+    MANSPLITPKG \
     RETPOLINE \
     STALE_STAGED
 
diff --git a/share/mk/src.opts.mk b/share/mk/src.opts.mk
index 949dfece43e4..619aa8f4a1d8 100644
--- a/share/mk/src.opts.mk
+++ b/share/mk/src.opts.mk
@@ -207,7 +207,6 @@ __DEFAULT_NO_OPTIONS = \
     LOADER_VERBOSE \
     LOADER_VERIEXEC_PASS_MANIFEST \
     MALLOC_PRODUCTION \
-    MANSPLITPKG \
     OFED_EXTRA \
     OPENLDAP \
     REPRODUCIBLE_BUILD \



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202103161830.12GIU97h028045>