diff options
| -rw-r--r-- | Makefile | 1 | ||||
| -rwxr-xr-x | build_tools/strip_nonapi | 2 | ||||
| -rw-r--r-- | codecs/gsm/Makefile | 6 | ||||
| -rwxr-xr-x | configure | 51 | ||||
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | makeopts.in | 1 |
6 files changed, 54 insertions, 8 deletions
@@ -51,6 +51,7 @@ export INSTALL 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 diff --git a/build_tools/strip_nonapi b/build_tools/strip_nonapi index 99d21f666..5fc0ed114 100755 --- a/build_tools/strip_nonapi +++ b/build_tools/strip_nonapi @@ -20,7 +20,7 @@ FILTER="grep -v -e ^ast_ -e ^_ast_ -e ^__ast_ -e ^astman_ -e ^pbx_" 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 ;; *) diff --git a/codecs/gsm/Makefile b/codecs/gsm/Makefile index ec2694a65..93a521535 100644 --- a/codecs/gsm/Makefile +++ b/codecs/gsm/Makefile @@ -38,7 +38,7 @@ WAV49 = -DWAV49 ######### 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 @@ GSM_SOURCES = $(SRC)/add.c \ # 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 @@ GSM_OBJECTS = $(SRC)/add.o \ 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 @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.ac Revision: 46506 . +# From configure.ac Revision: 46845 . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.60a. # @@ -689,6 +689,7 @@ ID DIRNAME LN DOT +STRIP AST_DEVMODE ALSA_LIB ALSA_INCLUDE @@ -5641,6 +5642,47 @@ echo "${ECHO_T}no" >&6; } 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' @@ -31494,6 +31536,7 @@ ID!$ID$ac_delim 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 @@ -31503,7 +31546,6 @@ CURL_INCLUDE!$CURL_INCLUDE$ac_delim PBX_CURL!$PBX_CURL$ac_delim CURSES_LIB!$CURSES_LIB$ac_delim CURSES_INCLUDE!$CURSES_INCLUDE$ac_delim -PBX_CURSES!$PBX_CURSES$ac_delim _ACEOF if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then @@ -31545,6 +31587,7 @@ _ACEOF ac_delim='%!_!# ' for ac_last_try in false false false false false :; do cat >conf$$subs.sed <<_ACEOF +PBX_CURSES!$PBX_CURSES$ac_delim GNUTLS_LIB!$GNUTLS_LIB$ac_delim GNUTLS_INCLUDE!$GNUTLS_INCLUDE$ac_delim PBX_GNUTLS!$PBX_GNUTLS$ac_delim @@ -31641,7 +31684,6 @@ PBX_VORBIS!$PBX_VORBIS$ac_delim VPB_LIB!$VPB_LIB$ac_delim VPB_INCLUDE!$VPB_INCLUDE$ac_delim PBX_VPB!$PBX_VPB$ac_delim -ZLIB_LIB!$ZLIB_LIB$ac_delim _ACEOF if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then @@ -31683,6 +31725,7 @@ _ACEOF ac_delim='%!_!# ' for ac_last_try in false false false false false :; do cat >conf$$subs.sed <<_ACEOF +ZLIB_LIB!$ZLIB_LIB$ac_delim ZLIB_INCLUDE!$ZLIB_INCLUDE$ac_delim PBX_ZLIB!$PBX_ZLIB$ac_delim ZAPTEL_LIB!$ZAPTEL_LIB$ac_delim @@ -31720,7 +31763,7 @@ CURL!$CURL$ac_delim LTLIBOBJS!$LTLIBOBJS$ac_delim _ACEOF - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 35; then + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 36; then break elif $ac_last_try; then { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 diff --git a/configure.ac b/configure.ac index 4f77b8752..f1dfa1f88 100644 --- a/configure.ac +++ b/configure.ac @@ -144,6 +144,7 @@ AC_PATH_PROG([DIRNAME], [dirname], :) AC_PATH_PROG([SHELL], [sh], :) AC_PATH_PROG([LN], [ln], :) AC_PATH_PROG([DOT], [dot], :) +AC_PATH_PROG([STRIP], [strip], :) AC_LANG(C) diff --git a/makeopts.in b/makeopts.in index 683484aa6..a66ae2d52 100644 --- a/makeopts.in +++ b/makeopts.in @@ -18,6 +18,7 @@ SHELL=@SHELL@ LN=@LN@ QTMOC=@QTMOC@ DOT=@DOT@ +STRIP=@STRIP@ BUILD_PLATFORM=@BUILD_PLATFORM@ BUILD_CPU=@BUILD_CPU@ |