From dfb98e350cd4d018417efa772a203229fe0bc1d0 Mon Sep 17 00:00:00 2001 From: Alex Richardson Date: Sat, 8 Aug 2020 10:05:27 +0000 Subject: [PATCH] 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 --- usr.bin/chpass/Makefile | 4 ++-- usr.sbin/pwd_mkdb/Makefile | 2 +- usr.sbin/pwd_mkdb/{ => bootstrap}/pwd.h | 0 3 files changed, 3 insertions(+), 3 deletions(-) rename usr.sbin/pwd_mkdb/{ => bootstrap}/pwd.h (100%) diff --git a/usr.bin/chpass/Makefile b/usr.bin/chpass/Makefile index fb70df886ee2..bd5baa3c4d07 100644 --- a/usr.bin/chpass/Makefile +++ b/usr.bin/chpass/Makefile @@ -3,7 +3,7 @@ .include -.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" diff --git a/usr.sbin/pwd_mkdb/Makefile b/usr.sbin/pwd_mkdb/Makefile index 4fea2f33796d..f8a2b20ef10b 100644 --- a/usr.sbin/pwd_mkdb/Makefile +++ b/usr.sbin/pwd_mkdb/Makefile @@ -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 diff --git a/usr.sbin/pwd_mkdb/pwd.h b/usr.sbin/pwd_mkdb/bootstrap/pwd.h similarity index 100% rename from usr.sbin/pwd_mkdb/pwd.h rename to usr.sbin/pwd_mkdb/bootstrap/pwd.h