diff --git a/ltrace-0.5-o.patch b/ltrace-0.5-o.patch new file mode 100644 index 0000000..dadf75d --- /dev/null +++ b/ltrace-0.5-o.patch @@ -0,0 +1,59 @@ +Only in ltrace-0.5-dasho/: config.h +Only in ltrace-0.5-dasho/: config.log +Only in ltrace-0.5-dasho/: config.status +Only in ltrace-0.5-dasho/: Makefile +diff -ur ltrace-0.5/summary.c ltrace-0.5-dasho/summary.c +--- ltrace-0.5/summary.c 2006-04-24 12:14:01.000000000 -0400 ++++ ltrace-0.5-dasho/summary.c 2008-05-19 15:22:13.000000000 -0400 +@@ -68,16 +68,17 @@ + + qsort(entries, num_entries, sizeof(*entries), compar); + +- printf("%% time seconds usecs/call calls function\n"); +- printf +- ("------ ----------- ----------- --------- --------------------\n"); ++ fprintf(output, ++ "%% time seconds usecs/call calls function\n"); ++ fprintf(output, ++ "------ ----------- ----------- --------- --------------------\n"); + for (i = 0; i < num_entries; i++) { + unsigned long long int c; + unsigned long long int p; + c = 1000000 * (int)entries[i].tv.tv_sec + + (int)entries[i].tv.tv_usec; + p = 100000 * c / tot_usecs + 5; +- printf("%3lu.%02lu %4d.%06d %11lu %9d %s\n", ++ fprintf(output, "%3lu.%02lu %4d.%06d %11lu %9d %s\n", + (unsigned long int)(p / 1000), + (unsigned long int)((p / 10) % 100), + (int)entries[i].tv.tv_sec, (int)entries[i].tv.tv_usec, +@@ -85,8 +86,8 @@ + entries[i].count, + opt_C ? my_demangle(entries[i].name) : entries[i].name); + } +- printf +- ("------ ----------- ----------- --------- --------------------\n"); +- printf("100.00 %4lu.%06lu %9d total\n", tot_usecs / 1000000, +- tot_usecs % 1000000, tot_count); ++ fprintf(output, ++ "------ ----------- ----------- --------- --------------------\n"); ++ fprintf(output, "100.00 %4lu.%06lu %9d total\n", ++ tot_usecs / 1000000, tot_usecs % 1000000, tot_count); + } +Only in ltrace-0.5-dasho/: summary.c~ +Only in ltrace-0.5-dasho/sysdeps/linux-gnu: arch_syscallent.h +Only in ltrace-0.5-dasho/sysdeps/linux-gnu: breakpoint.o +Only in ltrace-0.5-dasho/sysdeps/linux-gnu: os.o +Only in ltrace-0.5-dasho/sysdeps/linux-gnu: proc.o +Only in ltrace-0.5-dasho/sysdeps/linux-gnu: signalent1.h +Only in ltrace-0.5-dasho/sysdeps/linux-gnu: signalent.h +Only in ltrace-0.5-dasho/sysdeps/linux-gnu: syscallent1.h +Only in ltrace-0.5-dasho/sysdeps/linux-gnu: syscallent.h +Only in ltrace-0.5-dasho/sysdeps/linux-gnu: sysdep.h +Only in ltrace-0.5-dasho/sysdeps/linux-gnu: trace.o +Only in ltrace-0.5-dasho/sysdeps/linux-gnu/x86_64: regs.o +Only in ltrace-0.5-dasho/sysdeps/linux-gnu/x86_64: trace.o +Only in ltrace-0.5-dasho/testsuite/ltrace.main: Makefile +Only in ltrace-0.5-dasho/testsuite/ltrace.minor: Makefile +Only in ltrace-0.5-dasho/testsuite/ltrace.torture: Makefile +Only in ltrace-0.5-dasho/testsuite: Makefile diff --git a/ltrace.spec b/ltrace.spec index 1d843d7..74e0d1d 100644 --- a/ltrace.spec +++ b/ltrace.spec @@ -1,7 +1,7 @@ Summary: Tracks runtime library calls from dynamically linked executables Name: ltrace Version: 0.5 -Release: 10.45svn%{?dist} +Release: 11.45svn%{?dist} URL: http://ltrace.alioth.debian.org/ License: GPLv2+ Group: Development/Debuggers @@ -29,6 +29,7 @@ Patch11: ltrace-0.5-exec-tests.patch Patch12: ltrace-0.5-man.patch Patch13: ltrace-0.5-ia64-sigill.patch Patch14: ltrace-0.5-build.patch +Patch15: ltrace-0.5-o.patch %description Ltrace is a debugging program which runs a specified command until the @@ -57,12 +58,13 @@ execution of processes. %patch12 -p1 %patch13 -p1 %patch14 -p1 +%patch15 -p1 sed -i -e 's/-o root -g root//' Makefile.in %build # This ugly hack is necessary to build and link files for correct # architecture. It makes a difference on ppc. -export CC="gcc`echo $RPM_OPT_FLAGS | sed -n 's/^.*\(-m[36][124]\).*$/ \1/p'`" +export CC="gcc`echo $RPM_OPT_FLAGS | sed -n 's/^.*\(-m[36][124]\).*$/ \1/p'` -D_LARGEFILE64_SOURCE" %configure CC="$CC" make %{?_smp_mflags} @@ -88,6 +90,11 @@ rm -rf $RPM_BUILD_ROOT %config(noreplace) %{_sysconfdir}/ltrace.conf %changelog +* Fri May 23 2008 Petr Machata - 0.5-11.45svn +- Patch from James M. Leddy, fixes interaction of -c and -o +- Fix compilation by using -D_LARGEFILE64_SOURCE +- related: #447404 + * Tue Feb 19 2008 Fedora Release Engineering - 0.5-10.45svn - Autorebuild for GCC 4.3