[Glibc-bsd-commits] r3805 - in trunk/freebsd-buildutils/debian: . patches

[Robert Millan]

Author: rmh
Date: 2011-11-03 14:02:25 +0000 (Thu, 03 Nov 2011)
New Revision: 3805

Added:
   trunk/freebsd-buildutils/debian/patches/23_mkdep_undef.diff
Modified:
   trunk/freebsd-buildutils/debian/changelog
   trunk/freebsd-buildutils/debian/patches/series
Log:
Fix bsd.dep.mk so that -U flags are propagated in kernel builds.

Modified: trunk/freebsd-buildutils/debian/changelog
===================================================================
--- trunk/freebsd-buildutils/debian/changelog	2011-11-03 12:15:08 UTC (rev 3804)
+++ trunk/freebsd-buildutils/debian/changelog	2011-11-03 14:02:25 UTC (rev 3805)
@@ -6,8 +6,9 @@
   [ Robert Millan ]
   * Export CFLAGS in debian/rules so that it is actually propagated.
     (Closes: #642700)
+  * Fix bsd.dep.mk so that -U flags are propagated in kernel builds.
 
- -- Robert Millan <rmh at debian.org>  Sat, 24 Sep 2011 21:45:57 +0000
+ -- Robert Millan <rmh at debian.org>  Thu, 03 Nov 2011 15:02:07 +0100
 
 freebsd-buildutils (8.2-7) unstable; urgency=low
 

Added: trunk/freebsd-buildutils/debian/patches/23_mkdep_undef.diff
===================================================================
--- trunk/freebsd-buildutils/debian/patches/23_mkdep_undef.diff	                        (rev 0)
+++ trunk/freebsd-buildutils/debian/patches/23_mkdep_undef.diff	2011-11-03 14:02:25 UTC (rev 3805)
@@ -0,0 +1,15 @@
+--- a/src/share/mk/bsd.dep.mk
++++ b/src/share/mk/bsd.dep.mk
+@@ -130,9 +130,9 @@
+ MKDEP_CXXFLAGS=	${CXXFLAGS:M-X*} ${CXXFLAGS:M-[BID]*}
+ MKDEP_OBJCFLAGS=${OBJCFLAGS:M-X*} ${OBJCFLAGS:M-[BID]*}
+ .else
+-MKDEP_CFLAGS=	${CFLAGS:M-nostdinc*} ${CFLAGS:M-[BID]*}
+-MKDEP_CXXFLAGS=	${CXXFLAGS:M-nostdinc*} ${CXXFLAGS:M-[BID]*}
+-MKDEP_OBJCFLAGS=${OBJCFLAGS:M-nostdinc*} ${OBJCFLAGS:M-[BID]*} ${OBJCFLAGS:M-Wno-import*}
++MKDEP_CFLAGS=	${CFLAGS:M-nostdinc*} ${CFLAGS:M-[BIDU]*}
++MKDEP_CXXFLAGS=	${CXXFLAGS:M-nostdinc*} ${CXXFLAGS:M-[BIDU]*}
++MKDEP_OBJCFLAGS=${OBJCFLAGS:M-nostdinc*} ${OBJCFLAGS:M-[BIDU]*} ${OBJCFLAGS:M-Wno-import*}
+ .endif
+ 
+ DPSRCS+= ${SRCS}

Modified: trunk/freebsd-buildutils/debian/patches/series
===================================================================
--- trunk/freebsd-buildutils/debian/patches/series	2011-11-03 12:15:08 UTC (rev 3804)
+++ trunk/freebsd-buildutils/debian/patches/series	2011-11-03 14:02:25 UTC (rev 3805)
@@ -16,3 +16,4 @@
 20_libbsd_overlay.diff
 21_endian.diff
 22_ld_as_needed.diff
+23_mkdep_undef.diff