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

Kilian Krause kilian at costa.debian.org
Sun Nov 20 03:50:34 UTC 2005 

Author: kilian
Date: 2005-11-20 03:50:32 +0000 (Sun, 20 Nov 2005)
New Revision: 1010

Added:
   asterisk/trunk/debian/patches/nomarch.dpatch
   asterisk/trunk/debian/patches/nooptimize.dpatch
Modified:
   asterisk/trunk/debian/changelog
   asterisk/trunk/debian/control
   asterisk/trunk/debian/patches/00list
Log:
prepare new upload to fix FTBFS due to -march. Also fixes -O3 and -O6 in Makefiles.


Modified: asterisk/trunk/debian/changelog
===================================================================
--- asterisk/trunk/debian/changelog	2005-11-19 12:31:28 UTC (rev 1009)
+++ asterisk/trunk/debian/changelog	2005-11-20 03:50:32 UTC (rev 1010)
@@ -1,3 +1,9 @@
+asterisk (1:1.2.0.dfsg-3) unstable; urgency=low
+
+  * Remove -march to fix FTBFS. (Closes: #338753)
+
+ -- Kilian Krause <kilian at debian.org>  Sat, 19 Nov 2005 19:36:31 +0000
+
 asterisk (1:1.2.0.dfsg-2) unstable; urgency=low
 
   * libreadline4-dev is superseeded by libreadline5-dev. Fixed build-depends.

Modified: asterisk/trunk/debian/control
===================================================================
--- asterisk/trunk/debian/control	2005-11-19 12:31:28 UTC (rev 1009)
+++ asterisk/trunk/debian/control	2005-11-20 03:50:32 UTC (rev 1010)
@@ -4,7 +4,7 @@
 Maintainer: Debian VoIP Team <pkg-voip-maintainers at lists.alioth.debian.org>
 Uploaders: Mark Purcell <msp at debian.org>, Kilian Krause <kilian at debian.org>, Jose Carlos Garcia Sogo <jsogo at debian.org>, Santiago Garcia Mantinan <manty at debian.org>, Simon Richter <sjr at debian.org>, Tzafrir Cohen <tzafrir.cohen at xorcom.com>
 Standards-Version: 3.6.1
-Build-Depends: debhelper (>= 4.0.4), sed (>= 3.95), zlib1g-dev, libgtk1.2-dev | libgtk-dev, libreadline5-dev | libreadline-dev, libgsm1-dev, libssl-dev, libzap-dev, libtonezone-dev (>= 1:1.0.6-1), bison, libasound2-dev, postgresql-dev, unixodbc-dev, libpri-dev (>= 1.2.0-beta2), dpatch (>= 2.0.10), zaptel-source (>= 1:1.0.6-1), autotools-dev, libnewt-dev, libsqlite-dev, libspeex-dev, graphviz
+Build-Depends: debhelper (>= 4.0.4), sed (>= 3.95), zlib1g-dev, libgtk1.2-dev, libreadline5-dev, libgsm1-dev, libssl-dev, libzap-dev, libtonezone-dev (>= 1:1.0.6-1), bison, libasound2-dev, postgresql-dev, unixodbc-dev, libpri-dev (>= 1.2.0-beta2), dpatch (>= 2.0.10), zaptel-source (>= 1:1.0.6-1), autotools-dev, libnewt-dev, libsqlite-dev, libspeex-dev, graphviz
 
 Package: asterisk
 Architecture: any

Modified: asterisk/trunk/debian/patches/00list
===================================================================
--- asterisk/trunk/debian/patches/00list	2005-11-19 12:31:28 UTC (rev 1009)
+++ asterisk/trunk/debian/patches/00list	2005-11-20 03:50:32 UTC (rev 1010)
@@ -16,3 +16,5 @@
 #chan-modem.dpatch
 #app_queue.memleakfix.dpatch
 pubkey_jnctn
+nomarch
+nooptimize

Added: asterisk/trunk/debian/patches/nomarch.dpatch
===================================================================
--- asterisk/trunk/debian/patches/nomarch.dpatch	2005-11-19 12:31:28 UTC (rev 1009)
+++ asterisk/trunk/debian/patches/nomarch.dpatch	2005-11-20 03:50:32 UTC (rev 1010)
@@ -0,0 +1,57 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## nomarch.dpatch by Kilian Krause <kilian at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad asterisk-1.2.0.dfsg~/Makefile asterisk-1.2.0.dfsg/Makefile
+--- asterisk-1.2.0.dfsg~/Makefile	2005-11-19 19:30:42.000000000 +0000
++++ asterisk-1.2.0.dfsg/Makefile	2005-11-19 19:30:51.000000000 +0000
+@@ -227,10 +227,6 @@
+   ASTCFLAGS+=-I$(CROSS_COMPILE_TARGET)/usr/local/include -L$(CROSS_COMPILE_TARGET)/usr/local/lib
+ endif
+ 
+-ifneq ($(PROC),ultrasparc)
+-  ASTCFLAGS+=$(shell if $(CC) -march=$(PROC) -S -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo "-march=$(PROC)"; fi)
+-endif
+-
+ ifeq ($(PROC),ppc)
+   ASTCFLAGS+=-fsigned-char
+ endif
+diff -urNad asterisk-1.2.0.dfsg~/codecs/gsm/Makefile asterisk-1.2.0.dfsg/codecs/gsm/Makefile
+--- asterisk-1.2.0.dfsg~/codecs/gsm/Makefile	2005-11-08 03:31:45.000000000 +0000
++++ asterisk-1.2.0.dfsg/codecs/gsm/Makefile	2005-11-19 19:31:46.000000000 +0000
+@@ -37,32 +37,6 @@
+ ######### ppro's, etc, as well as the AMD K6 and K7.  The compile will
+ ######### probably require gcc. 
+ 
+-ifneq (${OSARCH},Darwin)
+-ifneq (${OSARCH},SunOS)
+-ifneq (${PROC},x86_64)
+-ifneq (${PROC},ultrasparc)
+-ifneq ($(shell uname -m),ppc)
+-ifneq ($(shell uname -m),ppc64)
+-ifneq ($(shell uname -m),alpha)
+-ifneq ($(shell uname -m),armv4l)
+-ifneq (${PROC},sparc64)
+-ifneq (${PROC},arm)
+-ifneq (${PROC},ppc)
+-ifneq (${PROC},ppc64)
+-OPTIMIZE+=-march=$(PROC)
+-endif
+-endif
+-endif
+-endif
+-endif
+-endif
+-endif
+-endif
+-endif
+-endif
+-endif
+-endif
+-
+ #The problem with sparc is the best stuff is in newer versions of gcc (post 3.0) only.
+ #This works for even old (2.96) versions of gcc and provides a small boost either way.
+ #A ultrasparc cpu is really v9 but the stock debian stable 3.0 gcc doesn't support it.


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

Added: asterisk/trunk/debian/patches/nooptimize.dpatch
===================================================================
--- asterisk/trunk/debian/patches/nooptimize.dpatch	2005-11-19 12:31:28 UTC (rev 1009)
+++ asterisk/trunk/debian/patches/nooptimize.dpatch	2005-11-20 03:50:32 UTC (rev 1010)
@@ -0,0 +1,101 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## nooptimize.dpatch by Kilian Krause <kilian at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad asterisk-1.2.0.dfsg~/Makefile asterisk-1.2.0.dfsg/Makefile
+--- asterisk-1.2.0.dfsg~/Makefile	2005-11-16 20:23:53.000000000 +0000
++++ asterisk-1.2.0.dfsg/Makefile	2005-11-20 03:45:08.000000000 +0000
+@@ -44,7 +44,7 @@
+ #K6OPT  = -DK6OPT
+ 
+ #Tell gcc to optimize the code
+-OPTIMIZE+=-O6
++OPTIMIZE+=-O2
+ endif
+ 
+ #Overwite config files on "make samples"
+diff -urNad asterisk-1.2.0.dfsg~/apps/Makefile asterisk-1.2.0.dfsg/apps/Makefile
+--- asterisk-1.2.0.dfsg~/apps/Makefile	2005-11-11 00:32:45.000000000 +0000
++++ asterisk-1.2.0.dfsg/apps/Makefile	2005-11-20 03:42:28.000000000 +0000
+@@ -112,7 +112,7 @@
+ 	$(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB} -lodbc
+ 
+ look:	look.c
+-	$(CC) -pipe -O6 -g look.c -o look -lncurses
++	$(CC) -pipe -O2 -g look.c -o look -lncurses
+ 
+ ifeq (SunOS,$(shell uname))
+ app_chanspy.so: app_chanspy.o
+diff -urNad asterisk-1.2.0.dfsg~/cdr/Makefile asterisk-1.2.0.dfsg/cdr/Makefile
+--- asterisk-1.2.0.dfsg~/cdr/Makefile	2005-11-14 00:45:07.000000000 +0000
++++ asterisk-1.2.0.dfsg/cdr/Makefile	2005-11-20 03:44:08.000000000 +0000
+@@ -32,7 +32,7 @@
+ #the default as we now have a better instruction set to work with. - Belgarath
+ ifeq ($(PROC),sparc64)
+  PROC=ultrasparc
+-  CFLAGS += -mtune=$(PROC) -O3 -pipe -fomit-frame-pointer -mcpu=v8
++  CFLAGS += -mtune=$(PROC) -O2 -pipe -fomit-frame-pointer -mcpu=v8
+ endif
+ 
+ #
+diff -urNad asterisk-1.2.0.dfsg~/channels/Makefile asterisk-1.2.0.dfsg/channels/Makefile
+--- asterisk-1.2.0.dfsg~/channels/Makefile	2005-11-17 04:26:07.000000000 +0000
++++ asterisk-1.2.0.dfsg/channels/Makefile	2005-11-20 03:44:19.000000000 +0000
+@@ -44,7 +44,7 @@
+ 
+ ifeq ($(PROC),sparc64)
+   PROC=ultrasparc
+-  CFLAGS += -mtune=$(PROC) -O3 -pipe -fomit-frame-pointer -mcpu=v8
++  CFLAGS += -mtune=$(PROC) -O2 -pipe -fomit-frame-pointer -mcpu=v8
+ endif
+ 
+ ifeq (${OSARCH},FreeBSD)
+diff -urNad asterisk-1.2.0.dfsg~/codecs/gsm/Makefile asterisk-1.2.0.dfsg/codecs/gsm/Makefile
+--- asterisk-1.2.0.dfsg~/codecs/gsm/Makefile	2005-11-08 03:31:45.000000000 +0000
++++ asterisk-1.2.0.dfsg/codecs/gsm/Makefile	2005-11-20 03:44:25.000000000 +0000
+@@ -69,7 +69,7 @@
+ #So we go lowest common available by gcc and go a step down, still a step up from
+ #the default as we now have a better instruction set to work with. - Belgarath
+ ifeq (${PROC},ultrasparc)
+-OPTIMIZE+=-mcpu=v8 -mtune=$(PROC) -O3 
++OPTIMIZE+=-mcpu=v8 -mtune=$(PROC) -O2 
+ endif
+ 
+ PG =
+diff -urNad asterisk-1.2.0.dfsg~/codecs/ilbc/Makefile asterisk-1.2.0.dfsg/codecs/ilbc/Makefile
+--- asterisk-1.2.0.dfsg~/codecs/ilbc/Makefile	2005-11-08 04:13:18.000000000 +0000
++++ asterisk-1.2.0.dfsg/codecs/ilbc/Makefile	2005-11-20 03:44:30.000000000 +0000
+@@ -1,5 +1,5 @@
+ ARCH=$(PROC)
+-CFLAGS+=-Wall -O3 -funroll-loops
++CFLAGS+=-Wall -O2 -funroll-loops
+ ifneq (${OSARCH},CYGWIN)
+ CFLAGS += -fPIC
+ endif
+diff -urNad asterisk-1.2.0.dfsg~/codecs/lpc10/Makefile asterisk-1.2.0.dfsg/codecs/lpc10/Makefile
+--- asterisk-1.2.0.dfsg~/codecs/lpc10/Makefile	2005-11-08 04:13:19.000000000 +0000
++++ asterisk-1.2.0.dfsg/codecs/lpc10/Makefile	2005-11-20 03:44:50.000000000 +0000
+@@ -40,7 +40,7 @@
+ #So we go lowest common available by gcc and go a step down, still a step up from
+ #the default as we now have a better instruction set to work with. - Belgarath
+ ifeq ($(PROC),ultrasparc)
+-        CFLAGS+= -mtune=$(PROC) -mcpu=v8 -O3 -fomit-frame-pointer
++        CFLAGS+= -mtune=$(PROC) -mcpu=v8 -O2 -fomit-frame-pointer
+ else
+ ifneq ($(OSARCH),SunOS)
+ ifneq  ($(OSARCH),arm)
+diff -urNad asterisk-1.2.0.dfsg~/db1-ast/Makefile asterisk-1.2.0.dfsg/db1-ast/Makefile
+--- asterisk-1.2.0.dfsg~/db1-ast/Makefile	2004-12-14 23:36:30.000000000 +0000
++++ asterisk-1.2.0.dfsg/db1-ast/Makefile	2005-11-20 03:44:58.000000000 +0000
+@@ -10,7 +10,7 @@
+ #Added support for UltraSparc - Belgarath
+ ifeq ($(ARCH),sparc64)
+ PROC=ultrasparc
+-CFLAGS += -mtune=$(PROC) -O3 -pipe -fomit-frame-pointer -mcpu=v8
++CFLAGS += -mtune=$(PROC) -O2 -pipe -fomit-frame-pointer -mcpu=v8
+ endif
+ 
+ LIBDBSO=libdb.so.$(SOVER)


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

More information about the Pkg-voip-commits mailing list