[Glibc-bsd-commits] r5975 - trunk/kfreebsd-10/debian

[stevenc-guest at alioth.debian.org]

Author: stevenc-guest
Date: 2016-04-01 21:31:19 +0000 (Fri, 01 Apr 2016)
New Revision: 5975

Modified:
   trunk/kfreebsd-10/debian/changelog
   trunk/kfreebsd-10/debian/rules
Log:
Prevent improper #include of mm_malloc.h by GCC headers


Modified: trunk/kfreebsd-10/debian/changelog
===================================================================
--- trunk/kfreebsd-10/debian/changelog	2016-04-01 21:28:34 UTC (rev 5974)
+++ trunk/kfreebsd-10/debian/changelog	2016-04-01 21:31:19 UTC (rev 5975)
@@ -2,6 +2,7 @@
 
   * Disable Stack Smashing Protection when building with GCC
     (see #819754)
+  * Prevent improper #include of mm_malloc.h by GCC headers
 
  -- Steven Chamberlain <steven at pyro.eu.org>  Fri, 01 Apr 2016 22:24:32 +0100
 

Modified: trunk/kfreebsd-10/debian/rules
===================================================================
--- trunk/kfreebsd-10/debian/rules	2016-04-01 21:28:34 UTC (rev 5974)
+++ trunk/kfreebsd-10/debian/rules	2016-04-01 21:31:19 UTC (rev 5975)
@@ -86,6 +86,9 @@
 # "unstripped-binary-or-object" lintian error).
 MAKE += -DWITHOUT_KERNEL_SYMBOLS	
 
+# Prevent improper #include of mm_malloc.h by GCC headers
+CFLAGS += -D_MM_MALLOC_H_INCLUDED
+
 get-orig-source:
 	rm -rf $(ORIG_DIR)
 	svn export --ignore-keywords -r $(svn_revision) $(SVN)/sys $(ORIG_DIR)/sys
@@ -226,7 +229,8 @@
 
 	# Build it
 	$(MAKE) CC=$(cc_cmd) -C $(FLAVOR_DIR)-$*/sys/$(kfreebsd_cpu)/compile/$(configfile)/ depend
-	$(MAKE) CC=$(cc_cmd) -C $(FLAVOR_DIR)-$*/sys/$(kfreebsd_cpu)/compile/$(configfile)/
+	CFLAGS='$(CFLAGS)' \
+	 $(MAKE) CC=$(cc_cmd) -C $(FLAVOR_DIR)-$*/sys/$(kfreebsd_cpu)/compile/$(configfile)/
 
 	touch build-flavor-$*-stamp