[Pkg-voip-commits] r1903 - in asterisk/trunk/debian: . patches

[Tzafrir Cohen]

Author: tzafrir-guest
Date: 2006-06-16 18:54:47 +0000 (Fri, 16 Jun 2006)
New Revision: 1903

Added:
   asterisk/trunk/debian/patches/optim_o2.dpatch
Modified:
   asterisk/trunk/debian/changelog
   asterisk/trunk/debian/rules
Log:
optim_o2.dpatch: don't build with -O6 . Also a matching change in
debian/rules


Modified: asterisk/trunk/debian/changelog
===================================================================
--- asterisk/trunk/debian/changelog	2006-06-16 18:07:18 UTC (rev 1902)
+++ asterisk/trunk/debian/changelog	2006-06-16 18:54:47 UTC (rev 1903)
@@ -24,6 +24,8 @@
   * The data_dir patch also moves agi-bin/ and firmware/
   * option_detach: using -F instead of -D (the same as upstream)
   * asterisk.init: added "zaptel-fix" to unload and reload zaptel modules
+  * optim_o2.dpatch: don't build with -O6 . Also a matching change in
+    debian/rules
 
  -- Kilian Krause <kilian at debian.org>  Fri, 16 Jun 2006 18:04:50 +0000
 

Added: asterisk/trunk/debian/patches/optim_o2.dpatch
===================================================================
--- asterisk/trunk/debian/patches/optim_o2.dpatch	2006-06-16 18:07:18 UTC (rev 1902)
+++ asterisk/trunk/debian/patches/optim_o2.dpatch	2006-06-16 18:54:47 UTC (rev 1903)
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## optim_o2.dpatch by  <tzafrir at localhost>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad asterisk-1.2.9.1.dfsg/Makefile /tmp/dpep.6fdqBX/asterisk-1.2.9.1.dfsg/Makefile
+--- asterisk-1.2.9.1.dfsg/Makefile	2006-06-16 21:37:39.000000000 +0300
++++ /tmp/dpep.6fdqBX/asterisk-1.2.9.1.dfsg/Makefile	2006-06-16 21:38:39.000000000 +0300
+@@ -46,7 +46,7 @@
+ #K6OPT  = -DK6OPT
+ 
+ #Tell gcc to optimize the code
+-OPTIMIZE+=-O6
++OPTIMIZE+=-O2
+ endif
+ 
+ #Overwite config files on "make samples"


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

Modified: asterisk/trunk/debian/rules
===================================================================
--- asterisk/trunk/debian/rules	2006-06-16 18:07:18 UTC (rev 1902)
+++ asterisk/trunk/debian/rules	2006-06-16 18:54:47 UTC (rev 1903)
@@ -19,8 +19,6 @@
 
 export PROC := $(shell dpkg-architecture -qDEB_HOST_ARCH)
 
-MAKEFLAGS = OPTIMIZE=-O2
-
 ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
 	CFLAGS += -g
 endif