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

[kilian at alioth.debian.org]

Author: kilian
Date: 2007-08-02 19:22:16 +0000 (Thu, 02 Aug 2007)
New Revision: 3875

Modified:
   asterisk-addons/trunk/debian/patches/nomarch.dpatch
   asterisk-addons/trunk/debian/rules
Log:
fix compilation on amd64 and hppa.


Modified: asterisk-addons/trunk/debian/patches/nomarch.dpatch
===================================================================
--- asterisk-addons/trunk/debian/patches/nomarch.dpatch	2007-08-02 16:39:11 UTC (rev 3874)
+++ asterisk-addons/trunk/debian/patches/nomarch.dpatch	2007-08-02 19:22:16 UTC (rev 3875)
@@ -5,9 +5,9 @@
 ## DP: No description.
 
 @DPATCH@
-diff -urNad asterisk-addons-1.2.2/format_mp3/Makefile /tmp/dpep.hZ5scK/asterisk-addons-1.2.2/format_mp3/Makefile
---- asterisk-addons-1.2.2/format_mp3/Makefile	2005-11-29 19:51:27.000000000 +0100
-+++ /tmp/dpep.hZ5scK/asterisk-addons-1.2.2/format_mp3/Makefile	2006-04-30 17:08:15.372627719 +0200
+diff -urNad asterisk-addons-1.4.0~/format_mp3/Makefile asterisk-addons-1.4.0/format_mp3/Makefile
+--- asterisk-addons-1.4.0~/format_mp3/Makefile	2006-08-11 17:09:50.000000000 +0200
++++ asterisk-addons-1.4.0/format_mp3/Makefile	2007-08-02 21:21:34.000000000 +0200
 @@ -8,12 +8,6 @@
  
  ifeq (${OSARCH},Linux)
@@ -21,3 +21,12 @@
  ifeq ($(PROC),sparc64)
  #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.
+@@ -55,7 +49,7 @@
+ endif
+ 
+ #Tell gcc to optimize the asterisk's code
+-OPTIMIZE+=-O6
++OPTIMIZE+=-O2
+ 
+ CFLAGS+=$(OPTIMIZE)
+ CFLAGS+= $(OPTIONS)

Modified: asterisk-addons/trunk/debian/rules
===================================================================
--- asterisk-addons/trunk/debian/rules	2007-08-02 16:39:11 UTC (rev 3874)
+++ asterisk-addons/trunk/debian/rules	2007-08-02 19:22:16 UTC (rev 3875)
@@ -44,7 +44,7 @@
 
 -include /usr/share/dpatch/dpatch.make
 
-CFLAGS = -Wall -g
+CFLAGS = -Wall -g -fPIC
 
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
 	CFLAGS += -O0