Add 03_Makefile.patch: allows to set CFLAGS; use CFLAGS in

debian/rules; thanks again to Cesare Tirabassi!

diff --git a/debian/changelog b/debian/changelog
index 3b5ad98fb3810ea0048f9d0a53fd87fe6f1f839b..c70e1e25e9c82695d307c77a2d45887594e497bc 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+cpulimit (1.1-12) UNRELEASED; urgency=low
+
+  * Add 03_Makefile.patch: allows to set CFLAGS; use CFLAGS in
+    debian/rules; thanks again to Cesare Tirabassi!
+
+ -- gregor herrmann <gregoa@debian.org>  Fri, 20 Jun 2008 21:37:59 +0200
+
 cpulimit (1.1-11) unstable; urgency=low
 
   * debian/rules:

diff --git a/debian/patches/03_Makefile.patch b/debian/patches/03_Makefile.patch
new file mode 100644 (file)
index 0000000..0e2c9a5
--- /dev/null
+++ b/debian/patches/03_Makefile.patch
@@ -0,0 +1,16 @@
+Author: Cesare Tirabassi <norsetto@ubuntu.com>
+Description: allow to pass CFLAGS from debian/rules
+
+--- cpulimit-1.1.orig/Makefile
++++ cpulimit-1.1/Makefile
+@@ -1,7 +1,9 @@
++CFLAGS?=-Wall -O2
++
+ all:: cpulimit
+ 
+ cpulimit:     cpulimit.c
+-      gcc -o cpulimit cpulimit.c -lrt -Wall -O2
++      gcc -o cpulimit cpulimit.c -lrt $(CFLAGS)
+ 
+ clean:
+       rm -f *~ cpulimit

diff --git a/debian/patches/series b/debian/patches/series
index 5bd1458eacac37e9539f14d844855e376075ecae..382c97c6f8b09c05cc7c7ccc8f2191bb0fdf911c 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 01_priority.patch
 02_segfault_longoptions.patch
+03_Makefile.patch

diff --git a/debian/rules b/debian/rules
index 120d148fe8fca2f2f7e548975f5f1c4405c57ca3..7d6a9d7a86603f51908bd90738b7193df0f322ed 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -22,7 +22,7 @@ endif
 build: build-stamp
 build-stamp: $(QUILT_STAMPFN)
        dh_testdir
-       $(MAKE)
+       CFLAGS="$(CFLAGS)" $(MAKE)
        touch $@
 
 clean: unpatch