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

[stevenc-guest at alioth.debian.org]

Author: stevenc-guest
Date: 2016-04-10 17:40:09 +0000 (Sun, 10 Apr 2016)
New Revision: 5993

Modified:
   trunk/kfreebsd-11/debian/changelog
   trunk/kfreebsd-11/debian/rules
Log:
Automatically enable debug options if ~debug appears in the Version


Modified: trunk/kfreebsd-11/debian/changelog
===================================================================
--- trunk/kfreebsd-11/debian/changelog	2016-04-10 17:32:46 UTC (rev 5992)
+++ trunk/kfreebsd-11/debian/changelog	2016-04-10 17:40:09 UTC (rev 5993)
@@ -1,4 +1,4 @@
-kfreebsd-11 (11.0~svn295083-1) UNRELEASED; urgency=medium
+kfreebsd-11 (11.0~svn295083-1~debug1) UNRELEASED; urgency=medium
 
   * New upstream snapshot of -CURRENT
   * Make get-orig-source tarball reproducible
@@ -26,6 +26,7 @@
     - 999_config.diff
   * Change Build-Depends from clang-3.6 to clang-3.7, to match upstream
   * Bump Build-Depends: freebsd-buildutils and freebsd-mk to (>= 10.3~)
+  * Automatically enable debug options if ~debug appears in the Version
 
  -- Steven Chamberlain <steven at pyro.eu.org>  Sat, 06 Feb 2016 16:17:19 +0000
 

Modified: trunk/kfreebsd-11/debian/rules
===================================================================
--- trunk/kfreebsd-11/debian/rules	2016-04-10 17:32:46 UTC (rev 5992)
+++ trunk/kfreebsd-11/debian/rules	2016-04-10 17:40:09 UTC (rev 5993)
@@ -51,7 +51,10 @@
 	BSD_MAKEFLAGS += -j$(NUMJOBS)
 endif
 
-ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
+# Whether to enable extra debug features, at the expense of performance
+# Not recommended for release builds
+# Putting ~debug in the Version field enables this automatically
+ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))$(findstring ~debug,$(full_version)))
 	debug_config	:= sys/conf/DEBIAN_DEBUG
 else
 	debug_config	:= sys/conf/DEBIAN_NODEBUG