git: 4380eb895aef - stable/12 - Fix vi build on Linux/macOS

Baptiste Daroussin bapt at FreeBSD.org
Wed Sep 22 10:31:04 UTC 2021


The branch stable/12 has been updated by bapt:

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

commit 4380eb895aef2730bebee95cd6431e1e744f2cb7
Author:     Alex Richardson <arichardson at FreeBSD.org>
AuthorDate: 2020-09-21 09:03:42 +0000
Commit:     Baptiste Daroussin <bapt at FreeBSD.org>
CommitDate: 2021-09-22 10:27:39 +0000

    Fix vi build on Linux/macOS
    
    This absolute include causes a build failure on Linux for me:
    .../cheri/freebsd/contrib/nvi/cl/../common/common.h:10:10: fatal error: '/usr/include/db.h' file not found
    
    This change patches the file to use #include <db.h> instead until a
    solution has been found upstream. See also https://github.com/lichray/nvi2/issues/69
    
    Reviewed By:    bapt
    Differential Revision: https://reviews.freebsd.org/D26480
    
    (cherry picked from commit 2bd2b113353d79cc7bdd315c3c76e0fc13218219)
---
 contrib/nvi/common/common.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/contrib/nvi/common/common.h b/contrib/nvi/common/common.h
index ad559a5a2267..256fe6a0029a 100644
--- a/contrib/nvi/common/common.h
+++ b/contrib/nvi/common/common.h
@@ -7,7 +7,7 @@
  * See the LICENSE file for redistribution information.
  */
 
-#include "/usr/include/db.h"	/* Only include db1. */
+#include <db.h>			/* Only include db1. */
 #include <regex.h>		/* May refer to the bundled regex. */
 
 /*


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