kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-05 20:20:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 80330 via svnmerge from

Browse Source 
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. :(

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@80331 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Jason Parker
2007-08-22 18:54:30 +00:00
parent 553e5254e4
commit 30f27bd09a
6 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@@ -59,6 +59,8 @@ export PROC
export SOLINK export SOLINK
export STRIP export STRIP
export DOWNLOAD export DOWNLOAD
export GREP
export ID
export OSARCH export OSARCH
export CURSES_DIR export CURSES_DIR
export NCURSES_DIR export NCURSES_DIR

6
build_tools/make_build_h
View File

@@ -3,11 +3,7 @@ HOSTNAME=`uname -n`
KERNEL=`uname -r` KERNEL=`uname -r`
MACHINE=`uname -m` MACHINE=`uname -m`
OS=`uname -s` OS=`uname -s`
if [ `uname -s` = "SunOS" ]; then USER=`${ID} -un`
USER=`/usr/xpg4/bin/id -un`
else
USER=`id -un`
fi
DATE=`date -u "+%Y-%m-%d %H:%M:%S"` DATE=`date -u "+%Y-%m-%d %H:%M:%S"`
cat << END cat << END
/* /*

6
build_tools/make_buildopts_h
View File

@@ -7,16 +7,16 @@ cat << END
*/ */
END 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 for x in ${TMP}; do
echo "#define ${x} 1" echo "#define ${x} 1"
done 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 for x in ${TMP}; do
x2=`echo ${x} | tr a-z A-Z` x2=`echo ${x} | tr a-z A-Z`
echo "#define AST_MODULE_${x2} 1" echo "#define AST_MODULE_${x2} 1"
done done
if grep AST_DEVMODE makeopts | grep -q yes if ${GREP} AST_DEVMODE makeopts | ${GREP} -q yes
then then
echo "#define AST_DEVMODE 1" echo "#define AST_DEVMODE 1"
fi fi

2
build_tools/mkpkgconfig
View File

@@ -14,7 +14,7 @@ if [ ! -d $PPATH ]; then
fi fi
#Solaris (and some others) don't have sed -r. perl -p is equivalent #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" EXTREGEX="sed -r -e"
else else
EXTREGEX="perl -pe" EXTREGEX="perl -pe"

2
build_tools/prep_moduledeps
View File

@@ -1,7 +1,7 @@
#!/bin/sh #!/bin/sh
get_description() { 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() { process_dir() {

4
build_tools/strip_nonapi
View File

@@ -15,11 +15,11 @@
# astman_ # astman_
# pbx_ # 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 case "${OSARCH}" in
linux-gnu) 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} sed -e "s/^/-N /" striplist | xargs ${STRIP} ${1}
rm -f striplist rm -f striplist
;; ;;