[Pkg-voip-commits] r2870 - in zaptel/trunk: cwain debian debian/patches qozap zaphfc ztgsm

[Kilian Krause]

Author: kilian
Date: 2006-12-28 13:18:38 +0100 (Thu, 28 Dec 2006)
New Revision: 2870

Added:
   zaptel/trunk/debian/patches/Makefile_hostcc.dpatch
Modified:
   zaptel/trunk/cwain/Makefile
   zaptel/trunk/debian/changelog
   zaptel/trunk/debian/patches/00list
   zaptel/trunk/debian/patches/dbug391840.dpatch
   zaptel/trunk/qozap/Makefile
   zaptel/trunk/zaphfc/Makefile
   zaptel/trunk/ztgsm/Makefile
Log:
remove gcc hardcoding and all -O4 (doesn't comply with policy anyway)


Modified: zaptel/trunk/cwain/Makefile
===================================================================
--- zaptel/trunk/cwain/Makefile	2006-12-28 12:09:04 UTC (rev 2869)
+++ zaptel/trunk/cwain/Makefile	2006-12-28 12:18:38 UTC (rev 2870)
@@ -3,9 +3,7 @@
 
 ZAP = $(shell [ -f $(BRISTUFFBASE)/zaptel/zaptel.h ] && echo "-I$(BRISTUFFBASE)/zaptel")
 
-HOSTCC=gcc
-
-CFLAGS+=-I. $(ZAP) -DRELAXED_LOCKING -O4 -g -Wall #-DBLINKYBLINK
+CFLAGS+=-I. $(ZAP) -DRELAXED_LOCKING -O2 -g -Wall #-DBLINKYBLINK
 CFLAGS+=$(shell if uname -m | grep -q ppc; then echo "-fsigned-char"; fi)
 
 KFLAGS=-D__KERNEL__ -DMODULE -DEXPORT_SYMTAB -DRELAXED_LOCKING -fomit-frame-pointer -O2 -Wall -I$(KINCLUDES) $(ZAP) 

Modified: zaptel/trunk/debian/changelog
===================================================================
--- zaptel/trunk/debian/changelog	2006-12-28 12:09:04 UTC (rev 2869)
+++ zaptel/trunk/debian/changelog	2006-12-28 12:18:38 UTC (rev 2870)
@@ -1,8 +1,10 @@
 zaptel (1:1.2.12~dfsg-2) UNRELEASED; urgency=low
 
   * NOT RELEASED YET
+  * Remove -O4 from all Makefiles (Closes: #391840)
+  * Remove gcc hardcoded as HOSTCC
 
- -- Kilian Krause <kilian at debian.org>  Wed, 27 Dec 2006 23:25:33 +0100
+ -- Kilian Krause <kilian at debian.org>  Thu, 28 Dec 2006 13:12:16 +0100
 
 zaptel (1:1.2.12~dfsg-1) unstable; urgency=low
 

Modified: zaptel/trunk/debian/patches/00list
===================================================================
--- zaptel/trunk/debian/patches/00list	2006-12-28 12:09:04 UTC (rev 2869)
+++ zaptel/trunk/debian/patches/00list	2006-12-28 12:18:38 UTC (rev 2870)
@@ -12,3 +12,4 @@
 Makefile_vzaphfc.dpatch
 wct4xxp-dfsg.dpatch
 dbug391840.dpatch
+Makefile_hostcc

Added: zaptel/trunk/debian/patches/Makefile_hostcc.dpatch
===================================================================
--- zaptel/trunk/debian/patches/Makefile_hostcc.dpatch	2006-12-28 12:09:04 UTC (rev 2869)
+++ zaptel/trunk/debian/patches/Makefile_hostcc.dpatch	2006-12-28 12:18:38 UTC (rev 2870)
@@ -0,0 +1,18 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## Makefile_hostcc.dpatch by Kilian Krause <kilian at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: remove hardcoded HOSTCC
+
+ at DPATCH@
+diff -urNad zaptel-1.2.12~dfsg~/Makefile zaptel-1.2.12~dfsg/Makefile
+--- zaptel-1.2.12~dfsg~/Makefile	2006-12-07 00:22:11.000000000 +0100
++++ zaptel-1.2.12~dfsg/Makefile	2006-12-28 13:17:04.396969151 +0100
+@@ -6,7 +6,6 @@
+ #
+ 
+ 
+-HOSTCC=gcc
+ PWD:=$(shell pwd)
+ 
+ INSTALL_PREFIX:=$(DESTDIR)


Property changes on: zaptel/trunk/debian/patches/Makefile_hostcc.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Modified: zaptel/trunk/debian/patches/dbug391840.dpatch
===================================================================
--- zaptel/trunk/debian/patches/dbug391840.dpatch	2006-12-28 12:09:04 UTC (rev 2869)
+++ zaptel/trunk/debian/patches/dbug391840.dpatch	2006-12-28 12:18:38 UTC (rev 2870)
@@ -6,18 +6,6 @@
 ## DP: http://bugs.debian.org/391840
 
 @DPATCH@
-diff -urNad zaptel-1.2.9.1.dfsg~/debian/rules zaptel-1.2.9.1.dfsg/debian/rules
---- zaptel-1.2.9.1.dfsg~/debian/rules	2006-10-09 12:52:10.000000000 +1000
-+++ zaptel-1.2.9.1.dfsg/debian/rules	2006-10-09 12:56:32.000000000 +1000
-@@ -12,6 +12,8 @@
- 
- -include /usr/share/dpatch/dpatch.make
- 
-+export CFLAGS += -fno-inline-functions
-+
- ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
- 	CFLAGS += -g
- endif
 diff -urNad zaptel-1.2.9.1.dfsg~/ztcfg.c zaptel-1.2.9.1.dfsg/ztcfg.c
 --- zaptel-1.2.9.1.dfsg~/ztcfg.c	2006-02-01 13:33:54.000000000 +1100
 +++ zaptel-1.2.9.1.dfsg/ztcfg.c	2006-10-09 12:56:32.000000000 +1000

Modified: zaptel/trunk/qozap/Makefile
===================================================================
--- zaptel/trunk/qozap/Makefile	2006-12-28 12:09:04 UTC (rev 2869)
+++ zaptel/trunk/qozap/Makefile	2006-12-28 12:18:38 UTC (rev 2870)
@@ -3,9 +3,7 @@
 
 ZAP = $(shell [ -f $(BRISTUFFBASE)/zaptel/zaptel.h ] && echo "-I$(BRISTUFFBASE)/zaptel")
 
-HOSTCC=gcc
-
-CFLAGS+=-I. $(ZAP) -DRELAXED_LOCKING -O4 -g -Wall -DBUILDING_TONEZONE  #-DTONEZONE_DRIVER
+CFLAGS+=-I. $(ZAP) -DRELAXED_LOCKING -O2 -g -Wall -DBUILDING_TONEZONE  #-DTONEZONE_DRIVER
 CFLAGS+=$(shell if uname -m | grep -q ppc; then echo "-fsigned-char"; fi)
 
 KFLAGS=-D__KERNEL__ -DMODULE -DEXPORT_SYMTAB -DRELAXED_LOCKING -fomit-frame-pointer -O2 -Wall -I$(KINCLUDES) $(ZAP)

Modified: zaptel/trunk/zaphfc/Makefile
===================================================================
--- zaptel/trunk/zaphfc/Makefile	2006-12-28 12:09:04 UTC (rev 2869)
+++ zaptel/trunk/zaphfc/Makefile	2006-12-28 12:18:38 UTC (rev 2870)
@@ -4,8 +4,6 @@
 ZAP = $(shell [ -f $(BRISTUFFBASE)/zaptel/zaptel.h ] && echo "-I$(BRISTUFFBASE)/zaptel")
 RTAI = $(shell [ -f /usr/realtime/include/rtai.h ] && echo "-DRTAITIMING -I/usr/realtime/include")
 
-HOSTCC=gcc
-
 CFLAGS+=-I. $(ZAP) $(RTAI) -O2 -g -Wall -DBUILDING_TONEZONE 
 CFLAGS+=$(shell if uname -m | grep -q ppc; then echo "-fsigned-char"; fi)
 

Modified: zaptel/trunk/ztgsm/Makefile
===================================================================
--- zaptel/trunk/ztgsm/Makefile	2006-12-28 12:09:04 UTC (rev 2869)
+++ zaptel/trunk/ztgsm/Makefile	2006-12-28 12:18:38 UTC (rev 2870)
@@ -3,9 +3,7 @@
 
 ZAP = $(shell [ -f $(BRISTUFFBASE)/zaptel/zaptel.h ] && echo "-I$(BRISTUFFBASE)/zaptel")
 
-HOSTCC=gcc
-
-CFLAGS+=-I. $(ZAP) -O4 -g -Wall -DBUILDING_TONEZONE  #-DTONEZONE_DRIVER
+CFLAGS+=-I. $(ZAP) -O2 -g -Wall -DBUILDING_TONEZONE  #-DTONEZONE_DRIVER
 CFLAGS+=$(shell if uname -m | grep -q ppc; then echo "-fsigned-char"; fi)
 
 KFLAGS=-D__KERNEL__ -DMODULE -DEXPORT_SYMTAB -fomit-frame-pointer -O2 -Wall -I$(KINCLUDES) $(ZAP)