[svn-commits] russell: trunk r46848 - in /trunk: ./ build_tools/
codecs/gsm/
svn-commits at lists.digium.com
svn-commits at lists.digium.com
Wed Nov 1 15:54:16 MST 2006
Author: russell
Date: Wed Nov 1 16:54:15 2006
New Revision: 46848
URL: http://svn.digium.com/view/asterisk?rev=46848&view=rev
Log:
Merged revisions 46847 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r46847 | russell | 2006-11-01 17:51:21 -0500 (Wed, 01 Nov 2006) | 3 lines
Fixes for cross-compilation on mips
(issue #8058, ywalther, with some modifications)
........
Modified:
trunk/ (props changed)
trunk/Makefile
trunk/build_tools/strip_nonapi
trunk/codecs/gsm/Makefile
trunk/configure
trunk/configure.ac
trunk/makeopts.in
Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.
Modified: trunk/Makefile
URL: http://svn.digium.com/view/asterisk/trunk/Makefile?rev=46848&r1=46847&r2=46848&view=diff
==============================================================================
--- trunk/Makefile (original)
+++ trunk/Makefile Wed Nov 1 16:54:15 2006
@@ -51,6 +51,7 @@
export DESTDIR
export PROC
export SOLINK
+export STRIP
# even though we could use '-include makeopts' here, use a wildcard
# lookup anyway, so that make won't try to build makeopts if it doesn't
Modified: trunk/build_tools/strip_nonapi
URL: http://svn.digium.com/view/asterisk/trunk/build_tools/strip_nonapi?rev=46848&r1=46847&r2=46848&view=diff
==============================================================================
--- trunk/build_tools/strip_nonapi (original)
+++ trunk/build_tools/strip_nonapi Wed Nov 1 16:54:15 2006
@@ -20,7 +20,7 @@
case "${OSARCH}" in
linux-gnu)
nm ${1} | grep -e " T " | cut -d" " -f3 | ${FILTER} > striplist
- sed -e "s/^/-N /" striplist | xargs strip ${1}
+ sed -e "s/^/-N /" striplist | xargs ${STRIP} ${1}
rm -f striplist
;;
*)
Modified: trunk/codecs/gsm/Makefile
URL: http://svn.digium.com/view/asterisk/trunk/codecs/gsm/Makefile?rev=46848&r1=46847&r2=46848&view=diff
==============================================================================
--- trunk/codecs/gsm/Makefile (original)
+++ trunk/codecs/gsm/Makefile Wed Nov 1 16:54:15 2006
@@ -38,7 +38,7 @@
######### probably require gcc.
ifeq (, $(findstring $(OSARCH) , Darwin SunOS ))
-ifeq (, $(findstring $(PROC) , x86_64 amd64 ultrasparc sparc64 arm ppc powerpc ppc64 ia64 s390 bfin ))
+ifeq (, $(findstring $(PROC) , x86_64 amd64 ultrasparc sparc64 arm ppc powerpc ppc64 ia64 s390 bfin mipsel ))
ifeq (, $(findstring $(shell uname -m) , ppc ppc64 alpha armv4l s390 ))
OPTIMIZE+=-march=$(PROC)
endif
@@ -209,7 +209,7 @@
# XXX should merge with GSM_OBJECTS
ifeq ($(OSARCH),linux-gnu)
ifeq (,$(findstring $(shell uname -m) , x86_64 amd64 ppc ppc64 alpha armv4l sparc64 parisc s390 ))
-ifeq (,$(findstring $(PROC) , arm ia64 s390 bfin ))
+ifeq (,$(findstring $(PROC) , arm ia64 s390 bfin mipsel ))
GSM_SOURCES+= $(SRC)/k6opt.s
endif
endif
@@ -261,7 +261,7 @@
ifeq ($(OSARCH),linux-gnu)
ifeq (,$(findstring $(shell uname -m) , x86_64 amd64 ppc ppc64 alpha armv4l sparc64 parisc ))
-ifeq (,$(findstring $(PROC) , arm ia64 bfin ))
+ifeq (,$(findstring $(PROC) , arm ia64 bfin mipsel ))
GSM_OBJECTS+= $(SRC)/k6opt.o
endif
endif
Modified: trunk/configure
URL: http://svn.digium.com/view/asterisk/trunk/configure?rev=46848&r1=46847&r2=46848&view=diff
==============================================================================
--- trunk/configure (original)
+++ trunk/configure Wed Nov 1 16:54:15 2006
@@ -1,5 +1,5 @@
#! /bin/sh
-# From configure.ac Revision: 46507 .
+# From configure.ac Revision: 46846 .
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.60a.
#
@@ -689,6 +689,7 @@
DIRNAME
LN
DOT
+STRIP
AST_DEVMODE
ALSA_LIB
ALSA_INCLUDE
@@ -5651,6 +5652,47 @@
fi
+# Extract the first word of "strip", so it can be a program name with args.
+set dummy strip; ac_word=$2
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_path_STRIP+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ case $STRIP in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_STRIP="$STRIP" # Let the user override the test with a path.
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_path_STRIP="$as_dir/$ac_word$ac_exec_ext"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+IFS=$as_save_IFS
+
+ test -z "$ac_cv_path_STRIP" && ac_cv_path_STRIP=":"
+ ;;
+esac
+fi
+STRIP=$ac_cv_path_STRIP
+if test -n "$STRIP"; then
+ { echo "$as_me:$LINENO: result: $STRIP" >&5
+echo "${ECHO_T}$STRIP" >&6; }
+else
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi
+
+
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
@@ -33924,6 +33966,7 @@
DIRNAME!$DIRNAME$ac_delim
LN!$LN$ac_delim
DOT!$DOT$ac_delim
+STRIP!$STRIP$ac_delim
AST_DEVMODE!$AST_DEVMODE$ac_delim
ALSA_LIB!$ALSA_LIB$ac_delim
ALSA_INCLUDE!$ALSA_INCLUDE$ac_delim
@@ -33933,7 +33976,6 @@
PBX_CAP!$PBX_CAP$ac_delim
CURL_LIB!$CURL_LIB$ac_delim
CURL_INCLUDE!$CURL_INCLUDE$ac_delim
-PBX_CURL!$PBX_CURL$ac_delim
_ACEOF
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
@@ -33975,6 +34017,7 @@
ac_delim='%!_!# '
for ac_last_try in false false false false false :; do
cat >conf$$subs.sed <<_ACEOF
+PBX_CURL!$PBX_CURL$ac_delim
CURSES_LIB!$CURSES_LIB$ac_delim
CURSES_INCLUDE!$CURSES_INCLUDE$ac_delim
PBX_CURSES!$PBX_CURSES$ac_delim
@@ -34071,7 +34114,6 @@
TONEZONE_LIB!$TONEZONE_LIB$ac_delim
TONEZONE_INCLUDE!$TONEZONE_INCLUDE$ac_delim
PBX_TONEZONE!$PBX_TONEZONE$ac_delim
-VORBIS_LIB!$VORBIS_LIB$ac_delim
_ACEOF
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
@@ -34113,6 +34155,7 @@
ac_delim='%!_!# '
for ac_last_try in false false false false false :; do
cat >conf$$subs.sed <<_ACEOF
+VORBIS_LIB!$VORBIS_LIB$ac_delim
VORBIS_INCLUDE!$VORBIS_INCLUDE$ac_delim
PBX_VORBIS!$PBX_VORBIS$ac_delim
VPB_LIB!$VPB_LIB$ac_delim
@@ -34156,7 +34199,7 @@
LTLIBOBJS!$LTLIBOBJS$ac_delim
_ACEOF
- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 41; then
+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 42; then
break
elif $ac_last_try; then
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
Modified: trunk/configure.ac
URL: http://svn.digium.com/view/asterisk/trunk/configure.ac?rev=46848&r1=46847&r2=46848&view=diff
==============================================================================
--- trunk/configure.ac (original)
+++ trunk/configure.ac Wed Nov 1 16:54:15 2006
@@ -152,6 +152,7 @@
AC_PATH_PROG([SHELL], [sh], :)
AC_PATH_PROG([LN], [ln], :)
AC_PATH_PROG([DOT], [dot], :)
+AC_PATH_PROG([STRIP], [strip], :)
AC_LANG(C)
Modified: trunk/makeopts.in
URL: http://svn.digium.com/view/asterisk/trunk/makeopts.in?rev=46848&r1=46847&r2=46848&view=diff
==============================================================================
--- trunk/makeopts.in (original)
+++ trunk/makeopts.in Wed Nov 1 16:54:15 2006
@@ -18,6 +18,7 @@
LN=@LN@
QTMOC=@QTMOC@
DOT=@DOT@
+STRIP=@STRIP@
BUILD_PLATFORM=@BUILD_PLATFORM@
BUILD_CPU=@BUILD_CPU@
More information about the svn-commits
mailing list