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

[Robert Millan]

Author: rmh
Date: 2012-03-09 21:32:42 +0000 (Fri, 09 Mar 2012)
New Revision: 4140

Added:
   trunk/freebsd-buildutils/debian/patches/mk_clang_is_cc.diff
Modified:
   trunk/freebsd-buildutils/debian/changelog
   trunk/freebsd-buildutils/debian/patches/series
Log:
Add MK_CLANG_IS_CC build option (needed by recent kfreebsd-10).

Modified: trunk/freebsd-buildutils/debian/changelog
===================================================================
--- trunk/freebsd-buildutils/debian/changelog	2012-03-09 20:55:17 UTC (rev 4139)
+++ trunk/freebsd-buildutils/debian/changelog	2012-03-09 21:32:42 UTC (rev 4140)
@@ -1,3 +1,9 @@
+freebsd-buildutils (9.0-9) UNRELEASED; urgency=low
+
+  * Add MK_CLANG_IS_CC build option (needed by recent kfreebsd-10).
+
+ -- Robert Millan <rmh at debian.org>  Fri, 09 Mar 2012 22:32:25 +0100
+
 freebsd-buildutils (9.0-8) unstable; urgency=low
 
   * Add getosreldate() to local headers.

Added: trunk/freebsd-buildutils/debian/patches/mk_clang_is_cc.diff
===================================================================
--- trunk/freebsd-buildutils/debian/patches/mk_clang_is_cc.diff	                        (rev 0)
+++ trunk/freebsd-buildutils/debian/patches/mk_clang_is_cc.diff	2012-03-09 21:32:42 UTC (rev 4140)
@@ -0,0 +1,24 @@
+
+Cherry-picked from upstream SVN rev 232322
+
+--- a/src/share/mk/bsd.own.mk
++++ b/src/share/mk/bsd.own.mk
+@@ -413,6 +413,7 @@
+     BIND_LIBS \
+     BIND_SIGCHASE \
+     BIND_XML \
++    CLANG_IS_CC \
+     HESIOD \
+     ICONV \
+     IDEA \
+@@ -561,6 +562,10 @@
+ MK_GDB:=	no
+ .endif
+ 
++.if ${MK_CLANG} == "no"
++MK_CLANG_IS_CC:= no
++.endif
++
+ #
+ # Set defaults for the MK_*_SUPPORT variables.
+ #

Modified: trunk/freebsd-buildutils/debian/patches/series
===================================================================
--- trunk/freebsd-buildutils/debian/patches/series	2012-03-09 20:55:17 UTC (rev 4139)
+++ trunk/freebsd-buildutils/debian/patches/series	2012-03-09 21:32:42 UTC (rev 4140)
@@ -1,8 +1,9 @@
-# Patches from upstream
+# Patches from (or merged in) upstream
 make_foreign.diff
+mk_sourceless.diff
+mk_clang_is_cc.diff
 
 # Other patches
-mk_sourceless.diff
 00_upstream.diff
 01_make_fixes.diff
 03_glibc.diff