[Pkg-voip-commits] r10024 - in /kamailio/branches/wheezy/debian: changelog patches/arm_fix.patch patches/series patches/upstream/Makefile.defs-arm-compiler-flags-update.patch

[maniac-guest at alioth.debian.org]

Author: maniac-guest
Date: Fri Nov  9 08:12:09 2012
New Revision: 10024

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=10024
Log:
Closing 690388 by upstream

Added:
    kamailio/branches/wheezy/debian/patches/upstream/Makefile.defs-arm-compiler-flags-update.patch
Removed:
    kamailio/branches/wheezy/debian/patches/arm_fix.patch
Modified:
    kamailio/branches/wheezy/debian/changelog
    kamailio/branches/wheezy/debian/patches/series

Modified: kamailio/branches/wheezy/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/kamailio/branches/wheezy/debian/changelog?rev=10024&op=diff
==============================================================================
--- kamailio/branches/wheezy/debian/changelog (original)
+++ kamailio/branches/wheezy/debian/changelog Fri Nov  9 08:12:09 2012
@@ -1,15 +1,14 @@
 kamailio (3.3.0-2) unstable; urgency=low
 
   * debian/patches/upstream:
-    + add mayor fixes from upstream.
+    add important fixes from upstream.
     + 0007-modules_k-presence-Added-missing-use_table-call.patch
     + 0009-modules-sl-Fixed-segmentation-fault-and-corrected-lo.patch
     + 0013-modules-matrix-Fixed-MI-command-not-exported.patch
     + 0020-tls-set-function-to-return-the-id.patch
-  * Adddebian/patches:
-    + arm_fix.patch (Closes: #690388) Thanks Matthias Klose <doko at debian.org>
-
- -- Victor Seva <linuxmaniac at torreviejawireless.org>  Fri, 02 Nov 2012 11:53:01 +0100
+    + Makefile.defs-arm-compiler-flags-update.patch (Closes: #690388)
+
+ -- Victor Seva <linuxmaniac at torreviejawireless.org>  Fri, 09 Nov 2012 09:07:45 +0100
 
 kamailio (3.3.0-1) unstable; urgency=low
 

Modified: kamailio/branches/wheezy/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-voip/kamailio/branches/wheezy/debian/patches/series?rev=10024&op=diff
==============================================================================
--- kamailio/branches/wheezy/debian/patches/series (original)
+++ kamailio/branches/wheezy/debian/patches/series Fri Nov  9 08:12:09 2012
@@ -4,10 +4,10 @@
 upstream/0009-modules-sl-Fixed-segmentation-fault-and-corrected-lo.patch
 upstream/0013-modules-matrix-Fixed-MI-command-not-exported.patch
 upstream/0020-tls-set-function-to-return-the-id.patch
+Makefile.defs-arm-compiler-flags-update.patch
 multiarch_support.patch
 no_INSTALL_file.patch
 hardening_flags.patch
 plumb_md5.patch
 plumb_md5_fixes.patch
 fix_export.patch
-arm_fix.patch

Added: kamailio/branches/wheezy/debian/patches/upstream/Makefile.defs-arm-compiler-flags-update.patch
URL: http://svn.debian.org/wsvn/pkg-voip/kamailio/branches/wheezy/debian/patches/upstream/Makefile.defs-arm-compiler-flags-update.patch?rev=10024&op=file
==============================================================================
--- kamailio/branches/wheezy/debian/patches/upstream/Makefile.defs-arm-compiler-flags-update.patch (added)
+++ kamailio/branches/wheezy/debian/patches/upstream/Makefile.defs-arm-compiler-flags-update.patch Fri Nov  9 08:12:09 2012
@@ -1,0 +1,28 @@
+From f860ed61a19a1119ff6612fa6b3ebdfa6dc2f0bd Mon Sep 17 00:00:00 2001
+From: Daniel-Constantin Mierla <miconda at gmail.com>
+Date: Fri, 9 Nov 2012 08:07:42 +0100
+Subject: [PATCH] Makefile.defs: arm compiler flags update
+
+- patch by Matthias Klose <doko at debian.org>,
+  http://bugs.debian.org/cgi-bin/bugreport.cgi?msg=5;bug=690388
+(cherry picked from commit e916a4680d37f481167770fff27a710088cb5d3d)
+---
+ Makefile.defs |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile.defs b/Makefile.defs
+index 8957769..a1854a3 100644
+--- a/Makefile.defs
++++ b/Makefile.defs
+@@ -1186,7 +1186,7 @@ ifeq	($(ARCH), arm)
+ ifeq		($(CC_NAME), gcc)
+ 				C_DEFS+=-DCC_GCC_LIKE_ASM
+ 				#common stuff
+-				CFLAGS=-O9 -funroll-loops -fsigned-char $(PROFILE)
++				CFLAGS=-marm -march=armv5t -O9 -funroll-loops -fsigned-char $(PROFILE)
+ 			#if gcc 4.5+ or 4.2+
+ ifeq (,$(strip $(filter-out 4.2+ 4.5+,$(CC_SHORTVER))))
+ 					CFLAGS+= -ftree-vectorize -fno-strict-overflow
+-- 
+1.7.9.5
+