[asterisk-commits] qwell: trunk r80331 - in /trunk: ./ build_tools/
SVN commits to the Asterisk project
asterisk-commits at lists.digium.com
Wed Aug 22 13:54:31 CDT 2007
Author: qwell
Date: Wed Aug 22 13:54:30 2007
New Revision: 80331
URL: http://svn.digium.com/view/asterisk?view=rev&rev=80331
Log:
Merged revisions 80330 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r80330 | qwell | 2007-08-22 13:53:18 -0500 (Wed, 22 Aug 2007) | 7 lines
Fix a few build issues in Solaris (and likely others).
Use GREP and ID variables from autoconf.
Reported to me in #asterisk-dev
I forgot who reported this - sorry. :(
........
Modified:
trunk/ (props changed)
trunk/Makefile
trunk/build_tools/make_build_h
trunk/build_tools/make_buildopts_h
trunk/build_tools/mkpkgconfig
trunk/build_tools/prep_moduledeps
trunk/build_tools/strip_nonapi
Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.
Modified: trunk/Makefile
URL: http://svn.digium.com/view/asterisk/trunk/Makefile?view=diff&rev=80331&r1=80330&r2=80331
==============================================================================
--- trunk/Makefile (original)
+++ trunk/Makefile Wed Aug 22 13:54:30 2007
@@ -59,6 +59,8 @@
export SOLINK
export STRIP
export DOWNLOAD
+export GREP
+export ID
export OSARCH
export CURSES_DIR
export NCURSES_DIR
Modified: trunk/build_tools/make_build_h
URL: http://svn.digium.com/view/asterisk/trunk/build_tools/make_build_h?view=diff&rev=80331&r1=80330&r2=80331
==============================================================================
--- trunk/build_tools/make_build_h (original)
+++ trunk/build_tools/make_build_h Wed Aug 22 13:54:30 2007
@@ -3,11 +3,7 @@
KERNEL=`uname -r`
MACHINE=`uname -m`
OS=`uname -s`
-if [ `uname -s` = "SunOS" ]; then
- USER=`/usr/xpg4/bin/id -un`
-else
- USER=`id -un`
-fi
+USER=`${ID} -un`
DATE=`date -u "+%Y-%m-%d %H:%M:%S"`
cat << END
/*
Modified: trunk/build_tools/make_buildopts_h
URL: http://svn.digium.com/view/asterisk/trunk/build_tools/make_buildopts_h?view=diff&rev=80331&r1=80330&r2=80331
==============================================================================
--- trunk/build_tools/make_buildopts_h (original)
+++ trunk/build_tools/make_buildopts_h Wed Aug 22 13:54:30 2007
@@ -7,16 +7,16 @@
*/
END
-TMP=`grep MENUSELECT_CFLAGS menuselect.makeopts | sed 's/MENUSELECT_CFLAGS\=//g' | sed 's/-D//g'`
+TMP=`${GREP} MENUSELECT_CFLAGS menuselect.makeopts | sed 's/MENUSELECT_CFLAGS\=//g' | sed 's/-D//g'`
for x in ${TMP}; do
echo "#define ${x} 1"
done
-TMP=`grep MENUSELECT_BUILD_DEPS menuselect.makeopts | sed 's/MENUSELECT_BUILD_DEPS\=//g'`
+TMP=`${GREP} MENUSELECT_BUILD_DEPS menuselect.makeopts | sed 's/MENUSELECT_BUILD_DEPS\=//g'`
for x in ${TMP}; do
x2=`echo ${x} | tr a-z A-Z`
echo "#define AST_MODULE_${x2} 1"
done
-if grep AST_DEVMODE makeopts | grep -q yes
+if ${GREP} AST_DEVMODE makeopts | ${GREP} -q yes
then
echo "#define AST_DEVMODE 1"
fi
Modified: trunk/build_tools/mkpkgconfig
URL: http://svn.digium.com/view/asterisk/trunk/build_tools/mkpkgconfig?view=diff&rev=80331&r1=80330&r2=80331
==============================================================================
--- trunk/build_tools/mkpkgconfig (original)
+++ trunk/build_tools/mkpkgconfig Wed Aug 22 13:54:30 2007
@@ -14,7 +14,7 @@
fi
#Solaris (and some others) don't have sed -r. perl -p is equivalent
-if [[ `echo "xxx" | sed -r 's/x/y/g' 2>/dev/null | grep -c "yyy"` != 0 ]]; then
+if [[ `echo "xxx" | sed -r 's/x/y/g' 2>/dev/null | ${GREP} -c "yyy"` != 0 ]]; then
EXTREGEX="sed -r -e"
else
EXTREGEX="perl -pe"
Modified: trunk/build_tools/prep_moduledeps
URL: http://svn.digium.com/view/asterisk/trunk/build_tools/prep_moduledeps?view=diff&rev=80331&r1=80330&r2=80331
==============================================================================
--- trunk/build_tools/prep_moduledeps (original)
+++ trunk/build_tools/prep_moduledeps Wed Aug 22 13:54:30 2007
@@ -1,7 +1,7 @@
#!/bin/sh
get_description() {
- TDESC=`grep -e AST_MODULE_INFO ${1} | head -n 1 | cut -d '"' -f 2`
+ TDESC=`${GREP} -e AST_MODULE_INFO ${1} | head -n 1 | cut -d '"' -f 2`
}
process_dir() {
Modified: trunk/build_tools/strip_nonapi
URL: http://svn.digium.com/view/asterisk/trunk/build_tools/strip_nonapi?view=diff&rev=80331&r1=80330&r2=80331
==============================================================================
--- trunk/build_tools/strip_nonapi (original)
+++ trunk/build_tools/strip_nonapi Wed Aug 22 13:54:30 2007
@@ -15,11 +15,11 @@
# astman_
# pbx_
-FILTER="grep -v -e ^ast_ -e ^_ast_ -e ^__ast_ -e ^astman_ -e ^pbx_"
+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
+ nm ${1} | ${GREP} -e " T " | cut -d" " -f3 | ${FILTER} > striplist
sed -e "s/^/-N /" striplist | xargs ${STRIP} ${1}
rm -f striplist
;;
More information about the asterisk-commits
mailing list