[Glibc-bsd-commits] r5721 - trunk/kfreebsd-11/debian

[stevenc-guest at alioth.debian.org]

Author: stevenc-guest
Date: 2015-07-07 20:08:24 +0000 (Tue, 07 Jul 2015)
New Revision: 5721

Modified:
   trunk/kfreebsd-11/debian/changelog
   trunk/kfreebsd-11/debian/rules
Log:
Build with clang-3.6 on i386, amd64, arm;  due to clang-3.4
going away soon. (Closes: #790358)


Modified: trunk/kfreebsd-11/debian/changelog
===================================================================
--- trunk/kfreebsd-11/debian/changelog	2015-07-07 16:04:24 UTC (rev 5720)
+++ trunk/kfreebsd-11/debian/changelog	2015-07-07 20:08:24 UTC (rev 5721)
@@ -1,6 +1,5 @@
 kfreebsd-11 (11.0~svn273432-1) UNRELEASED; urgency=medium
 
-  * Team upload.
   * New upstream snapshot of -CURRENT
     - Fix for EN-14:05:
       ciss(4) potential data corruption bug (Closes: #748079)
@@ -11,8 +10,10 @@
       (CVE-2014-3711) (Closes: #766279)
   * DEB_HOST_ARCH_CPU on armel is arm;  update debian/rules detection
     and thereby correctly specify any-arm in debian/control too.
+  * Build with clang-3.6 on i386, amd64, arm;  due to clang-3.4
+    going away soon. (Closes: #790358)
 
- -- Steven Chamberlain <steven at pyro.eu.org>  Tue, 20 May 2014 13:04:21 +0100
+ -- Steven Chamberlain <steven at pyro.eu.org>  Tue, 07 Jul 2015 21:00:25 +0100
 
 kfreebsd-11 (11.0~svn265310-1) experimental; urgency=medium
 

Modified: trunk/kfreebsd-11/debian/rules
===================================================================
--- trunk/kfreebsd-11/debian/rules	2015-07-07 16:04:24 UTC (rev 5720)
+++ trunk/kfreebsd-11/debian/rules	2015-07-07 20:08:24 UTC (rev 5721)
@@ -65,15 +65,15 @@
 # Clang is the default compiler on these architectures (see src/share/mk/src.opts.mk)
 clang_cpus	:= i386 amd64 arm
 
-ifneq ($(clang_version), 3.4)
+ifneq ($(clang_version), 3.6)
 $(error Upstream is now using a different Clang version than we expected. Consider updating cc_pkg and cc_cmd)
 endif
 
-cc_pkg		:= clang-3.4 [$(foreach cpu,$(clang_cpus),any-$(cpu))], \
+cc_pkg		:= clang-3.6 [$(foreach cpu,$(clang_cpus),any-$(cpu))], \
 		gcc-4.8 [$(foreach cpu,$(clang_cpus),!any-$(cpu))]
 
 ifneq (, $(filter $(clang_cpus), $(DEB_HOST_ARCH_CPU)))
-cc_cmd		:= clang
+cc_cmd		:= clang-3.6
 else
 cc_cmd		:= gcc-4.8
 endif