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

[stevenc-guest at alioth.debian.org]

Author: stevenc-guest
Date: 2015-07-08 22:27:36 +0000 (Wed, 08 Jul 2015)
New Revision: 5726

Added:
   trunk/freebsd-buildutils/debian/patches/r276494.diff
Modified:
   trunk/freebsd-buildutils/debian/changelog
   trunk/freebsd-buildutils/debian/patches/series
Log:
Cherry-pick r276494 from HEAD:
Don't include bsd.sys.mk within bsd.kmod.mk


Modified: trunk/freebsd-buildutils/debian/changelog
===================================================================
--- trunk/freebsd-buildutils/debian/changelog	2015-07-07 23:42:58 UTC (rev 5725)
+++ trunk/freebsd-buildutils/debian/changelog	2015-07-08 22:27:36 UTC (rev 5726)
@@ -1,3 +1,10 @@
+freebsd-buildutils (10.0-7) UNRELEASED; urgency=medium
+
+  * Cherry-pick r276494 from HEAD:
+    Don't include bsd.sys.mk within bsd.kmod.mk
+
+ -- Steven Chamberlain <steven at pyro.eu.org>  Wed, 08 Jul 2015 16:44:07 +0100
+
 freebsd-buildutils (10.0-6) experimental; urgency=medium
 
   * Raise Build-Depends on freebsd-glue to >= 0.2.20~, to not be

Added: trunk/freebsd-buildutils/debian/patches/r276494.diff
===================================================================
--- trunk/freebsd-buildutils/debian/patches/r276494.diff	                        (rev 0)
+++ trunk/freebsd-buildutils/debian/patches/r276494.diff	2015-07-08 22:27:36 UTC (rev 5726)
@@ -0,0 +1,14 @@
+r276494 from upstream HEAD
+
+Don't include bsd.sys.mk within bsd.kmod.mk, else CFLAGS will be given
+twice on the command line.  That would override CWARNFLAGS, and causes
+some modules to fail to build under Clang.
+
+--- a/src/share/mk/bsd.kmod.mk
++++ b/src/share/mk/bsd.kmod.mk
+@@ -15,5 +15,3 @@
+ .endif
+ 
+ .include "${SYSDIR}/conf/kmod.mk"
+-
+-.include <bsd.sys.mk>

Modified: trunk/freebsd-buildutils/debian/patches/series
===================================================================
--- trunk/freebsd-buildutils/debian/patches/series	2015-07-07 23:42:58 UTC (rev 5725)
+++ trunk/freebsd-buildutils/debian/patches/series	2015-07-08 22:27:36 UTC (rev 5726)
@@ -31,3 +31,4 @@
 makefiles.diff
 #test
 hppa.diff
+r276494.diff