svn commit: r364049 - in head: usr.bin/chpass usr.sbin/pwd_mkdb usr.sbin/pwd_mkdb/bootstrap

[Alex Richardson]

Author: arichardson
Date: Sat Aug  8 10:05:27 2020
New Revision: 364049
URL: https://svnweb.freebsd.org/changeset/base/364049

Log:
  Fix i386 build of chpass after r363992
  
  My change to allow bootstrapping pwd_mkdb (r363992) resulted in i386 build
  failures because the bootstrap header was being included in non-bootstrap chpass.
  Dropping the no longer required pwd_mkdb include path from chpass fixes
  the build, but to be certain that the failure doesn't get re-introduced,
  I've also moved the bootstrap pwd.h into a subdirectory so that adding
  -I${SRCTOP}/usr.sbin/pwd_mkdb doesn't pull it in.
  
  Reported by:	mjg

Added:
  head/usr.sbin/pwd_mkdb/bootstrap/
  head/usr.sbin/pwd_mkdb/bootstrap/pwd.h   (contents, props changed)
     - copied, changed from r364046, head/usr.sbin/pwd_mkdb/pwd.h
Deleted:
  head/usr.sbin/pwd_mkdb/pwd.h
Modified:
  head/usr.bin/chpass/Makefile
  head/usr.sbin/pwd_mkdb/Makefile

Modified: head/usr.bin/chpass/Makefile
==============================================================================
--- head/usr.bin/chpass/Makefile	Fri Aug  7 23:32:42 2020	(r364048)
+++ head/usr.bin/chpass/Makefile	Sat Aug  8 10:05:27 2020	(r364049)
@@ -3,7 +3,7 @@
 
 .include <src.opts.mk>
 
-.PATH: ${SRCTOP}/usr.sbin/pwd_mkdb ${SRCTOP}/lib/libc/gen
+.PATH: ${SRCTOP}/lib/libc/gen
 
 PROG=	chpass
 SRCS=	chpass.c edit.c field.c pw_scan.c table.c util.c
@@ -15,7 +15,7 @@ CFLAGS+= -DYP
 .endif
 #Some people need this, uncomment to activate
 #CFLAGS+=-DRESTRICT_FULLNAME_CHANGE
-CFLAGS+=-I${SRCTOP}/usr.sbin/pwd_mkdb -I${SRCTOP}/lib/libc/gen -I.
+CFLAGS+=-I${SRCTOP}/lib/libc/gen -I.
 
 LIBADD=	crypt util
 .if ${MK_NIS} != "no"

Modified: head/usr.sbin/pwd_mkdb/Makefile
==============================================================================
--- head/usr.sbin/pwd_mkdb/Makefile	Fri Aug  7 23:32:42 2020	(r364048)
+++ head/usr.sbin/pwd_mkdb/Makefile	Sat Aug  8 10:05:27 2020	(r364049)
@@ -10,7 +10,7 @@ SRCS=	pw_scan.c pwd_mkdb.c
 
 CFLAGS+= -I${SRCTOP}/lib/libc/gen		# for pw_scan.h
 .if defined(BOOTSTRAPPING)
-CFLAGS+=-I${.CURDIR}
+CFLAGS+=-I${.CURDIR}/bootstrap
 .endif
 
 .include <bsd.prog.mk>

Copied and modified: head/usr.sbin/pwd_mkdb/bootstrap/pwd.h (from r364046, head/usr.sbin/pwd_mkdb/pwd.h)
==============================================================================