[lbt] 09/09: patch compiler-flags: respect CXXFLAGS and CFLAGS variables

[Ralf Treinen]

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

treinen pushed a commit to branch master
in repository lbt.

commit 9cbeb7ea0d731f1a88ee3e1e91bb9934841e3418
Author: Ralf Treinen <treinen at free.fr>
Date:   Tue Dec 6 08:26:23 2016 +0100

    patch compiler-flags: respect CXXFLAGS and CFLAGS variables
---
 debian/changelog              |  4 +++-
 debian/patches/compiler-flags | 32 ++++++++++++++++++++++++++++++++
 debian/patches/series         |  1 +
 3 files changed, 36 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index f558ab7..6fec4ef 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,8 +12,10 @@ lbt (1.2.2-6) UNRELEASED; urgency=medium
     - bump build-dependency on debhelper
   * standards-version 3.9.8 (no change)
   * added Vcs-{Git,Browser}fields
+  * patch compiler-flags: honour CFLAGS and CXXFLAGS values passed to
+    Makefile, use CPPFLAGS
 
- -- Ralf Treinen <treinen at debian.org>  Tue, 06 Dec 2016 08:17:53 +0100
+ -- Ralf Treinen <treinen at debian.org>  Tue, 06 Dec 2016 09:12:09 +0100
 
 lbt (1.2.2-5) unstable; urgency=low
 
diff --git a/debian/patches/compiler-flags b/debian/patches/compiler-flags
new file mode 100644
index 0000000..580c610
--- /dev/null
+++ b/debian/patches/compiler-flags
@@ -0,0 +1,32 @@
+Author: Ralf Treinen <treinen at debian.org>
+Description: honour given CFLAGS and CXXFLAGS values, use CPPFLAGS
+
+Index: lbt/Makefile
+===================================================================
+--- lbt.orig/Makefile	2016-12-06 09:08:11.747876678 +0100
++++ lbt/Makefile	2016-12-06 09:08:29.035953814 +0100
+@@ -18,10 +18,10 @@
+ 
+ # GCC (tested with 2.95.4 and 3.0.2)
+ CXX=g++
+-CXXFLAGS=$(CFLAGS) -fno-exceptions -fno-rtti
++CXXFLAGS+=$(CFLAGS) -fno-exceptions -fno-rtti
+ LDFLAGS=
+ CC=gcc
+-CFLAGS=-O3 -fomit-frame-pointer
++CFLAGS+=-O3 -fomit-frame-pointer
+ 
+ ## Compaq C++ V6.3-011 for Digital UNIX V4.0G (Rev. 1530)
+ #CXX=cxx
+@@ -60,9 +60,9 @@
+ 	$(CC) -o $@ $(L2DOBJS) $(LDFLAGS)
+ 
+ .C.o:
+-	$(CXX) $(CXXFLAGS) -c $< -o $@
++	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -c $< -o $@
+ .c.o:
+-	$(CC) $(CFLAGS) -c $< -o $@
++	$(CC) $(CPPFLAGS) $(CFLAGS) -c $< -o $@
+ 
+ .phony: all clean reallyclean install installman
+ .SUFFIXES:
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..3697e7d
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+compiler-flags

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/lbt.git