[Pkg-voip-commits] [kamailio] 03/07: refresh debian patches

[Victor Seva Lopez]

This is an automated email from the git hooks/post-receive script.

maniac-guest pushed a commit to branch master
in repository kamailio.

commit f155ce315dc3a8b2bbda2db62115bffb01cbe443
Author: Victor Seva <linuxmaniac at torreviejawireless.org>
Date:   Mon Jul 20 20:34:20 2015 +0200

    refresh debian patches
---
 debian/patches/fix-mips.patch            | 23 +++++++++++------------
 debian/patches/fix_export.patch          |  2 +-
 debian/patches/no_INSTALL_file.patch     |  2 +-
 debian/patches/no_lib64_on_64_bits.patch |  2 +-
 4 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/debian/patches/fix-mips.patch b/debian/patches/fix-mips.patch
index e97766c..91bca43 100644
--- a/debian/patches/fix-mips.patch
+++ b/debian/patches/fix-mips.patch
@@ -11,14 +11,12 @@ https://buildd.debian.org/status/fetch.php?pkg=kamailio&arch=mipsel&ver=4.2.0-1&
 
 The patch below fixes this issue.
 
-Index: kamailio-4.2.0/Makefile.defs
-===================================================================
---- kamailio-4.2.0.orig/Makefile.defs
-+++ kamailio-4.2.0/Makefile.defs
-@@ -1360,12 +1360,13 @@ ifeq		($(CC_NAME), gcc)
+--- a/Makefile.defs
++++ b/Makefile.defs
+@@ -1309,12 +1309,13 @@
  				CFLAGS= -mips2 $(CC_OPT) -funroll-loops $(PROFILE)
- 			#if gcc 4.5+ or 4.2+
- ifeq (,$(strip $(filter-out 4.2+ 4.5+,$(CC_SHORTVER))))
+ 			#if gcc 5.0+, 4.5+ or 4.2+
+ ifeq (,$(strip $(filter-out 4.2+ 4.5+ 5.0+,$(CC_SHORTVER))))
 -					CFLAGS+=-minline-all-stringops -ftree-vectorize \
 -							-fno-strict-overflow
 +					CFLAGS+=-ftree-vectorize -fno-strict-overflow
@@ -32,20 +30,21 @@ Index: kamailio-4.2.0/Makefile.defs
  else
  			#if gcc 3.4+
  ifeq			($(CC_SHORTVER), 3.4)
-@@ -1405,12 +1406,13 @@ ifeq		($(CC_NAME), gcc)
+@@ -1354,12 +1355,14 @@
  				CFLAGS= -mips64 $(CC_OPT) -funroll-loops $(PROFILE)
- 			#if gcc 4.5+ or 4.2+
- ifeq (,$(strip $(filter-out 4.2+ 4.5+,$(CC_SHORTVER))))
+ 			#if gcc 5.0+, 4.5+ or 4.2+
+ ifeq (,$(strip $(filter-out 4.2+ 4.5+ 5.0+,$(CC_SHORTVER))))
 -					CFLAGS+=-minline-all-stringops -ftree-vectorize \
 -							-fno-strict-overflow
 +					CFLAGS+=-ftree-vectorize -fno-strict-overflow
-+			# not supported on mips64: -minline-all-stringops
++			# not supported on mips: -minline-all-stringops
++
  else
  			#if gcc 4.0+
  ifeq			($(CC_SHORTVER), 4.x)
 -					CFLAGS+=-minline-all-stringops -ftree-vectorize
 +					CFLAGS+=-ftree-vectorize
-+			# not supported on mips64: -minline-all-stringops
++			# not supported on mips: -minline-all-stringops
  else
  			#if gcc 3.4+
  ifeq			($(CC_SHORTVER), 3.4)
diff --git a/debian/patches/fix_export.patch b/debian/patches/fix_export.patch
index 11bf4b2..413831c 100644
--- a/debian/patches/fix_export.patch
+++ b/debian/patches/fix_export.patch
@@ -3,7 +3,7 @@ Author: Tzafrir Cohen <tzafrir at debian.org>
 
 --- a/Makefile
 +++ b/Makefile
-@@ -200,6 +200,8 @@
+@@ -139,6 +139,8 @@
  main_makefile=1
  include Makefile.defs
  
diff --git a/debian/patches/no_INSTALL_file.patch b/debian/patches/no_INSTALL_file.patch
index bde677b..dd20ac2 100644
--- a/debian/patches/no_INSTALL_file.patch
+++ b/debian/patches/no_INSTALL_file.patch
@@ -3,7 +3,7 @@ Author: Victor Seva <linuxmaniac at torreviejawireless.org>
 
 --- a/Makefile
 +++ b/Makefile
-@@ -896,8 +896,6 @@
+@@ -839,8 +839,6 @@
  
  
  install-doc: $(doc_prefix)/$(doc_dir) install-every-module-doc
diff --git a/debian/patches/no_lib64_on_64_bits.patch b/debian/patches/no_lib64_on_64_bits.patch
index 1c82ee5..8eac97d 100644
--- a/debian/patches/no_lib64_on_64_bits.patch
+++ b/debian/patches/no_lib64_on_64_bits.patch
@@ -3,7 +3,7 @@ Author: Victor Seva <linuxmaniac at torreviejawireless.org>
 
 --- a/Makefile.defs
 +++ b/Makefile.defs
-@@ -428,15 +428,7 @@
+@@ -362,15 +362,7 @@
  endif
  $(info target architecture <$(ARCH)>, host architecture <$(HOST_ARCH)>)
  

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-voip/kamailio.git