rpms/CodeAnalyst-gui/devel ca-fix-basename.patch, NONE, 1.1 ca-fix-oprofile-ibs-check.patch, NONE, 1.1 ca-use-lbfd.patch, NONE, 1.1 CodeAnalyst-gui.spec, 1.9, 1.10

[Suravee Suthikulpanit]

Author: suravee

Update of /cvs/pkgs/rpms/CodeAnalyst-gui/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23033

Modified Files:
	CodeAnalyst-gui.spec 
Added Files:
	ca-fix-basename.patch ca-fix-oprofile-ibs-check.patch 
	ca-use-lbfd.patch 
Log Message:
- Bump revision number
- Add patch to fix basename issue when building on newer gcc
- Add patch to fix IBS feature checking in OProfile-0.9.5
- Add patch to force using -lbfd



ca-fix-basename.patch:
 configure.ac |    3 +++
 1 file changed, 3 insertions(+)

--- NEW FILE ca-fix-basename.patch ---
--- CodeAnalyst-gui-2.8.54/configure.ac	2009-07-06 15:27:20.000000000 -0500
+++ CodeAnalyst-gui-2.8.54-fix-basename/configure.ac	2009-07-17 16:43:50.905147989 -0500
@@ -35,6 +35,9 @@ AC_PREREQ(2.13)
 #Initialize Libtool
 AM_PROG_LIBTOOL
 
+# Fix issue with basename in gcc-4.4
+AC_CHECK_DECLS([basename], [], [], [[#include <libgen.h>]])
+
 AM_INIT_AUTOMAKE
 
 #Default installation directory

ca-fix-oprofile-ibs-check.patch:
 oprofile_interface.cpp |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

--- NEW FILE ca-fix-oprofile-ibs-check.patch ---
Fix BUG163976: Cannot profile IBS when build with OProfile-0.9.5 with option --with-oprofile

---

Index: src/ca/gui/oprofile_interface.cpp
===================================================================
--- src/ca/gui/oprofile_interface.cpp	(revision 16837)
+++ src/ca/gui/oprofile_interface.cpp	(working copy)
@@ -1144,15 +1144,16 @@
 	
 #if (OP_VERSION_BASE == 0x00903)
 	command = QString(OP_BINDIR) +
-			"opcontrol --help 2>&1 " +
+			"/opcontrol --help 2>&1 " +
 			"| grep ibs-fetch 2> /dev/null > /dev/null";
 	
 	ret = (system(command.ascii()) == 0)? true: false;
 #endif
 
 #if (OP_VERSION_BASE >= 0x00905)
+	
 	command = QString(OP_BINDIR) +
-			"oprofiled --help 2>&1 " +
+			"/oprofiled --help 2>&1 " +
 			"| grep ext-feature 2> /dev/null > /dev/null";
 	ret = (system(command.ascii()) == 0)? true: false;
 #endif

ca-use-lbfd.patch:
 libbfd.m4 |   22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

--- NEW FILE ca-use-lbfd.patch ---
Index: m4/libbfd.m4
===================================================================
--- m4/libbfd.m4	(revision 16845)
+++ m4/libbfd.m4	(working copy)
@@ -33,16 +33,16 @@
 
 AC_DEFUN([CHECK_LBFD],
 [
-	LIBBFD=`/sbin/ldconfig -p | \
-		grep "libbfd" | \
-		awk '{split($[]1,a," "); \
-			sub (/lib/,"", [a[1]]) ; \
-			sub(/.so/,"",[a[1]]); \
-			print [a[1]]; \
-			exit;}' 2> /dev/null` 
-        if test "$LIBBFD" != "" ; then
-		BFD_LIB="$LIBBFD"
-        else
+dnl	LIBBFD=`/sbin/ldconfig -p | \
+dnl		grep "libbfd" | \
+dnl		awk '{split($[]1,a," "); \
+dnl			sub (/lib/,"", [a[1]]) ; \
+dnl			sub(/.so/,"",[a[1]]); \
+dnl			print [a[1]]; \
+dnl			exit;}' 2> /dev/null` 
+dnl        if test "$LIBBFD" != "" ; then
+dnl		BFD_LIB="$LIBBFD"
+dnl        else
 		BFD_LIB="bfd"
-        fi
+dnl        fi
 ])


Index: CodeAnalyst-gui.spec
===================================================================
RCS file: /cvs/pkgs/rpms/CodeAnalyst-gui/devel/CodeAnalyst-gui.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- CodeAnalyst-gui.spec	20 Jul 2009 13:31:13 -0000	1.9
+++ CodeAnalyst-gui.spec	20 Jul 2009 18:25:23 -0000	1.10
@@ -1,7 +1,7 @@
 Summary:       CodeAnalyst is a Performance Analysis Suite for AMD-based System
 Name:          CodeAnalyst-gui
 Version:       2.8.54
-Release:       16%{?dist}
+Release:       17%{?dist}
 License:       GPLv2
 Group:         Development/System
 URL:           http://developer.amd.com/cpu/CodeAnalyst/codeanalystlinux
@@ -14,6 +14,15 @@ Source2:       DiffAnalyst-gui.desktop
 # since using stock oprofile daemon/driver
 Patch0:        ca-use-oprofile-default-buffersize.patch
 
+# Fix OProfile-0.9.5 IBS feature check
+Patch1:        ca-fix-oprofile-ibs-check.patch
+
+# Fix basename
+Patch2:        ca-fix-basename.patch
+
+# Force using lbfd
+Patch3:        ca-use-lbfd.patch
+
 Requires:      popt
 Requires:      binutils
 Requires:      elfutils-libelf
@@ -54,6 +63,9 @@ profile comparison, DiffAnalayst.
 %prep
 %setup -q -n %{name}-%{version}
 %patch0 -p1 -b .ca-use-oprofile-default-buffersize
+%patch1 -p0 -b .ca-fix-oprofile-ibs-check
+%patch2 -p1 -b .ca-fix-basename
+%patch3 -p0 -b .ca-use-lbfd
 
 
 %build
@@ -149,6 +161,12 @@ fi
 
 
 %changelog
+* Mon Jul 20 2009 - Suravee Suthikulpanit <suravee.suthikulpanit at amd.com>
+- 2.8.54-17
+- Add Patch1 (ca-fix-oprofile-ibs-check.patch)
+- Add Patch2 (ca-fix-basename.patch)
+- Add Patch3 (ca-use-lbfd.patch)
+
 * Mon Jul 20 2009 - Parag Nemade <panemade at gmail.com>
 - 2.8.54-16
 - Rebuild against new libbfd-2.19.51.0.11-24.fc12.so
@@ -157,14 +175,14 @@ fi
 - 2.8.54-15
 - Rebuild against new libbfd-2.19.51.0.11-23.fc12.so
 
-* Wed Jul 8 2009 - Suravee Suthikulpanit
+* Wed Jul 8 2009 - Suravee Suthikulpanit <suravee.suthikulpanit at amd.com>
 - 2.8.54-14
 - Update new release
 - Update source
 - Update patch0 
 - Remove patches1-4
 
-* Tue Jul 7 2009 - Suravee Suthikulpanit
+* Tue Jul 7 2009 - Suravee Suthikulpanit <suravee.suthikulpanit at amd.com>
 - 2.8.38-13
 - Rebuild against new libbfd-2.19.51.0.2-20.fc12.so