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

Kilian Krause kilian at costa.debian.org
Sun Jan 1 20:54:35 UTC 2006 

Author: kilian
Date: 2006-01-01 20:54:34 +0000 (Sun, 01 Jan 2006)
New Revision: 1117

Added:
   asterisk/trunk/debian/patches/arm.dpatch
Removed:
   asterisk/trunk/debian/patches/10_DPIC.dpatch
Modified:
   asterisk/trunk/debian/changelog
   asterisk/trunk/debian/patches/00list
Log:
add new patch for arm and start cleaning up old patches.


Modified: asterisk/trunk/debian/changelog
===================================================================
--- asterisk/trunk/debian/changelog	2006-01-01 03:33:07 UTC (rev 1116)
+++ asterisk/trunk/debian/changelog	2006-01-01 20:54:34 UTC (rev 1117)
@@ -1,3 +1,9 @@
+asterisk (1:1.2.1.dfsg-3) unstable; urgency=low
+
+  * Remove -msoft-float from compile flags to fix compilation on arm.
+
+ -- Kilian Krause <kilian at debian.org>  Sun,  1 Jan 2006 20:52:46 +0000
+
 asterisk (1:1.2.1.dfsg-2) unstable; urgency=low
 
   [ Tzafrir Cohen ]

Modified: asterisk/trunk/debian/patches/00list
===================================================================
--- asterisk/trunk/debian/patches/00list	2006-01-01 03:33:07 UTC (rev 1116)
+++ asterisk/trunk/debian/patches/00list	2006-01-01 20:54:34 UTC (rev 1117)
@@ -2,7 +2,6 @@
 #libpri_bristuffed
 #Makefile_install_no1234
 #option_detach_12
-#10_DPIC.dpatch
 #20_Makefile.dpatch
 #25_subdirs_Makefiles.dpatch
 30_ast-data-dir.dpatch
@@ -21,3 +20,4 @@
 nomarch
 nooptimize
 chanzap_disable_r2.dpatch
+arm

Deleted: asterisk/trunk/debian/patches/10_DPIC.dpatch
===================================================================
--- asterisk/trunk/debian/patches/10_DPIC.dpatch	2006-01-01 03:33:07 UTC (rev 1116)
+++ asterisk/trunk/debian/patches/10_DPIC.dpatch	2006-01-01 20:54:34 UTC (rev 1117)
@@ -1,121 +0,0 @@
-#! /bin/sh -e
-## DPIC.dpatch by Mark Purcell <msp at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Patch asterisk to force CFLAGS -DPIC
-
-if [ $# -lt 1 ]; then
-    echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
-    exit 1
-fi
-
-[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
-patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}"
-
-case "$1" in
-    -patch) patch -p1 ${patch_opts} < $0;;
-    -unpatch) patch -R -p1 ${patch_opts} < $0;;
-    *)
-        echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
-        exit 1;;
-esac
-
-exit 0
-
- at DPATCH@
-diff -urNad asterisk-1.0.2/apps/Makefile /tmp/dpep.YCeVNe/asterisk-1.0.2/apps/Makefile
---- asterisk-1.0.2/apps/Makefile	2004-09-24 23:32:56.000000000 +0200
-+++ /tmp/dpep.YCeVNe/asterisk-1.0.2/apps/Makefile	2005-01-04 21:07:01.000000000 +0100
-@@ -43,7 +43,7 @@
- APPS+=$(shell if [ -f /usr/local/include/zaptel.h ]; then echo "app_zapras.so app_meetme.so app_flash.so app_zapbarge.so app_zapscan.so" ; fi)
- APPS+=$(shell if [ -f /usr/include/osp/osp.h ]; then echo "app_osplookup.so" ; fi)
- 
--CFLAGS+=-fPIC
-+CFLAGS+=-fPIC -DPIC
- 
- ifeq ($(USE_POSTGRES_VM_INTERFACE),1)
- CFLAGS+=-DUSEPOSTGRESVM
-diff -urNad asterisk-1.0.2/cdr/Makefile /tmp/dpep.YCeVNe/asterisk-1.0.2/cdr/Makefile
---- asterisk-1.0.2/cdr/Makefile	2004-08-31 18:33:00.000000000 +0200
-+++ /tmp/dpep.YCeVNe/asterisk-1.0.2/cdr/Makefile	2005-01-04 21:07:01.000000000 +0100
-@@ -15,7 +15,7 @@
- MODS=cdr_csv.so cdr_manager.so
- 
- 
--CFLAGS+=-fPIC
-+CFLAGS+=-fPIC -DPIC
- 
- PROC=$(shell uname -m)
- OSARCH=$(shell uname -s)
-diff -urNad asterisk-1.0.2/channels/Makefile /tmp/dpep.YCeVNe/asterisk-1.0.2/channels/Makefile
---- asterisk-1.0.2/channels/Makefile	2004-08-31 18:33:00.000000000 +0200
-+++ /tmp/dpep.YCeVNe/asterisk-1.0.2/channels/Makefile	2005-01-04 21:07:01.000000000 +0100
-@@ -92,7 +92,7 @@
- ALSA_SRC+=$(shell [ -f alsa-monitor.h ] && echo "alsa-monitor.h")
- 
- CFLAGS+=-DCRYPTO
--CFLAGS+=-fPIC
-+CFLAGS+=-fPIC -DPIC
- 
- ifeq ($(USE_MYSQL_FRIENDS),1)
- CFLAGS+=-DMYSQL_FRIENDS
-diff -urNad asterisk-1.0.2/codecs/lpc10/Makefile /tmp/dpep.YCeVNe/asterisk-1.0.2/codecs/lpc10/Makefile
---- asterisk-1.0.2/codecs/lpc10/Makefile	2004-08-31 18:33:00.000000000 +0200
-+++ /tmp/dpep.YCeVNe/asterisk-1.0.2/codecs/lpc10/Makefile	2005-01-04 21:07:01.000000000 +0100
-@@ -22,7 +22,7 @@
- # 
- 
- WARNINGS = -Wall -Wno-comment -Wno-error
--CFLAGS += $(OPTIMIZE) -I$(LIB_TARGET_DIR) $(WARNINGS) -fPIC
-+CFLAGS += $(OPTIMIZE) -I$(LIB_TARGET_DIR) $(WARNINGS) -fPIC -DPIC
- #CFLAGS+= $(shell if uname -m | grep -q 86; then echo "-mpentium" ; fi)
- 
- #fix for PPC processors and ALPHA, And UltraSparc too
-diff -urNad asterisk-1.0.2/codecs/Makefile /tmp/dpep.YCeVNe/asterisk-1.0.2/codecs/Makefile
---- asterisk-1.0.2/codecs/Makefile	2004-07-19 17:52:57.000000000 +0200
-+++ /tmp/dpep.YCeVNe/asterisk-1.0.2/codecs/Makefile	2005-01-04 21:07:01.000000000 +0100
-@@ -21,7 +21,7 @@
- MODG723+=$(shell [ -f g723.1b/coder2.c ] && echo "codec_g723_1b.so")
- MODSPEEX=$(shell [ -f /usr/include/speex.h ] || [ -f /usr/local/include/speex.h ] && echo "codec_speex.so")
- MODILBC=$(shell [ -f ilbc/iLBC_decode.h ] && echo "codec_ilbc.so")
--CFLAGS+=-fPIC
-+CFLAGS+=-fPIC -DPIC
- CFLAGS+=$(shell [ -f /usr/local/include/speex.h ] && echo "-I/usr/local/include")
- 
- LIBG723=g723.1/libg723.a
-diff -urNad asterisk-1.0.2/formats/Makefile /tmp/dpep.YCeVNe/asterisk-1.0.2/formats/Makefile
---- asterisk-1.0.2/formats/Makefile	2004-09-05 20:00:55.000000000 +0200
-+++ /tmp/dpep.YCeVNe/asterisk-1.0.2/formats/Makefile	2005-01-04 21:07:01.000000000 +0100
-@@ -23,7 +23,7 @@
- 
- GSMLIB=../codecs/gsm/lib/libgsm.a
- 
--CFLAGS+=-fPIC
-+CFLAGS+=-fPIC -DPIC
- 
- all: depend $(FORMAT_LIBS)
- 
-diff -urNad asterisk-1.0.2/pbx/Makefile /tmp/dpep.YCeVNe/asterisk-1.0.2/pbx/Makefile
---- asterisk-1.0.2/pbx/Makefile	2003-10-26 19:50:49.000000000 +0100
-+++ /tmp/dpep.YCeVNe/asterisk-1.0.2/pbx/Makefile	2005-01-04 21:07:01.000000000 +0100
-@@ -27,7 +27,7 @@
- MOC=$(QTDIR)/bin/moc
- KDE_FLAGS=-I$(KDEDIR)/include -I$(KDEDIR)/include/kde -I$(QTDIR)/include
- KDE_LIBS=-L$(KDEDIR)/lib -L$(QTDIR)/lib -lqt -lkdecore -lkdeui
--CFLAGS+=-fPIC
-+CFLAGS+=-fPIC -DPIC
- 
- KDE_CONSOLE_OBJS=pbx_kdeconsole_main.o pbx_kdeconsole.o 
- 
-diff -urNad asterisk-1.0.2/res/Makefile /tmp/dpep.YCeVNe/asterisk-1.0.2/res/Makefile
---- asterisk-1.0.2/res/Makefile	2004-07-17 22:58:01.000000000 +0200
-+++ /tmp/dpep.YCeVNe/asterisk-1.0.2/res/Makefile	2005-01-04 21:07:25.000000000 +0100
-@@ -19,7 +19,7 @@
- 
- CRYPTO_LIBS=-lssl -lcrypto
- 
--CFLAGS+=
-+CFLAGS+=-fPIC -DPIC
- CFLAGS+=$(shell [ -f /usr/include/linux/zaptel.h ] && echo " -DZAPATA_MOH")
- CFLAGS+=$(shell [ -f /usr/local/include/zaptel.h ] && echo " -DZAPATA_MOH")
- #

Added: asterisk/trunk/debian/patches/arm.dpatch
===================================================================
--- asterisk/trunk/debian/patches/arm.dpatch	2006-01-01 03:33:07 UTC (rev 1116)
+++ asterisk/trunk/debian/patches/arm.dpatch	2006-01-01 20:54:34 UTC (rev 1117)
@@ -0,0 +1,22 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## arm.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.1.dfsg~/Makefile asterisk-1.2.1.dfsg/Makefile
+--- asterisk-1.2.1.dfsg~/Makefile	2005-12-05 06:47:51.000000000 +0000
++++ asterisk-1.2.1.dfsg/Makefile	2006-01-01 20:46:52.000000000 +0000
+@@ -200,9 +200,9 @@
+       OPTIONS+=-fsigned-char -mcpu=ep9312
+     else
+       ifeq ($(SUB_PROC),xscale)
+-        OPTIONS+=-fsigned-char -msoft-float -mcpu=xscale
++        OPTIONS+=-fsigned-char -mcpu=xscale
+       else
+-        OPTIONS+=-fsigned-char -msoft-float 
++        OPTIONS+=-fsigned-char
+       endif
+     endif
+   endif


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

More information about the Pkg-voip-commits mailing list