[debian-edu-commits] debian-edu/pkg-team/ 03/03: Define NDEBUG instead of setting build type to honor optimization choice

[Javier Serrano Polo]

This is an automated email from the git hooks/post-receive script.

jasp00-guest pushed a commit to branch master
in repository lmms.

commit 296e430e1fb76c82c565566b3fffb7e9e578b029
Author: Javier Serrano Polo <javier at jasp.net>
Date:   Sat Sep 3 21:43:36 2016 +0200

    Define NDEBUG instead of setting build type to honor optimization choice
---
 debian/changelog | 1 +
 debian/rules     | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 82784b3..8e986f0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ lmms (1.1.3-5) unstable; urgency=medium
   [ Javier Serrano Polo ]
   * Add Wine stable path to PATH, otherwise wine package would be required.
   * Sort plug-in embedded resources (reproducibility).
+  * Define NDEBUG instead of setting build type to honor optimization choice.
 
  -- Javier Serrano Polo <javier at jasp.net>  Sat, 03 Sep 2016 17:31:05 +0200
 
diff --git a/debian/rules b/debian/rules
index abce1c4..5f130f2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -21,9 +21,9 @@ CMAKE_OPTS+= -DWANT_VST_NOWINE=1 \
 	-DREMOTE_VST_PLUGIN_FILEPATH=../../i386-linux-gnu/lmms/RemoteVstPlugin
 endif
 
-# The build type "Release" defines NDEBUG. This helps with reproducible builds.
-# This can be dropped when version 1.1.91 is packaged.
-CMAKE_OPTS+= -DCMAKE_BUILD_TYPE=Release
+# Define NDEBUG. This helps with reproducible builds.
+export CFLAGS ?= $(shell dpkg-buildflags --get CFLAGS) -DNDEBUG
+export CXXFLAGS ?= $(shell dpkg-buildflags --get CXXFLAGS) -DNDEBUG
 
 %:
 	dh $@ --buildsystem cmake

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/pkg-team/lmms.git