From: gregor herrmann <gregoa@debian.org>
Date: Tue, 5 Feb 2008 16:39:45 +0000 (-0000)
Subject: Add patch 03_cflags.dpatch: use CFLAGS from debian/rules in upstream
X-Git-Tag: debian/0.4.1-2~1
X-Git-Url: https://git.toastfreeware.priv.at/debian/iodine.git/commitdiff_plain/a357c4aed5ba499f391167b5511f9243a94a65ce?ds=sidebyside

Add patch 03_cflags.dpatch: use CFLAGS from debian/rules in upstream
  Makefiles.
---

diff --git a/debian/changelog b/debian/changelog
index 8d5fd85..28058c9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,8 +4,10 @@ iodine (0.4.1-2) UNRELEASED; urgency=low
   * Create install-stamp target in debian/rules and adjust target
     dependencies.
   * Change debian/copyright to the new machine-readable format.
+  * Add patch 03_cflags.dpatch: use CFLAGS from debian/rules in upstream
+    Makefiles.
 
- -- gregor herrmann <gregor+debian@comodo.priv.at>  Mon, 24 Dec 2007 23:13:45 +0100
+ -- gregor herrmann <gregor+debian@comodo.priv.at>  Tue, 05 Feb 2008 17:31:25 +0100
 
 iodine (0.4.1-1) unstable; urgency=low
 
diff --git a/debian/patches/00list b/debian/patches/00list
index d8fcd89..399adf7 100644
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -1,2 +1,3 @@
 01_mandir
 02_make
+03_cflags
diff --git a/debian/patches/03_cflags.dpatch b/debian/patches/03_cflags.dpatch
new file mode 100755
index 0000000..333ab9f
--- /dev/null
+++ b/debian/patches/03_cflags.dpatch
@@ -0,0 +1,31 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 03_cflags.dpatch by  <gregor+debian@comodo.priv.at>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Combine upstream CFLAGS with CFLAGS from debian/rules.
+
+@DPATCH@
+diff -urNad iodine~/src/Makefile iodine/src/Makefile
+--- iodine~/src/Makefile	2008-02-05 17:26:08.000000000 +0100
++++ iodine/src/Makefile	2008-02-05 17:27:44.000000000 +0100
+@@ -9,7 +9,7 @@
+ ARCH = `uname -m`
+ 
+ LDFLAGS =  -lz
+-CFLAGS = -c -g -Wall -D$(OS) -pedantic
++CFLAGS += -c -D$(OS) -pedantic
+ 
+ all: stateos $(CLIENT) $(SERVER) $(TESTSUITE) 
+ 
+diff -urNad iodine~/tests/Makefile iodine/tests/Makefile
+--- iodine~/tests/Makefile	2008-02-04 17:30:39.000000000 +0100
++++ iodine/tests/Makefile	2008-02-05 17:27:55.000000000 +0100
+@@ -6,7 +6,7 @@
+ OS = `uname | tr "a-z" "A-Z"`
+ 
+ LDFLAGS =  -L/usr/local/lib -lcheck
+-CFLAGS = -g -Wall -D$(OS) -I../src -I/usr/local/include -pedantic
++CFLAGS += -D$(OS) -I../src -I/usr/local/include -pedantic
+ 
+ all: $(TEST)
+ 	@./$(TEST)
diff --git a/debian/rules b/debian/rules
index 2af5132..602bb8f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -27,8 +27,8 @@ configure-stamp: $(DPATCH_STAMPFN)
 build: build-stamp
 build-stamp: configure-stamp
 	dh_testdir
-	$(MAKE)
-	$(MAKE) test
+	CFLAGS="$(CFLAGS)" $(MAKE)
+	CFLAGS="$(CFLAGS)" $(MAKE) test
 	touch $@
 
 clean: unpatch