Hello community, here is the log from the commit of package oprofile for openSUSE:Factory checked in at Fri Jun 12 19:54:44 CEST 2009. -------- --- oprofile/oprofile.changes 2009-03-01 17:18:02.000000000 +0100 +++ oprofile/oprofile.changes 2009-06-10 20:24:46.000000000 +0200 @@ -1,0 +2,5 @@ +Wed Jun 10 20:23:19 CEST 2009 - tonyj@suse.de + +- Fix definition clash for basename + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- oprofile-basename.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ oprofile.spec ++++++ --- /var/tmp/diff_new_pack.R25780/_old 2009-06-12 19:52:09.000000000 +0200 +++ /var/tmp/diff_new_pack.R25780/_new 2009-06-12 19:52:09.000000000 +0200 @@ -25,13 +25,14 @@ AutoReqProv: on PreReq: /usr/sbin/groupadd /usr/sbin/useradd Version: 0.9.4 -Release: 52 +Release: 53 Summary: System-Wide Profiler for Linux Systems BuildRoot: %{_tmppath}/%{name}-%{version}-build Source: %{name}-%{version}.tar.gz Source1: %{name}.desktop Source2: jvmpi.h -Patch: %{name}-%{version}.diff +Patch1: %{name}-%{version}.diff +Patch2: oprofile-basename.diff %description OProfile is a system-wide profiler for Linux systems, capable of @@ -103,7 +104,8 @@ %prep %setup -q -%patch +%patch1 +%patch2 -p1 mkdir -p java/include ln -s %_libdir/jvm/java/include/* java/include test -f java/include/jvmpi.h || ln -s %{S:2} java/include @@ -150,6 +152,8 @@ %{_libdir}/libopagent.so %changelog +* Wed Jun 10 2009 tonyj@suse.de +- Fix definition clash for basename * Sun Mar 01 2009 coolo@suse.de - fix compilation with gcc 4.4 * Thu Nov 20 2008 schwab@suse.de @@ -263,7 +267,7 @@ - Folded both automake patches into one patch * Tue Mar 11 2003 kukuk@suse.de - Don't call depmod -* Mon Mar 10 2003 ro@suse.de +* Tue Mar 11 2003 ro@suse.de - remove k_deflt from neededforbuild (cycle) * Mon Mar 10 2003 mmj@suse.de - Fix typo ++++++ oprofile-basename.diff ++++++ From: Tony Jones <tonyj@suse.de> Subject: Include libgen.h Upstream: yes Include libgen.h. This forces C++ to use xpg definition of basename which matches what libiberty expects (default is ISO C++ version in string.h) Otherwise build fails with: /usr/include/libiberty.h:105: error: new declaration char* basename(const char*) /usr/include/string.h:599: error: ambiguates old declaration const char* basename(const char*) --- oprofile-0.9.4/configure.in.orig 2009-04-08 13:43:42.000000000 -0400 +++ oprofile-0.9.4/configure.in 2009-04-08 13:43:45.000000000 -0400 @@ -15,6 +15,7 @@ AC_INIT(libop/op_config.h) AM_INIT_AUTOMAKE(oprofile, 0.9.4) AM_CONFIG_HEADER(config.h) +AC_CHECK_DECLS([basename], [], [], [[#include <libgen.h>]]) AC_PROG_RANLIB AC_PROG_LIBTOOL ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org