[Glibc-bsd-commits] r5434 - in trunk/kfreebsd-11/debian: . patches

[rmh at alioth.debian.org]

Author: rmh
Date: 2014-02-21 14:56:04 +0000 (Fri, 21 Feb 2014)
New Revision: 5434

Modified:
   trunk/kfreebsd-11/debian/changelog
   trunk/kfreebsd-11/debian/patches/999_config.diff
   trunk/kfreebsd-11/debian/rules
Log:
  * New upstream snapshot.
    - Switch to clang-3.4.

Modified: trunk/kfreebsd-11/debian/changelog
===================================================================
--- trunk/kfreebsd-11/debian/changelog	2014-02-21 14:11:53 UTC (rev 5433)
+++ trunk/kfreebsd-11/debian/changelog	2014-02-21 14:56:04 UTC (rev 5434)
@@ -1,5 +1,8 @@
-kfreebsd-11 (11.0~svn261628-2) UNRELEASED; urgency=low
+kfreebsd-11 (11.0~svn262281-1) UNRELEASED; urgency=low
 
+  * New upstream snapshot.
+    - Switch to clang-3.4.
+
   * Support debug flag in DEB_BUILD_OPTIONS.
   * Depend on freebsd-net-tools to avoid auto-removal (see comment in
     debian/control).

Modified: trunk/kfreebsd-11/debian/patches/999_config.diff
===================================================================
--- trunk/kfreebsd-11/debian/patches/999_config.diff	2014-02-21 14:11:53 UTC (rev 5433)
+++ trunk/kfreebsd-11/debian/patches/999_config.diff	2014-02-21 14:56:04 UTC (rev 5434)
@@ -9,7 +9,7 @@
 +#cpu		HAMMER
 +#ident		GENERIC
  
- makeoptions	DEBUG=-g		# Build kernel with gdb(1) debug symbols
+ makeoptions	DEBUG=-gdwarf-2		# Build kernel with gdb(1) debug symbols
  makeoptions	WITH_CTF=1		# Run ctfconvert(1) for DTrace support
 @@ -53,7 +53,7 @@
  options 	COMPAT_FREEBSD5		# Compatible with FreeBSD5
@@ -35,7 +35,7 @@
 +#cpu		I686_CPU
 +#ident		GENERIC
  
- makeoptions	DEBUG=-g		# Build kernel with gdb(1) debug symbols
+ makeoptions	DEBUG=-gdwarf-2		# Build kernel with gdb(1) debug symbols
  makeoptions	WITH_CTF=1		# Run ctfconvert(1) for DTrace support
 @@ -54,7 +54,7 @@
  options 	COMPAT_FREEBSD5		# Compatible with FreeBSD5
@@ -83,12 +83,10 @@
 +include		WITHOUT_SOURCELESS
 --- /dev/null
 +++ b/sys/conf/DEBIAN_DEBUG
-@@ -0,0 +1,23 @@
+@@ -0,0 +1,21 @@
 +
 +## Enable debugging options
 +
-+makeoptions	DEBUG=-g		# Build kernel with gdb(1) debug symbols
-+
 +makeoptions	WITH_CTF=1		# Run ctfconvert(1) for DTrace support
 +
 +## KDTRACE_FRAME is only for amd64

Modified: trunk/kfreebsd-11/debian/rules
===================================================================
--- trunk/kfreebsd-11/debian/rules	2014-02-21 14:11:53 UTC (rev 5433)
+++ trunk/kfreebsd-11/debian/rules	2014-02-21 14:56:04 UTC (rev 5434)
@@ -65,11 +65,11 @@
 # 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)
+ifneq ($(clang_version), 3.4)
 $(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))], \
+cc_pkg		:= clang-3.4 [$(foreach cpu,$(clang_cpus),any-$(cpu))], \
 		gcc-4.8 [$(foreach cpu,$(clang_cpus),!any-$(cpu))]
 
 ifneq (, $(filter $(clang_cpus), $(DEB_HOST_ARCH_CPU)))