Date: Fri, 4 Dec 2015 18:59:20 +0000 (UTC) From: Bryan Drewery <bdrewery@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r291815 - in stable/10: gnu/usr.bin/cc/cc_tools gnu/usr.bin/groff include kerberos5 kerberos5/lib/libheimipcc lib/msun tests/sys/pjdfstest/pjdfstest usr.bin/kdump Message-ID: <201512041859.tB4IxK1u032199@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bdrewery Date: Fri Dec 4 18:59:20 2015 New Revision: 291815 URL: https://svnweb.freebsd.org/changeset/base/291815 Log: MFC r284289,r288267: r284289: Misc fixes from projects/bmake r288267: Remove redundant .NOPATH. Modified: stable/10/gnu/usr.bin/cc/cc_tools/Makefile stable/10/gnu/usr.bin/groff/Makefile.inc stable/10/include/mk-osreldate.sh stable/10/kerberos5/Makefile.inc stable/10/kerberos5/lib/libheimipcc/Makefile stable/10/lib/msun/Makefile stable/10/tests/sys/pjdfstest/pjdfstest/Makefile stable/10/usr.bin/kdump/mkioctls Directory Properties: stable/10/ (props changed) Modified: stable/10/gnu/usr.bin/cc/cc_tools/Makefile ============================================================================== --- stable/10/gnu/usr.bin/cc/cc_tools/Makefile Fri Dec 4 18:50:12 2015 (r291814) +++ stable/10/gnu/usr.bin/cc/cc_tools/Makefile Fri Dec 4 18:59:20 2015 (r291815) @@ -217,6 +217,7 @@ tconfig.h: GENSRCS+= tconfig.h CLEANFILES+= cs-tconfig.h + # Options optionlist: ${OPT_FILES} LC_ALL=C awk -f ${GCCDIR}/opt-gather.awk ${.ALLSRC} > ${.TARGET} Modified: stable/10/gnu/usr.bin/groff/Makefile.inc ============================================================================== --- stable/10/gnu/usr.bin/groff/Makefile.inc Fri Dec 4 18:50:12 2015 (r291814) +++ stable/10/gnu/usr.bin/groff/Makefile.inc Fri Dec 4 18:59:20 2015 (r291815) @@ -127,6 +127,7 @@ revision=`sed -e 's/^0$$//' -e 's/^[1-9] .sh .pl: @${ECHO} Making ${.TARGET} from ${.IMPSRC} + @rm -f ${.TARGET} @sed -e "s|@BINDIR@|${BINDIR}|g" \ -e 's|@GROFF_BIN_PATH_SETUP@|GROFF_RUNTIME="$${GROFF_BIN_PATH=${BINDIR}}:"|g' \ -e "s;@FONTDIR@;$(fontdir);g" \ Modified: stable/10/include/mk-osreldate.sh ============================================================================== --- stable/10/include/mk-osreldate.sh Fri Dec 4 18:50:12 2015 (r291814) +++ stable/10/include/mk-osreldate.sh Fri Dec 4 18:59:20 2015 (r291815) @@ -49,4 +49,4 @@ $COPYRIGHT #endif EOF chmod 644 $tmpfile -mv $tmpfile osreldate.h +mv -f $tmpfile osreldate.h Modified: stable/10/kerberos5/Makefile.inc ============================================================================== --- stable/10/kerberos5/Makefile.inc Fri Dec 4 18:50:12 2015 (r291814) +++ stable/10/kerberos5/Makefile.inc Fri Dec 4 18:59:20 2015 (r291815) @@ -35,7 +35,7 @@ ETSRCS= \ .for ET in ${ETSRCS} .for _ET in ${ET:T:R} .if ${SRCS:M${_ET}.[ch]} != "" -.ORDER: ${_ET}.c ${_ET}.h +.ORDER: ${_ET}.h ${_ET}.c ${_ET}.c ${_ET}.h: ${ET} compile_et ${.ALLSRC} CLEANFILES+= ${_ET}.h ${_ET}.c Modified: stable/10/kerberos5/lib/libheimipcc/Makefile ============================================================================== --- stable/10/kerberos5/lib/libheimipcc/Makefile Fri Dec 4 18:50:12 2015 (r291814) +++ stable/10/kerberos5/lib/libheimipcc/Makefile Fri Dec 4 18:59:20 2015 (r291815) @@ -11,7 +11,8 @@ SRCS= \ CFLAGS+= -I${KRB5DIR}/lib/roken \ -I${KRB5DIR}/base \ - -I${KRB5DIR}/lib/ipc + -I${KRB5DIR}/lib/ipc \ + -I${KRB5DIR}/include .include <bsd.lib.mk> Modified: stable/10/lib/msun/Makefile ============================================================================== --- stable/10/lib/msun/Makefile Fri Dec 4 18:50:12 2015 (r291814) +++ stable/10/lib/msun/Makefile Fri Dec 4 18:59:20 2015 (r291815) @@ -35,6 +35,8 @@ CFLAGS+= -I${.CURDIR}/ld80 CFLAGS+= -I${.CURDIR}/ld128 .endif +CFLAGS+= -I${.CURDIR}/${ARCH_SUBDIR} + .PATH: ${.CURDIR}/bsdsrc .PATH: ${.CURDIR}/src .PATH: ${.CURDIR}/man Modified: stable/10/tests/sys/pjdfstest/pjdfstest/Makefile ============================================================================== --- stable/10/tests/sys/pjdfstest/pjdfstest/Makefile Fri Dec 4 18:50:12 2015 (r291814) +++ stable/10/tests/sys/pjdfstest/pjdfstest/Makefile Fri Dec 4 18:59:20 2015 (r291815) @@ -8,7 +8,7 @@ BINDIR= ${TESTSBASE}/sys/pjdfstest PROG= pjdfstest MAN= -CFLAGS= -D__OS_FreeBSD__ -DHAS_LCHMOD -DHAS_CHFLAGS -DHAS_FCHFLAGS +CFLAGS+= -D__OS_FreeBSD__ -DHAS_LCHMOD -DHAS_CHFLAGS -DHAS_FCHFLAGS CFLAGS+= -DHAS_CHFLAGSAT -DHAS_LCHFLAGS -DHAS_FREEBSD_ACL -DHAS_BINDAT CFLAGS+= -DHAS_CONNECTAT Modified: stable/10/usr.bin/kdump/mkioctls ============================================================================== --- stable/10/usr.bin/kdump/mkioctls Fri Dec 4 18:50:12 2015 (r291814) +++ stable/10/usr.bin/kdump/mkioctls Fri Dec 4 18:59:20 2015 (r291815) @@ -39,7 +39,7 @@ case "${MACHINE}" in esac awk -v x="$ioctl_includes" 'BEGIN {print x}' | - $CPP -I$1 -dM -DCOMPAT_43TTY - | + $CPP -nostdinc -I$1 -dM -DCOMPAT_43TTY - | awk -v ioctl_includes="$ioctl_includes" -v style="$style" ' BEGIN { print "/* XXX obnoxious prerequisites. */"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201512041859.tB4IxK1u032199>