[Astlinux-commits] SF.net SVN: astlinux:[6379] branches/1.0/package/asterisk

[<abe...@us...>]

Revision: 6379
          http://sourceforge.net/p/astlinux/code/6379
Author:   abelbeck
Date:     2014-01-24 23:33:27 +0000 (Fri, 24 Jan 2014)
Log Message:
-----------
asterisk, fix 3+ year old error message near the end of the main ./configure which attempts to run ./menuselect/configure but if cross compiling CC is incorrect and it fails, but fortunately ./menuselect/configure is later executed when ./menuselect/Makefile is called.  This patch skips calling the error generating ./menuselect/configure from the main ./configure, a cleanup.

Added Paths:
-----------
    branches/1.0/package/asterisk/asterisk-1.8-configure-cross-fix.patch
    branches/1.0/package/asterisk/asterisk-11-configure-cross-fix.patch

Added: branches/1.0/package/asterisk/asterisk-1.8-configure-cross-fix.patch
===================================================================
--- branches/1.0/package/asterisk/asterisk-1.8-configure-cross-fix.patch	                        (rev 0)
+++ branches/1.0/package/asterisk/asterisk-1.8-configure-cross-fix.patch	2014-01-24 23:33:27 UTC (rev 6379)
@@ -0,0 +1,16 @@
+--- asterisk-1.8.25.0/configure.ac.orig	2014-01-24 16:52:23.000000000 -0600
++++ asterisk-1.8.25.0/configure.ac	2014-01-24 16:55:14.000000000 -0600
+@@ -2283,11 +2283,13 @@
+ AC_OUTPUT
+ 
+ ${ac_cv_path_EGREP} 'CURSES|GTK2|OSARCH|NEWT' makeopts > makeopts.acbak2
++if test "${cross_compiling}" = "no"; then
+ if test "x${ac_cv_path_CMP}" = "x:"; then
+ 	( cd `pwd`/menuselect && ./configure )
+ else if ${ac_cv_path_CMP} -s makeopts.acbak makeopts.acbak2; then : ; else
+ 	( cd `pwd`/menuselect && ./configure )
+ fi ; fi
++fi
+ 
+ rm makeopts.acbak makeopts.acbak2
+ 

Added: branches/1.0/package/asterisk/asterisk-11-configure-cross-fix.patch
===================================================================
--- branches/1.0/package/asterisk/asterisk-11-configure-cross-fix.patch	                        (rev 0)
+++ branches/1.0/package/asterisk/asterisk-11-configure-cross-fix.patch	2014-01-24 23:33:27 UTC (rev 6379)
@@ -0,0 +1,16 @@
+--- asterisk-1.8.25.0/configure.ac.orig	2014-01-24 16:52:23.000000000 -0600
++++ asterisk-1.8.25.0/configure.ac	2014-01-24 16:55:14.000000000 -0600
+@@ -2382,11 +2382,13 @@
+ AC_OUTPUT
+ 
+ ${ac_cv_path_EGREP} 'CURSES|GTK2|OSARCH|NEWT' makeopts > makeopts.acbak2
++if test "${cross_compiling}" = "no"; then
+ if test "x${ac_cv_path_CMP}" = "x:"; then
+ 	( cd `pwd`/menuselect && ./configure )
+ else if ${ac_cv_path_CMP} -s makeopts.acbak makeopts.acbak2; then : ; else
+ 	( cd `pwd`/menuselect && ./configure )
+ fi ; fi
++fi
+ 
+ rm makeopts.acbak makeopts.acbak2
+ 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.