rpms/asterisk/F-8 asterisk-1.4.18-funcdesc.patch, NONE, 1.1 asterisk.spec, 1.8, 1.9

[Jeffrey C. Ollie (jcollie)]

Author: jcollie

Update of /cvs/pkgs/rpms/asterisk/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19334

Modified Files:
	asterisk.spec 
Added Files:
	asterisk-1.4.18-funcdesc.patch 
Log Message:
Add patch to fix building on PPC64.

asterisk-1.4.18-funcdesc.patch:

--- NEW FILE asterisk-1.4.18-funcdesc.patch ---
>From 0d18b1b78dbae3d548192883a858838bbc23011a Mon Sep 17 00:00:00 2001
From: David Woodhouse <dwmw2 at infradead.org>
Date: Wed, 27 Feb 2008 14:54:45 -0600
Subject: [PATCH] Fix building on PPC64.

1. build_tools/strip_nonapi was looking at the wrong output from
   nm(1).  This is fixed by checking for a PPC64 processor and
   adjusting.

2. Makefile would always hide the execution of
   build_tools/strip_nonapi which made it difficult to diagnose the
   problem.  Now when NOISY_BUILD is enabled you'll be able to see the
   execution of the script.
---
 build_tools/strip_nonapi |   11 ++++++++++-
 main/Makefile            |    2 +-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/build_tools/strip_nonapi b/build_tools/strip_nonapi
index c2262ca..91e41aa 100755
--- a/build_tools/strip_nonapi
+++ b/build_tools/strip_nonapi
@@ -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
 	;;
diff --git a/main/Makefile b/main/Makefile
index 204e7df..c9de882 100644
--- a/main/Makefile
+++ b/main/Makefile
@@ -146,7 +146,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
-- 
1.5.4.1



Index: asterisk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/F-8/asterisk.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- asterisk.spec	19 Feb 2008 12:49:01 -0000	1.8
+++ asterisk.spec	27 Feb 2008 22:12:02 -0000	1.9
@@ -3,14 +3,11 @@
 Summary: The Open Source PBX
 Name: asterisk
 Version: 1.4.18
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2
 Group: Applications/Internet
 URL: http://www.asterisk.org/
 
-# will file a bug once the asterisk bugzilla component shows up
-ExcludeArch: ppc64
-
 # The asterisk tarball contains some items that we don't want in there,
 # so start with the original tarball from here:
 # http://downloads.digium.com/pub/telephony/asterisk/releases/asterisk-%{version}.tar.gz
@@ -43,6 +40,7 @@
 Patch7:  asterisk-1.4.18-optimization.patch
 Patch8:  asterisk-1.4.18-chanmobile.patch
 Patch9:  asterisk-1.4.18-autoconf.patch
+Patch10: asterisk-1.4.18-funcdesc.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n)
 
@@ -333,6 +331,7 @@
 %patch7 -p1
 %patch8 -p1
 %patch9 -p1
+%patch10 -p1
 
 cp %{SOURCE2} menuselect.makedeps
 cp %{SOURCE3} menuselect.makeopts
@@ -901,6 +900,9 @@
 %{_libdir}/asterisk/modules/codec_zap.so
 
 %changelog
+* Wed Feb 27 2008  <jcollie at pc21225.campus.dmacc.edu> - 1.4.18-2
+- Add patch from David Woodhouse to fix building on PPC64.
+
 * Wed Feb 13 2008 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.4.18-1
 - Update to 1.4.18.
 - Use -march=i486 on i386 builds for atomic operations (GCC 4.3