Merged revisions 104868 via svnmerge from
authorTilghman Lesher <tilghman@meg.abyt.es>
Thu, 28 Feb 2008 00:11:31 +0000 (00:11 +0000)
committerTilghman Lesher <tilghman@meg.abyt.es>
Thu, 28 Feb 2008 00:11:31 +0000 (00:11 +0000)
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r104868 | tilghman | 2008-02-27 18:05:06 -0600 (Wed, 27 Feb 2008) | 7 lines

Compatibility fix for PPC64
(closes issue #12081)
 Reported by: jcollie
 Patches:
       asterisk-1.4.18-funcdesc.patch uploaded by jcollie (license 412)
 Tested by: jcollie, Corydon76

........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@104869 65c4cc65-6c06-0410-ace0-fbb531ad65f3

build_tools/strip_nonapi
main/Makefile

index 8a8d06f..fe62c3d 100755 (executable)
 
 FILTER="${GREP} -v -e ^ast_ -e ^_ast_ -e ^__ast_ -e ^astman_ -e ^pbx_ -e ^resample_"
 
+case "${PROC}" in
+       powerpc64)
+               TEXTSYM=" D "
+               ;;
+       *)
+               TEXTSYM=" T "
+               ;;
+esac
+
 case "${OSARCH}" in
     linux-gnu|FreeBSD)
-       nm ${1} | ${GREP} -e " T " | cut -d" " -f3 | ${FILTER} > striplist
+       nm ${1} | ${GREP} -e "$TEXTSYM" | cut -d" " -f3 | ${FILTER} > striplist
        sed -e "s/^/-N /" striplist | xargs ${STRIP} ${1}
        rm -f striplist
        ;;
index 76e6446..8af41a5 100644 (file)
@@ -163,7 +163,7 @@ ifneq ($(findstring chan_h323,$(MENUSELECT_CHANNELS)),)
 else
        $(CMD_PREFIX) $(CXX) $(STATIC_BUILD) -o $@ $(ASTLINK) $(AST_EMBED_LDFLAGS) $(ASTLDFLAGS) $(H323LDFLAGS) $^ buildinfo.o $(AST_LIBS) $(AST_EMBED_LIBS) $(H323LDLIBS)
 endif
-       @$(ASTTOPDIR)/build_tools/strip_nonapi $@
+       $(CMD_PREFIX) $(ASTTOPDIR)/build_tools/strip_nonapi $@ || rm $@
 
 clean::
        rm -f asterisk