[Glibc-bsd-commits] r5921 - trunk/kfreebsd-10/debian/patches

[stevenc-guest at alioth.debian.org]

Author: stevenc-guest
Date: 2016-03-05 16:22:40 +0000 (Sat, 05 Mar 2016)
New Revision: 5921

Modified:
   trunk/kfreebsd-10/debian/patches/004_xargs.diff
Log:
Restore missing patch hunk


Modified: trunk/kfreebsd-10/debian/patches/004_xargs.diff
===================================================================
--- trunk/kfreebsd-10/debian/patches/004_xargs.diff	2016-03-05 16:14:28 UTC (rev 5920)
+++ trunk/kfreebsd-10/debian/patches/004_xargs.diff	2016-03-05 16:22:40 UTC (rev 5921)
@@ -30,3 +30,30 @@
  
  # canonify include paths
  for H in ${src_headers}; do
+--- a/sys/conf/kern.post.mk
++++ b/sys/conf/kern.post.mk
+@@ -208,16 +208,17 @@
+ # C files
+ 	${MAKE} -V CFILES_NORMAL -V SYSTEM_CFILES -V GEN_CFILES | \
+ 	    MKDEP_CPP="${CC} -E" CC="${CC}" xargs mkdep -a -f ${.TARGET}.tmp ${CFLAGS}
+-	${MAKE} -V CFILES_ZFS | \
+-	    MKDEP_CPP="${CC} -E" CC="${CC}" xargs mkdep -a -f ${.TARGET}.tmp ${ZFS_CFLAGS}
+-	${MAKE} -V CFILES_OFED -V CFILES_MLX5 | \
+-	    MKDEP_CPP="${CC} -E" CC="${CC}" xargs mkdep -a -f ${.TARGET}.tmp \
+-		${CFLAGS} ${OFEDINCLUDES}
++	# GNU xargs behaves differently when given a single newline character.
++#	${MAKE} -V CFILES_ZFS | \
++#	    MKDEP_CPP="${CC} -E" CC="${CC}" xargs mkdep -a -f ${.TARGET}.tmp ${ZFS_CFLAGS}
++#	${MAKE} -V CFILES_OFED -V CFILES_MLX5 | \
++#	    MKDEP_CPP="${CC} -E" CC="${CC}" xargs mkdep -a -f ${.TARGET}.tmp \
++#		${CFLAGS} ${OFEDINCLUDES}
+ # Assembly files
+ 	${MAKE} -V SFILES_NORMAL | \
+ 	    MKDEP_CPP="${CC} -E" CC="${CC}" xargs mkdep -a -f ${.TARGET}.tmp ${ASM_CFLAGS}
+-	${MAKE} -V SFILES_ZFS | \
+-	    MKDEP_CPP="${CC} -E" CC="${CC}" xargs mkdep -a -f ${.TARGET}.tmp ${ZFS_ASM_CFLAGS}
++#	${MAKE} -V SFILES_ZFS | \
++#	    MKDEP_CPP="${CC} -E" CC="${CC}" xargs mkdep -a -f ${.TARGET}.tmp ${ZFS_ASM_CFLAGS}
+ 	mv ${.TARGET}.tmp ${.TARGET}
+ 
+ _ILINKS= machine