[savi] 13/16: Use CFLAGS from environment set by dpkg-buildflags.

[Bas Couwenberg]

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

sebastic pushed a commit to branch master
in repository savi.

commit a646973faedf21e39bd0b6c97899bd127933bda0
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Fri Sep 30 17:51:23 2016 +0200

    Use CFLAGS from environment set by dpkg-buildflags.
---
 debian/changelog                |  1 +
 debian/patches/enable_zlib.diff | 11 ++++++++++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 212877c..c79f273 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,7 @@ savi (1.5.0-1) UNRELEASED; urgency=medium
   * Update copyright file using copyright-format 1.0.
   * Refresh patches & add DEP3 headers.
   * Enable parallel dh.
+  * Use CFLAGS from environment set by dpkg-buildflags.
 
  -- Bas Couwenberg <sebastic at debian.org>  Fri, 30 Sep 2016 16:56:33 +0200
 
diff --git a/debian/patches/enable_zlib.diff b/debian/patches/enable_zlib.diff
index c9caf4d..3c02d65 100644
--- a/debian/patches/enable_zlib.diff
+++ b/debian/patches/enable_zlib.diff
@@ -39,10 +39,19 @@ Author: YunQiang Su <syq at debian.org>
  # OTHER_LIBS = -lz should be inserted at end of definitions file.
  
 -   GCC_FLAGS = -O2 -DNO_ZLIB
-+   GCC_FLAGS = -O2 -g
++#   GCC_FLAGS = -O2 -DNO_ZLIB
  
 -        LIBS = $(TCL_LIBS) $(OTHER_LIBS) -lm
 +        LIBS = $(TCL_LIBS) $(OTHER_LIBS) -lm $(LDFLAGS)
  
  
  #   DEBUGFLAGS = -Wall -Wextra -Wconversion -pedantic -ansi
+@@ -98,7 +98,7 @@ include Makefile_defs_$(ARCH)
+ #
+ # commands and flags
+ #
+-    CFLAGS = $(GCC_FLAGS) $(DEBUGFLAGS) \
++    CFLAGS += $(GCC_FLAGS) $(DEBUGFLAGS) \
+ 		-I$(INCLUDE_DIR) $(TCL_INCLUDES)
+ 
+ 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/savi.git