Hello community, here is the log from the commit of package CodeAnalyst for openSUSE:Factory checked in at 2012-12-14 06:36:22 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/CodeAnalyst (Old) and /work/SRC/openSUSE:Factory/.CodeAnalyst.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "CodeAnalyst", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/CodeAnalyst/CodeAnalyst.changes 2012-10-07 08:20:38.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.CodeAnalyst.new/CodeAnalyst.changes 2012-12-14 06:36:24.000000000 +0100 @@ -1,0 +2,8 @@ +Wed Dec 12 00:10:08 UTC 2012 - [email protected] + +- Fix build errors (config.h required before bfd.h) bnc#793541 +- Add support for oprofile 0.9.8 and make it easier for later versions + (compile tested only) +- Set __DATE__/__TIME__ to last changes modification. + +------------------------------------------------------------------- Old: ---- ca-support-oprofile-0.9.7.patch New: ---- ca-fix-bfd-include.patch ca-support-newer-oprofile.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ CodeAnalyst.spec ++++++ --- /var/tmp/diff_new_pack.vJR0Eg/_old 2012-12-14 06:36:27.000000000 +0100 +++ /var/tmp/diff_new_pack.vJR0Eg/_new 2012-12-14 06:36:27.000000000 +0100 @@ -34,9 +34,10 @@ # Fix basename issue when building Patch3: ca-fix-oprofile-ibs-check.patch Patch4: gcc46.patch -Patch5: ca-support-oprofile-0.9.7.patch +Patch5: ca-support-newer-oprofile.patch # PATCH-FIX-UPSTREAM CodeAnalyst-gcc47.patch [email protected] -- Fix build with gcc 4.7 Patch6: CodeAnalyst-gcc47.patch +Patch7: ca-fix-bfd-include.patch Requires: binutils Requires: oprofile >= 0.9.4 PreReq: pwdutils @@ -71,8 +72,9 @@ %patch0 -b .ca-use-oprofile-default-buffersize %patch3 -p0 -b .ca-fix-oprofile-ibs-check %patch4 -%patch5 +%patch5 -p1 %patch6 -p1 +%patch7 -p1 %build ./autogen.sh @@ -83,6 +85,13 @@ --disable-static \ --with-libdwarf-includes=%{_includedir}/libdwarf \ --with-libdwarf-libraries=%{_libdir} +# Change DATE/TIME macros to use last change time of oprofile.changes +# See http://lists.opensuse.org/opensuse-factory/2011-05/msg00304.html +modified="$(sed -n '/^----/n;s/ - .*$//;p;q' "%{_sourcedir}/%{name}.changes")" +DATE="\"$(date -d "${modified}" "+%%b %%e %%Y")\"" +TIME="\"$(date -d "${modified}" "+%%R")\"" +find . -type f -regex ".*\.c\|.*\.cpp\|.*\.h" -exec grep -E -e __DATE__ -e __TIME__ {} + +find . -type f -regex ".*\.c\|.*\.cpp\|.*\.h" -exec sed -i "s/__DATE__/${DATE}/g;s/__TIME__/${TIME}/g" {} + make %{?jobs:-j%jobs} %install ++++++ ca-fix-bfd-include.patch ++++++ From: Tony Jones <[email protected]> Subject: fix build error Upstream: no Fix build error, config.h required before bfd.h --- src/ca/diffgui/DasmDockView.cpp | 1 + src/ca/diffgui/PropDockView.cpp | 1 + src/ca/diffgui/diffStruct.h | 1 + src/ca/libs/libca/catranslate.cpp | 1 + src/ca/libs/libca/symbolengine.cpp | 1 + src/ca/libs/libca/symbolengine.h | 1 + src/ca/libs/libca/taskinfo.h | 1 + src/ca/libs/libcabba/bbanalysis.cpp | 1 + src/ca/libs/liboutput/tbswriter.h | 1 + src/ca_agent/libCAagent/ca_agent_bfd.h | 1 + src/ca_agent/libCAagent/libCAagent.h | 1 + src/ca_agent/libCAagent/smm.h | 1 + 12 files changed, 12 insertions(+) --- a/src/ca/diffgui/diffStruct.h +++ b/src/ca/diffgui/diffStruct.h @@ -19,6 +19,7 @@ #ifndef _DIFFSTRUCT_H_ #define _DIFFSTRUCT_H_ +#include <config.h> #include <bfd.h> #include <qstring.h> #include <qvaluevector.h> --- a/src/ca/libs/libca/symbolengine.h +++ b/src/ca/libs/libca/symbolengine.h @@ -23,6 +23,7 @@ #define _SYMBOL_ENGINE_H #include <qstring.h> +#include <config.h> #include <bfd.h> #include <qptrlist.h> #include <qmap.h> --- a/src/ca/libs/libca/taskinfo.h +++ b/src/ca/libs/libca/taskinfo.h @@ -19,6 +19,7 @@ #ifndef _TASKINFO_H_ #define _TASKINFO_H_ +#include <config.h> #include <bfd.h> #include <vector> #include <string> --- a/src/ca/libs/liboutput/tbswriter.h +++ b/src/ca/libs/liboutput/tbswriter.h @@ -4,6 +4,7 @@ #include <string> #include <map> #include <set> +#include <config.h> #include <bfd.h> #include "stdafx.h" --- a/src/ca_agent/libCAagent/ca_agent_bfd.h +++ b/src/ca_agent/libCAagent/ca_agent_bfd.h @@ -11,6 +11,7 @@ #ifndef CA_AGENT_BFD_H_ #define CA_AGENT_BFD_H_ +#include <config.h> #include <bfd.h> #include <map> --- a/src/ca_agent/libCAagent/libCAagent.h +++ b/src/ca_agent/libCAagent/libCAagent.h @@ -11,6 +11,7 @@ #define _LIB_CAAGENT_H #include <sys/types.h> +#include <config.h> #include <bfd.h> --- a/src/ca_agent/libCAagent/smm.h +++ b/src/ca_agent/libCAagent/smm.h @@ -10,6 +10,7 @@ #ifndef SMM_H_ #define SMM_H_ +#include <config.h> #include <bfd.h> #include "libCAagent.h" --- a/src/ca/diffgui/DasmDockView.cpp +++ b/src/ca/diffgui/DasmDockView.cpp @@ -19,6 +19,7 @@ #include <qmessagebox.h> #include "DasmDockView.h" #include "DiffDataListItem.h" +#include <config.h> #include "bfd.h" #include "DasmDataListItem.h" #include "stdafx.h" --- a/src/ca/diffgui/PropDockView.cpp +++ b/src/ca/diffgui/PropDockView.cpp @@ -18,6 +18,7 @@ #include <qmessagebox.h> #include "PropDockView.h" +#include <config.h> #include "bfd.h" #include "stdafx.h" #include <qiconset.h> --- a/src/ca/libs/libca/catranslate.cpp +++ b/src/ca/libs/libca/catranslate.cpp @@ -18,6 +18,7 @@ */ #include <sys/utsname.h> +#include <config.h> #include <bfd.h> #include <iostream> #include <iomanip> --- a/src/ca/libs/libca/symbolengine.cpp +++ b/src/ca/libs/libca/symbolengine.cpp @@ -24,6 +24,7 @@ #include <err.h> #include <unistd.h> #include <fcntl.h> +#include <config.h> #include <bfd.h> #include <elf.h> #include <libelf.h> --- a/src/ca/libs/libcabba/bbanalysis.cpp +++ b/src/ca/libs/libcabba/bbanalysis.cpp @@ -19,6 +19,7 @@ #include <err.h> #include <unistd.h> #include <fcntl.h> +#include <config.h> #include <bfd.h> #include "bbanalysis.h" ++++++ ca-support-newer-oprofile.patch ++++++ From: Tony Jones <[email protected]> Subject: support newer version of oprofile Upstream: no Passes compile only. Not runtime testing (with new versions of oprofile) has been performed. --- m4/checkoprofileconfig.m4 | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) --- a/m4/checkoprofileconfig.m4 +++ b/m4/checkoprofileconfig.m4 @@ -14,12 +14,10 @@ AC_DEFUN([CHECK_OPROFILE_VERSION], OP_VERSION_BASE=`echo $OP_VERSION | \ sed 's/\(^@<:@0-9@:>@*.@<:@0-9@:>@*.@<:@0-9@:>@*\).*/\1/'` - if test "$OP_VERSION_BASE" != "0.9.3" ; then - if test "$OP_VERSION_BASE" != "0.9.4" ; then - if test "$OP_VERSION_BASE" != "0.9.5" ; then - if test "$OP_VERSION_BASE" != "0.9.6" ; then - AC_MSG_ERROR([Oprofile version $OP_VERSION is not supported.]) - fi fi fi fi + case "$OP_VERSION_BASE" in + 0.9.[[3-8]]) :;; + *) AC_MSG_ERROR([Oprofile version $OP_VERSION is not supported.]);; + esac dnl Convert version number to a value comparable by preprocessor AC_DEFINE_UNQUOTED(OP_VERSION_BASE, 0x`echo $OP_VERSION_BASE | sed 's/\./0/g'`, [Oprofile version]) @@ -49,12 +47,10 @@ AC_DEFUN([CHECK_OPROFILE_CONFIG], OP_VERSION_BASE=`echo $OP_VERSION | \ sed 's/\(^@<:@0-9@:>@*.@<:@0-9@:>@*.@<:@0-9@:>@*\).*/\1/'` - if test "$OP_VERSION_BASE" != "0.9.3" ; then - if test "$OP_VERSION_BASE" != "0.9.4" ; then - if test "$OP_VERSION_BASE" != "0.9.5" ; then - if test "$OP_VERSION_BASE" != "0.9.6" ; then - AC_MSG_ERROR([Oprofile version $OP_VERSION is not supported.]) - fi fi fi fi + case "$OP_VERSION_BASE" in + 0.9.[[3-8]]) :;; + *) AC_MSG_ERROR([Oprofile version $OP_VERSION is not supported.]);; + esac dnl Convert version number to a value comparable by preprocessor AC_DEFINE_UNQUOTED(OP_VERSION_BASE, 0x`echo $OP_VERSION_BASE | sed 's/\./0/g'`, [Oprofile version]) -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
