[Glibc-bsd-commits] r5961 - trunk/kfreebsd-11/debian/patches

[stevenc-guest at alioth.debian.org]

Author: stevenc-guest
Date: 2016-03-20 23:35:39 +0000 (Sun, 20 Mar 2016)
New Revision: 5961

Modified:
   trunk/kfreebsd-11/debian/patches/004_xargs.diff
Log:
Refresh patch


Modified: trunk/kfreebsd-11/debian/patches/004_xargs.diff
===================================================================
--- trunk/kfreebsd-11/debian/patches/004_xargs.diff	2016-03-20 23:11:11 UTC (rev 5960)
+++ trunk/kfreebsd-11/debian/patches/004_xargs.diff	2016-03-20 23:35:39 UTC (rev 5961)
@@ -32,21 +32,31 @@
  for H in ${src_headers}; do
 --- a/sys/conf/kern.post.mk
 +++ b/sys/conf/kern.post.mk
-@@ -234,8 +234,6 @@
+@@ -233,21 +233,21 @@
+ 	rm -f ${.TARGET}.tmp
  # C files
  	${MAKE} -V CFILES_NORMAL -V SYSTEM_CFILES -V GEN_CFILES | \
- 	    CC="${_MKDEPCC}" xargs mkdep -a -f ${.TARGET}.tmp ${CFLAGS}
--	${MAKE} -V CFILES_CDDL | \
+-	    CC="${_MKDEPCC}" xargs mkdep -a -f ${.TARGET}.tmp ${CFLAGS}
++	    CC="${_MKDEPCC}" xargs -r mkdep -a -f ${.TARGET}.tmp ${CFLAGS}
+ 	${MAKE} -V CFILES_CDDL | \
 -	    CC="${_MKDEPCC}" xargs mkdep -a -f ${.TARGET}.tmp ${ZFS_CFLAGS} \
++	    CC="${_MKDEPCC}" xargs -r mkdep -a -f ${.TARGET}.tmp ${ZFS_CFLAGS} \
  	    ${FBT_CFLAGS} ${DTRACE_CFLAGS}
  	${MAKE} -V CFILES_LINUXKPI | \
- 	    CC="${_MKDEPCC}" xargs mkdep -a -f ${.TARGET}.tmp \
-@@ -246,8 +244,6 @@
+-	    CC="${_MKDEPCC}" xargs mkdep -a -f ${.TARGET}.tmp \
++	    CC="${_MKDEPCC}" xargs -r mkdep -a -f ${.TARGET}.tmp \
+ 		${CFLAGS} ${LINUXKPI_INCLUDES}
+ 	${MAKE} -V CFILES_OFED -V CFILES_MLX5 | \
+-	    CC="${_MKDEPCC}" xargs mkdep -a -f ${.TARGET}.tmp \
++	    CC="${_MKDEPCC}" xargs -r mkdep -a -f ${.TARGET}.tmp \
+ 		${CFLAGS} ${OFEDINCLUDES}
  # Assembly files
  	${MAKE} -V SFILES_NORMAL | \
- 	    CC="${_MKDEPCC}" xargs mkdep -a -f ${.TARGET}.tmp ${ASM_CFLAGS}
--	${MAKE} -V SFILES_CDDL | \
+-	    CC="${_MKDEPCC}" xargs mkdep -a -f ${.TARGET}.tmp ${ASM_CFLAGS}
++	    CC="${_MKDEPCC}" xargs -r mkdep -a -f ${.TARGET}.tmp ${ASM_CFLAGS}
+ 	${MAKE} -V SFILES_CDDL | \
 -	    CC="${_MKDEPCC}" xargs mkdep -a -f ${.TARGET}.tmp ${ZFS_ASM_CFLAGS}
++	    CC="${_MKDEPCC}" xargs -r mkdep -a -f ${.TARGET}.tmp ${ZFS_ASM_CFLAGS}
  	mv ${.TARGET}.tmp ${.TARGET}
  .else
  	: > ${.TARGET}