[svn-commits] tilghman: branch 1.4 r104868 - in /branches/1.4: build_tools/ main/

[SVN commits to the Digium repositories]

Author: tilghman
Date: Wed Feb 27 18:05:06 2008
New Revision: 104868

URL: http://svn.digium.com/view/asterisk?view=rev&rev=104868
Log:
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

Modified:
    branches/1.4/build_tools/strip_nonapi
    branches/1.4/main/Makefile

Modified: branches/1.4/build_tools/strip_nonapi
URL: http://svn.digium.com/view/asterisk/branches/1.4/build_tools/strip_nonapi?view=diff&rev=104868&r1=104867&r2=104868
==============================================================================
--- branches/1.4/build_tools/strip_nonapi (original)
+++ branches/1.4/build_tools/strip_nonapi Wed Feb 27 18:05:06 2008
@@ -15,11 +15,20 @@
 #	astman_
 #	pbx_
 
+case "${PROC}" in
+	powerpc64)
+		TEXTSYM=" D "
+		;;
+	*)
+		TEXTSYM=" T "
+		;;
+esac
+
 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 "$TEXTSYM" | cut -d" " -f3 | ${FILTER} > striplist
 	sed -e "s/^/-N /" striplist | xargs ${STRIP} ${1}
 	rm -f striplist
 	;;

Modified: branches/1.4/main/Makefile
URL: http://svn.digium.com/view/asterisk/branches/1.4/main/Makefile?view=diff&rev=104868&r1=104867&r2=104868
==============================================================================
--- branches/1.4/main/Makefile (original)
+++ branches/1.4/main/Makefile Wed Feb 27 18:05:06 2008
@@ -146,7 +146,7 @@
 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