From owner-svn-src-head@freebsd.org Sat Aug 8 10:05:28 2020 Return-Path: Delivered-To: svn-src-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id E1FCE3A6807; Sat, 8 Aug 2020 10:05:28 +0000 (UTC) (envelope-from arichardson@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BNyXS5htxz4ZvJ; Sat, 8 Aug 2020 10:05:28 +0000 (UTC) (envelope-from arichardson@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id A6D0F270E0; Sat, 8 Aug 2020 10:05:28 +0000 (UTC) (envelope-from arichardson@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 078A5Sld091623; Sat, 8 Aug 2020 10:05:28 GMT (envelope-from arichardson@FreeBSD.org) Received: (from arichardson@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 078A5StA091621; Sat, 8 Aug 2020 10:05:28 GMT (envelope-from arichardson@FreeBSD.org) Message-Id: <202008081005.078A5StA091621@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: arichardson set sender to arichardson@FreeBSD.org using -f From: Alex Richardson Date: Sat, 8 Aug 2020 10:05:28 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r364049 - in head: usr.bin/chpass usr.sbin/pwd_mkdb usr.sbin/pwd_mkdb/bootstrap X-SVN-Group: head X-SVN-Commit-Author: arichardson X-SVN-Commit-Paths: in head: usr.bin/chpass usr.sbin/pwd_mkdb usr.sbin/pwd_mkdb/bootstrap X-SVN-Commit-Revision: 364049 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 08 Aug 2020 10:05:28 -0000 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 -.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 Copied and modified: head/usr.sbin/pwd_mkdb/bootstrap/pwd.h (from r364046, head/usr.sbin/pwd_mkdb/pwd.h) ==============================================================================