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

[rmh at alioth.debian.org]

Author: rmh
Date: 2013-11-29 13:05:29 +0000 (Fri, 29 Nov 2013)
New Revision: 5178

Modified:
   trunk/kfreebsd-11/debian/changelog
   trunk/kfreebsd-11/debian/rules
Log:
Implement a watchdog to detect when upstream switches to a new Clang version.

Modified: trunk/kfreebsd-11/debian/changelog
===================================================================
--- trunk/kfreebsd-11/debian/changelog	2013-11-28 14:33:13 UTC (rev 5177)
+++ trunk/kfreebsd-11/debian/changelog	2013-11-29 13:05:29 UTC (rev 5178)
@@ -1,3 +1,10 @@
+kfreebsd-11 (11.0~svn258494-2) UNRELEASED; urgency=low
+
+  * Implement a watchdog to detect when upstream switches to a new Clang
+    version.
+
+ -- Robert Millan <rmh at debian.org>  Fri, 29 Nov 2013 14:05:10 +0100
+
 kfreebsd-11 (11.0~svn258494-1) experimental; urgency=low
 
   * New upstream snapshot.

Modified: trunk/kfreebsd-11/debian/rules
===================================================================
--- trunk/kfreebsd-11/debian/rules	2013-11-28 14:33:13 UTC (rev 5177)
+++ trunk/kfreebsd-11/debian/rules	2013-11-29 13:05:29 UTC (rev 5178)
@@ -22,6 +22,7 @@
 configfile	:= DEBCUSTOM
 abiname		:= 0
 ld_target	:= $(shell ld --help | sed -ne "s/[^ :]*: supported targets: \([^ ]*\) .*/\1/p")
+clang_version	:= $(shell cat CLANG_VERSION)
 
 ifeq ($(cpu), mipsel)
 kfreebsd_cpu	:= mips
@@ -48,6 +49,10 @@
 # Clang is the default compiler on these architectures (see src/share/mk/bsd.own.mk)
 clang_cpus	:= i386 amd64 armel
 
+ifneq ($(clang_version), 3.3)
+$(error Upstream is now using a different Clang version than we expected. Consider updating cc_pkg and cc_cmd)
+endif
+
 cc_pkg		:= clang-3.3 (>= 1:3.3-9) [$(foreach cpu,$(clang_cpus),any-$(cpu))], \
 		gcc-4.8 [$(foreach cpu,$(clang_cpus),!any-$(cpu))]
 
@@ -81,6 +86,10 @@
 get-orig-source:
 	rm -rf $(ORIG_DIR)
 	svn export -r $(svn_revision) $(SVN)/sys $(ORIG_DIR)/sys
+	# The Clang version used by upstream
+	svn cat -r $(svn_revision) $(SVN)/lib/clang/include/clang/Basic/Version.inc \
+		| sed -ne 's/.*\sCLANG_VERSION\s\+//p' \
+		> CLANG_VERSION
 	cd $(ORIG_DIR) && $(CURDIR)/debian/prune.sh
 	tar --numeric-owner --owner 0 --group 0 -cJf ../$(ORIG_TAR) $(ORIG_DIR)
 	rm -rf $(ORIG_DIR)