rpms/CodeAnalyst-gui/devel ca-configure-libdwarf.patch, NONE, 1.1 ca-fix-splash.patch, NONE, 1.1 CodeAnalyst-gui.spec, 1.3, 1.4

Suravee Suthikulpanit suravee at fedoraproject.org
Mon Apr 6 17:13:20 UTC 2009 

Author: suravee

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

Modified Files:
	CodeAnalyst-gui.spec 
Added Files:
	ca-configure-libdwarf.patch ca-fix-splash.patch 
Log Message:
- Add patch to enable libdwarf configuration
- Add patch to fix CA splash screen
- configure to use libdwarf
- Bump version number


ca-configure-libdwarf.patch:

--- NEW FILE ca-configure-libdwarf.patch ---
diff -uarN CodeAnalyst-gui-2.8.38/configure.ac CodeAnalyst-gui-2.8.38-libdwarf/configure.ac
--- CodeAnalyst-gui-2.8.38/configure.ac	2009-02-19 05:55:00.000000000 -0600
+++ CodeAnalyst-gui-2.8.38-libdwarf/configure.ac	2009-04-06 11:27:23.000000000 -0500
@@ -1,4 +1,4 @@
-#$Id: configure.ac 16162 2009-02-17 18:07:41Z ssuthiku $
+#$Id: configure.ac 16431 2009-04-03 20:06:32Z ssuthiku $
 
 # Process this file with autoconf to produce a configure script
 
@@ -46,13 +46,29 @@
 #Get Oprofile configuration 
 AC_ARG_WITH(oprofile, 
 	[  --with-oprofile=DIR                  absolute location where the Oprofile is installed])
-AC_ARG_WITH(oprofile, 
+AC_ARG_WITH(oprofile-includes, 
 	[  --with-oprofile-includes=DIR         absolute location where the Oprofile includes are])
-AC_ARG_WITH(oprofile, 
+AC_ARG_WITH(oprofile-libraries, 
 	[  --with-oprofile-libraries=DIR        absolute location where the Oprofile libraries are])
-AC_ARG_WITH(oprofile, 
+AC_ARG_WITH(oprofile-source, 
 	[  --with-oprofile-source=DIR           absolute location where the Oprofile source code is])
 
+#Get libdwarf configuration 
+AC_ARG_WITH(libdwarf-includes, 
+	[  --with-libdwarf-includes=DIR         absolute location where the libdwarf includes are])
+AC_ARG_WITH(libdwarf-libraries, 
+	[  --with-libdwarf-libraries=DIR        absolute location where the libdwarf libraries are])
+
+# Disable dwarf library
+AC_ARG_ENABLE(dwarf,
+	[  --disable-dwarf		disable usage of Dwarf Library (default is enabled)],
+	enable_dwarf=$enableval, 
+	enable_dwarf=yes)
+AM_CONDITIONAL(enable_dwarf, test "$enable_dwarf" = yes)
+if test "$enable_dwarf" = "yes"; then
+	AC_DEFINE_UNQUOTED(ENABLE_DWARF,1, [Enable dwarf-symbol-engine])
+fi
+
 #Turn on debug
 AC_ARG_ENABLE(debug,
 	[  --enable-debug		Turn on debugging],
@@ -77,11 +93,11 @@
 
 AC_DEFINE_UNQUOTED([DEBUGDIR], "$debugdir", [Directory with separate debug info files])
 
-dnl disable -Werr flag
+dnl enable -Werr flag
 AC_ARG_ENABLE(werror,
-	[  --disable-werror		disable -Werror flag (default is enabled for non-release)],
+	[  --enable-werror		enable -Werror flag (default is disabled)],
         enable_werror=$enableval, 
-	enable_werror=yes)
+	enable_werror=no)
 
 dnl disable-optimization flag
 AC_ARG_ENABLE(optimization,
@@ -89,16 +105,6 @@
 	enable_optimization=$enableval, 
 	enable_optimization=yes)
 
-# Disable dwarf library
-AC_ARG_ENABLE(dwarf,
-	[  --disable-dwarf		disable usage of Dwarf Library (default is enabled)],
-	enable_dwarf=$enableval, 
-	enable_dwarf=yes)
-AM_CONDITIONAL(enable_dwarf, test "$enable_dwarf" = yes)
-if test "$enable_dwarf" = "yes"; then
-	AC_DEFINE_UNQUOTED(ENABLE_DWARF,1, [Enable dwarf-symbol-engine])
-fi
-
 # Enable Oprofile XML library
 AC_ARG_ENABLE(oprofile-lib,
 	[  --disable-oprofile-lib	disable usage of Oprofile Library (default is enabled)],
@@ -181,21 +187,19 @@
 		ELF_LIB="-l$ELF"; AC_SUBST(ELF_LIB), 
 		ELF_LIB=""; AC_MSG_ERROR([libelf liberary not found]))
 
+LIBS="$ELF_LIB $LIBS"
+
 dnl check for popt
 AC_CHECK_LIB(popt, poptGetContext,
 		POPT_LIB="-lpopt"; AC_SUBST(POPT_LIB),
 		POPT_LIB=""; AC_MSG_ERROR([popt library not found]))
+LIBS="$POPT_LIB $LIBS"
 
 dnl check for dl
 AC_CHECK_LIB(dl, dlopen, 
 		DL_LIB="-ldl", 
 		DL_LIB=""; AC_MSG_ERROR([dl library not found]))
-
-dnl check for bfd
-CHECK_LBFD
-AC_CHECK_LIB($BFD, bfd_openr, 
-		BFD_LIB="-l$BFD"; AC_SUBST(BFD_LIB), 
-		BFD_LIB=""; AC_MSG_ERROR([bfd_openr bfd library not found]))
+LIBS="$DL_LIB $LIBS"
 
 dnl some distro have a libiberty.a but does not have a libiberty.h
 AC_CHECK_HEADERS(libiberty.h,,AC_MSG_ERROR([libiberth.h not found]))
@@ -204,7 +208,25 @@
 		AC_CHECK_LIB(iberty, cplus_demangle,
 			IBERTY_LIB="-liberty";AC_SUBST(IBERTY_LIB), 
 			IBERTY_LIB=""; AC_MSG_ERROR([liberty library not found])))
-LIBS="$ELF_LIB $POPT_LIB $DL_LIB $BFD_LIB $IBERTY_LIB"
+LIBS="$IBERTY_LIB $LIBS"
+
+dnl check for dl (needed by libbfd)
+AC_CHECK_LIB(z, compress,
+		Z_LIB="-lz"; AC_SUBST(Z_LIB), 
+		Z_LIB=""; [AC_MSG_ERROR([libz library not found; required by libbfd])])
+LIBS="$Z_LIB $LIBS"
+
+dnl check for libbfd
+#AC_CHECK_LIB(bfd, bfd_fdopenr, 
+#	BFD_LIB="-lbfd"; AC_SUBST(BFD_LIB), 
+#	[AC_MSG_ERROR([bfd library not found])])
+CHECK_LBFD
+AC_CHECK_LIB($BFD, bfd_openr, 
+		BFD_LIB="-l$BFD"; AC_SUBST(BFD_LIB), 
+		BFD_LIB=""; AC_MSG_ERROR([bfd_openr bfd library not found]))
+
+LIBS="$BFD_LIB $LIBS"
+
 ORIG_SAVE_LIBS="$LIBS"
 
 dnl Check for X Window stuff
@@ -266,9 +288,10 @@
 	AX_CFLAGS_OPTION(CA_CFLAGS,[-DCA_ENABLE_DEBUG])
 fi
 
-if test "$enable_werror" = yes; then
+if test "$enable_werror" = "yes"; then
 	# enable -Werror for non-release versions.
-	if ls `pwd` | grep .svn >/dev/null; then
+	ls `pwd`/.svn > /dev/null
+	if test "$?" = "0" ; then
 		AX_CFLAGS_OPTION(CA_CFLAGS,[-Werror])
 	fi
 fi
@@ -282,12 +305,13 @@
 AX_CXXFLAGS_OPTION(CA_CXXFLAGS,[-ftemplate-depth-50])
 AX_CXXFLAGS_OPTION(CA_CXXFLAGS,[-fPIC])
 if test x$debug = xtrue; then
-	AX_CFLAGS_OPTION(CA_CXXFLAGS,[-DCA_ENABLE_DEBUG])
+	AX_CXXFLAGS_OPTION(CA_CXXFLAGS,[-DCA_ENABLE_DEBUG])
 fi
 
-if test "$enable_werror" = yes; then
+if test "$enable_werror" = "yes"; then
 	# enable -Werror for non-release versions.
-	if ls `pwd` | grep .svn >/dev/null; then
+	ls `pwd`/.svn > /dev/null
+	if test "$?" = "0" ; then
 		AX_CXXFLAGS_OPTION(CA_CXXFLAGS,[-Werror])
 	fi
 fi
@@ -325,11 +349,37 @@
 fi
 my_bindir="$my_exec_prefix/bin"
 
-CA_DATA_DIR=`eval echo "$my_datadir/codeanalyst/"`
+CA_DATA_DIR="$my_datadir/codeanalyst/"
 AC_DEFINE_DIR(CA_DATA_DIR, CA_DATA_DIR,[Defines the data directory])
 AC_DEFINE_DIR(CA_BIN_DIR, bindir, [Defines the binary directory])
 AC_DEFINE_DIR(CA_SBIN_DIR, sbindir, [Defines the super-user binary directory])
 
+############################################
+# Setup for libdwarf
+############################################
+
+dnl Check with_libdwarf_includes
+if test "$with_libdwarf_includes" != "" ; then
+	LIBDWARF_INC="-I $with_libdwarf_includes"
+fi
+
+dnl Check with_libdwarf_libraries
+if test "$with_libdwarf_libraries" != "" ; then
+	LIBDWARF_LIB="$with_libdwarf_libraries"
+fi
+
+if test "$LIBDWARF_INC" = "" ; then
+if test "$LIBDWARF_LIB" = "" ; then
+	echo "---------- Begin Setup for libdwarf ----------"
+	CA_LIBDWARF_CONFIG()
+	if test "$LIBDWARF_DIR" != "" ; then
+		LIBDWARF_INC="-I $LIBDWARF_DIR"
+		LIBDWARF_LIB="$LIBDWARF_DIR"
+	fi
+	echo "---------- Finish Setup for libdwarf ----------"
+fi fi
+AC_SUBST(LIBDWARF_INC)
+AC_SUBST(LIBDWARF_LIB)
 
 ############################################
 # Setup for Oprofile
@@ -338,7 +388,7 @@
 
 dnl Check with_oprofile
 if test ! -z $with_oprofile; then
-	OPINST=`eval echo "$with_oprofile"`
+	OPINST="$with_oprofile"
 
 	# TODO: check where the default bin should be
 	OPBIN=$OPINST/bin
@@ -352,18 +402,17 @@
 
 dnl Check with_oprofile_includes
 if test ! -z $with_oprofile_includes; then
-	OPINC=`eval echo "$with_oprofile_includes/"`
+	OPINC="$with_oprofile_includes/"
 fi
 
-
 dnl Check with_oprofile_libraries
 if test ! -z $with_oprofile_libraries; then
-	OPLIB=`eval echo "$with_oprofile_libraries/"`
+	OPLIB="$with_oprofile_libraries/"
 fi
 
 dnl Check with_oprofile_bin
 if test ! -z $with_oprofile_bin; then
-	OPBIN=`eval echo "$with_oprofile_bin/"`
+	OPBIN="$with_oprofile_bin/"
 	AC_SUBST(OPBIN)
 fi
 
@@ -401,7 +450,7 @@
 
 dnl Setup oprofile src dir
 if test ! -z $with_oprofile_source ; then
-	OPSRC=`eval echo "$with_oprofile_source/"`
+	OPSRC="$with_oprofile_source/"
 	AC_SUBST(OPSRC)
 	CHECK_OPROFILE_CONFIG($OPSRC)
 fi
diff -uarN CodeAnalyst-gui-2.8.38/m4/calibdwarfconfig.m4 CodeAnalyst-gui-2.8.38-libdwarf/m4/calibdwarfconfig.m4
--- CodeAnalyst-gui-2.8.38/m4/calibdwarfconfig.m4	1969-12-31 18:00:00.000000000 -0600
+++ CodeAnalyst-gui-2.8.38-libdwarf/m4/calibdwarfconfig.m4	2009-04-04 10:41:01.000000000 -0500
@@ -0,0 +1,16 @@
+AC_DEFUN([CA_LIBDWARF_CONFIG],
+[
+	dnl Check for configure
+	echo "... Configuring libdwarf"
+	test -f "src/dwarf-20090217/libdwarf/configure" 
+	if test "$?" = "0" ; then
+		pushd src/dwarf-20090217/libdwarf/
+		echo "... running src/dwarf-20090217/libdwarf/configure"
+		./configure --prefix=$prefix --libdir=$libdir --enable-shared CFLAGS=-fPIC 
+		LIBDWARF_DIR=${topdir}/src/dwarf-20090217/libdwarf/
+		AC_SUBST(LIBDWARF_DIR)	
+		popd
+	fi
+		
+])
+
diff -uarN CodeAnalyst-gui-2.8.38/src/ca/diffgui/Makefile.am CodeAnalyst-gui-2.8.38-libdwarf/src/ca/diffgui/Makefile.am
--- CodeAnalyst-gui-2.8.38/src/ca/diffgui/Makefile.am	2009-04-04 13:12:03.000000000 -0500
+++ CodeAnalyst-gui-2.8.38-libdwarf/src/ca/diffgui/Makefile.am	2009-04-04 10:42:05.000000000 -0500
@@ -68,7 +68,7 @@
 DiffAnalyst_LDADD= \
         ${top_srcdir}/${CADIR}/libs/libca/libCA.la \
         ${top_srcdir}/${CADIR}/libs/libcabba/libCAbba.la \
-	${top_srcdir}/${CADIR}/libs/libdwarf-20070223/lib/${build_cpu}/libdwarf.a \
+	-L${LIBDWARF_LIB} -ldwarf \
         ${top_srcdir}/${CADIR}/libs/liboutput/lib_tbp_output.la \
 	${op_libs} \
 	@QT_LIB@ \
diff -uarN CodeAnalyst-gui-2.8.38/src/ca/gui/Makefile.am CodeAnalyst-gui-2.8.38-libdwarf/src/ca/gui/Makefile.am
--- CodeAnalyst-gui-2.8.38/src/ca/gui/Makefile.am	2009-04-04 13:12:03.000000000 -0500
+++ CodeAnalyst-gui-2.8.38-libdwarf/src/ca/gui/Makefile.am	2009-04-04 10:42:17.000000000 -0500
@@ -174,7 +174,7 @@
 CodeAnalyst_LDADD= \
 	${top_srcdir}/${CADIR}/libs/libcabba/libCAbba.la \
 	${top_srcdir}/${CADIR}/libs/libca/libCA.la \
-	${top_srcdir}/${CADIR}/libs/libdwarf-20070223/lib/${build_cpu}/libdwarf.a \
+	-L${LIBDWARF_LIB} -ldwarf \
 	${top_srcdir}/${CADIR}/libs/libopdata/libopdata.la \
 	${top_srcdir}/${CADIR}/libs/liboutput/lib_tbp_output.la \
 	${op_libs} \
diff -uarN CodeAnalyst-gui-2.8.38/src/ca/libs/libca/Makefile.am CodeAnalyst-gui-2.8.38-libdwarf/src/ca/libs/libca/Makefile.am
--- CodeAnalyst-gui-2.8.38/src/ca/libs/libca/Makefile.am	2009-02-12 12:06:37.000000000 -0600
+++ CodeAnalyst-gui-2.8.38-libdwarf/src/ca/libs/libca/Makefile.am	2009-04-06 10:41:36.000000000 -0500
@@ -12,8 +12,8 @@
 AM_CPPFLAGS= \
 	@QT_INCLUDES@ \
 	${op_includes} \
+	${LIBDWARF_INC} \
 	-I ../../include \
-	-I ../libdwarf-20070223/include/ \
 	-I /usr/include/libelf \
 	-I ../libopdata \
 	-I ../liboutput \
@@ -35,7 +35,7 @@
 if enable_dwarf
 libCA_la_LIBADD = \
 	${op_libs} \
-	${top_srcdir}/${CADIR}/libs/libdwarf-20070223/lib/${build_cpu}/libdwarf.a \
+	-L${LIBDWARF_LIB} -ldwarf \
 	${top_srcdir}/${CADIR}/libs/liboutput/lib_tbp_output.la \
 	${top_srcdir}/${CADIR}/libs/libopdata/libopdata.la 
 
diff -uarN CodeAnalyst-gui-2.8.38/src/ca/libs/libcabba/Makefile.am CodeAnalyst-gui-2.8.38-libdwarf/src/ca/libs/libcabba/Makefile.am
--- CodeAnalyst-gui-2.8.38/src/ca/libs/libcabba/Makefile.am	2009-04-04 13:12:03.000000000 -0500
+++ CodeAnalyst-gui-2.8.38-libdwarf/src/ca/libs/libcabba/Makefile.am	2009-04-04 17:24:46.000000000 -0500
@@ -7,8 +7,8 @@
 #	bbatest
 
 INCLUDES = \
-    -I ../libdwarf-20070223/include/ \
-    -I /usr/include/libelf 
+	${LIBDWARF_INC} \
+	-I /usr/include/libelf 
 
 AM_CPPFLAGS = $(INCLUDES) $(FLAG64)\
     	-pipe -Wno-unused -Wno-parentheses ${CA_CXXFLAGS}
@@ -16,7 +16,7 @@
 libCAbba_la_LDFLAGS = -Wl -fPIC --no-undefined -version-number ${libVersion}
 
 if enable_dwarf
-libCAbba_la_LIBADD = ../libdwarf-20070223/lib/${build_cpu}/libdwarf.a
+libCAbba_la_LIBADD  = -L${LIBDWARF_LIB}  -ldwarf
 else
 libCAbba_la_LIBADD = 
 endif
diff -uarN CodeAnalyst-gui-2.8.38/src/Makefile.am CodeAnalyst-gui-2.8.38-libdwarf/src/Makefile.am
--- CodeAnalyst-gui-2.8.38/src/Makefile.am	2009-01-29 00:48:12.000000000 -0600
+++ CodeAnalyst-gui-2.8.38-libdwarf/src/Makefile.am	2009-04-04 10:41:45.000000000 -0500
@@ -1,4 +1,19 @@
 SUBDIRS = \
+	$(LIBDWARF_DIR) \
 	$(CA_OPROFILE_DIR) \
 	ca 
 
+install-exec-hook:
+	@if test -e "${LIBDWARF_DIR}libdwarf.so"; then \
+		install -pD -m 755 ${LIBDWARF_DIR}libdwarf.so $(DESTDIR)$(prefix)/lib/libdwarf.so ; \
+		ldconfig ;\
+	fi
+
+uninstall-hook:
+	@if test -e "${LIBDWARF_DIR}libdwarf.so"; then \
+		if test -e "$(DESTDIR)$(prefix)/lib/libdwarf.so"; then \
+			rm -f $(DESTDIR)$(prefix)/lib/libdwarf.so ; \
+			ldconfig ; \
+		fi ; \
+	fi
+

ca-fix-splash.patch:

--- NEW FILE ca-fix-splash.patch ---
diff -uarN CodeAnalyst-gui-2.8.38/src/ca/gui/main.cpp CodeAnalyst-gui-2.8.38-libdwarf/src/ca/gui/main.cpp
--- CodeAnalyst-gui-2.8.38/src/ca/gui/main.cpp	2009-02-10 16:07:21.000000000 -0600
+++ CodeAnalyst-gui-2.8.38-libdwarf/src/ca/gui/main.cpp	2009-04-06 11:36:58.000000000 -0500
@@ -54,20 +54,16 @@
 	}
 
 	QApplication a (argc, argv);
-	
-	ApplicationWindow * mw = new ApplicationWindow();
-	mw->setCaption( "Advanced Micro Devices - CodeAnalyst Performance Analyzer" );
 
 	QString BinDirectory = QString(CA_DATA_DIR) + "/" + CODEANALYST_SPLASH;
 	QSplashScreen splash ( QPixmap(BinDirectory), Qt::WStyle_StaysOnTop);
 	splash.show();
-	
-	// Show the splash screen for 2 seconds
-	sleep(2);	
+
+	ApplicationWindow * mw = new ApplicationWindow();
 	splash.finish (mw);
-	
+	mw->setCaption( "Advanced Micro Devices - CodeAnalyst Performance Analyzer" );
 	mw->show();
-	
+
 	a.connect ( &a, SIGNAL (lastWindowClosed()), &a, SLOT (quit()) );
 	//a.syncX();
 	ret_value =  a.exec();


Index: CodeAnalyst-gui.spec
===================================================================
RCS file: /cvs/pkgs/rpms/CodeAnalyst-gui/devel/CodeAnalyst-gui.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- CodeAnalyst-gui.spec	1 Apr 2009 01:07:22 -0000	1.3
+++ CodeAnalyst-gui.spec	6 Apr 2009 17:12:49 -0000	1.4
@@ -1,7 +1,7 @@
 Summary:       CodeAnalyst is a Performance Analysis Suite for AMD-based System
 Name:          CodeAnalyst-gui
 Version:       2.8.38
-Release:       10%{?dist}
+Release:       11%{?dist}
 License:       GPLv2
 Group:         Development/System
 URL:           http://developer.amd.com/cpu/CodeAnalyst/codeanalystlinux
@@ -20,6 +20,12 @@
 # This patch allows to succesfully build with --disable-dwarf
 Patch2:        ca-disable-dwarf.patch
 
+# This patch allows to CA to be configured with any libdwarf
+Patch3:        ca-configure-libdwarf.patch
+
+# This patch fix the splash screen
+Patch4:        ca-fix-splash.patch
+
 Requires:      popt
 Requires:      binutils
 Requires:      elfutils-libelf
@@ -41,6 +47,7 @@
 BuildRequires: qt3-designer >= 3.3
 BuildRequires: oprofile >= 0.9.4
 BuildRequires: desktop-file-utils
+BuildRequires: libdwarf-devel
 
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
@@ -61,6 +68,8 @@
 %patch0 -p1 -b .ca-use-oprofile-default-buffersize
 %patch1 -p0 -b .ca-destdir
 %patch2 -p0 -b .ca-disable-dwarf
+%patch3 -p1 -b .ca-configure-libdwarf
+%patch4 -p1 -b .ca-fix-splash
 
 
 %build
@@ -68,8 +77,9 @@
 %configure \
   --with-oprofile=%{_prefix} \
   --disable-oprofile-lib \
-  --disable-dwarf \
-  --disable-static
+  --disable-static \
+  --with-libdwarf-includes=%{_includedir}/libdwarf \
+  --with-libdwarf-libraries=%{_libdir}
 
 make %{?_smp_mflags} all \
   CFLAGS="${RPM_OPT_FLAGS}" \
@@ -155,6 +165,13 @@
 
 
 %changelog
+* Mon Apr 6 2009 - Suravee Suthikulpanit <suravee.suthikulpanit at amd.com>
+- 2.8.38-11
+- Remove --disable-dwarf from configuration
+- Add patch ca-configure-libdwarf.patch
+- Add patch ca-fix-splash.patch
+- configure to build with libdwarf package
+
 * Tue Mar 31 2009 - Suravee Suthikulpanit <suravee.suthikulpanit at amd.com>
 - 2.8.38-10
 - Rebuild with new libbfd-2.19.51.0.2-16.fc11.so

More information about the scm-commits mailing list