Date: Thu, 11 Jun 2015 21:13:06 +0000 (UTC) From: "Simon J. Gerraty" <sjg@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284289 - in head: gnu/lib/libreadline/readline 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: <201506112113.t5BLD6aT007122@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: sjg Date: Thu Jun 11 21:13:05 2015 New Revision: 284289 URL: https://svnweb.freebsd.org/changeset/base/284289 Log: Misc fixes from projects/bmake Differential Revision: D2748 Reviewed by: brooks imp Modified: head/gnu/lib/libreadline/readline/Makefile head/gnu/usr.bin/cc/cc_tools/Makefile head/gnu/usr.bin/groff/Makefile.inc head/include/mk-osreldate.sh head/kerberos5/Makefile.inc head/kerberos5/lib/libheimipcc/Makefile head/lib/msun/Makefile head/tests/sys/pjdfstest/pjdfstest/Makefile head/usr.bin/kdump/mkioctls Modified: head/gnu/lib/libreadline/readline/Makefile ============================================================================== --- head/gnu/lib/libreadline/readline/Makefile Thu Jun 11 21:11:33 2015 (r284288) +++ head/gnu/lib/libreadline/readline/Makefile Thu Jun 11 21:13:05 2015 (r284289) @@ -16,11 +16,15 @@ INSTALLED_HEADERS= readline.h chardefs.h CFLAGS+= -I${.OBJDIR}/.. SRCDIR= ${.CURDIR}/../../../../contrib/libreadline +.NOPATH: ${INSTALLED_HEADERS} + +beforebuild: ${INSTALLED_HEADERS} +CLEANFILES+= ${INSTALLED_HEADERS} +DPSRCS+= ${INSTALLED_HEADERS} + .for _h in ${INSTALLED_HEADERS} -CLEANFILES+= ${_h} -DPSRCS+= ${.OBJDIR}/${_h} -${.OBJDIR}/${_h}: ${SRCDIR}/${_h} - ${INSTALL} ${.ALLSRC} ${.TARGET} +${_h}: ${SRCDIR}/${_h} + ln -sf ${.ALLSRC} ${.TARGET} .endfor LIBADD= ncursesw Modified: head/gnu/usr.bin/cc/cc_tools/Makefile ============================================================================== --- head/gnu/usr.bin/cc/cc_tools/Makefile Thu Jun 11 21:11:33 2015 (r284288) +++ head/gnu/usr.bin/cc/cc_tools/Makefile Thu Jun 11 21:13:05 2015 (r284289) @@ -215,6 +215,9 @@ tconfig.h: GENSRCS+= tconfig.h CLEANFILES+= cs-tconfig.h + +.NOPATH: ${GENSRCS} ${CLEANFILES} + # Options optionlist: ${OPT_FILES} LC_ALL=C awk -f ${GCCDIR}/opt-gather.awk ${.ALLSRC} > ${.TARGET} Modified: head/gnu/usr.bin/groff/Makefile.inc ============================================================================== --- head/gnu/usr.bin/groff/Makefile.inc Thu Jun 11 21:11:33 2015 (r284288) +++ head/gnu/usr.bin/groff/Makefile.inc Thu Jun 11 21:13:05 2015 (r284289) @@ -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: head/include/mk-osreldate.sh ============================================================================== --- head/include/mk-osreldate.sh Thu Jun 11 21:11:33 2015 (r284288) +++ head/include/mk-osreldate.sh Thu Jun 11 21:13:05 2015 (r284289) @@ -49,4 +49,4 @@ $COPYRIGHT #endif EOF chmod 644 $tmpfile -mv $tmpfile osreldate.h +mv -f $tmpfile osreldate.h Modified: head/kerberos5/Makefile.inc ============================================================================== --- head/kerberos5/Makefile.inc Thu Jun 11 21:11:33 2015 (r284288) +++ head/kerberos5/Makefile.inc Thu Jun 11 21:13:05 2015 (r284289) @@ -34,7 +34,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: head/kerberos5/lib/libheimipcc/Makefile ============================================================================== --- head/kerberos5/lib/libheimipcc/Makefile Thu Jun 11 21:11:33 2015 (r284288) +++ head/kerberos5/lib/libheimipcc/Makefile Thu Jun 11 21:13:05 2015 (r284289) @@ -10,7 +10,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: head/lib/msun/Makefile ============================================================================== --- head/lib/msun/Makefile Thu Jun 11 21:11:33 2015 (r284288) +++ head/lib/msun/Makefile Thu Jun 11 21:13:05 2015 (r284289) @@ -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: head/tests/sys/pjdfstest/pjdfstest/Makefile ============================================================================== --- head/tests/sys/pjdfstest/pjdfstest/Makefile Thu Jun 11 21:11:33 2015 (r284288) +++ head/tests/sys/pjdfstest/pjdfstest/Makefile Thu Jun 11 21:13:05 2015 (r284289) @@ -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: head/usr.bin/kdump/mkioctls ============================================================================== --- head/usr.bin/kdump/mkioctls Thu Jun 11 21:11:33 2015 (r284288) +++ head/usr.bin/kdump/mkioctls Thu Jun 11 21:13:05 2015 (r284289) @@ -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?201506112113.t5BLD6aT007122>