From ff449c57c586916e689eaa4be27a84942cef884b Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 25 May 2014 09:58:14 +0200 Subject: update and fix build --- package/ltrace/Makefile | 12 ++++++---- package/ltrace/patches/patch-breakpoints_c | 14 ----------- package/ltrace/patches/patch-breakpoints_c.orig | 14 ----------- package/ltrace/patches/patch-dwarf_prototypes_h | 11 +++++++++ package/ltrace/patches/patch-handle_event_c | 19 --------------- package/ltrace/patches/patch-proc_c | 32 ------------------------- 6 files changed, 19 insertions(+), 83 deletions(-) delete mode 100644 package/ltrace/patches/patch-breakpoints_c delete mode 100644 package/ltrace/patches/patch-breakpoints_c.orig create mode 100644 package/ltrace/patches/patch-dwarf_prototypes_h delete mode 100644 package/ltrace/patches/patch-handle_event_c delete mode 100644 package/ltrace/patches/patch-proc_c (limited to 'package/ltrace') diff --git a/package/ltrace/Makefile b/package/ltrace/Makefile index a8464d55a..e271ea969 100644 --- a/package/ltrace/Makefile +++ b/package/ltrace/Makefile @@ -4,20 +4,24 @@ include $(TOPDIR)/rules.mk PKG_NAME:= ltrace -PKG_VERSION:= 0.7.3 +PKG_VERSION:= 0.7.4 +# git from 24.05.2014 PKG_RELEASE:= 1 -PKG_MD5SUM:= 2cb7660738b1e28fd84ce0dc06f6ea69 +PKG_MD5SUM:= 266580175adba8cbb02b6b792d9f05f5 PKG_DESCR:= intercepts and records dynamic library calls PKG_SECTION:= debug PKG_DEPENDS:= libelf -PKG_BUILDDEP:= libelf +PKG_BUILDDEP:= autotool libelf PKG_URL:= http://ltrace.org/ -PKG_SITES:= https://alioth.debian.org/frs/download.php/file/3948/ +PKG_SITES:= http://openadk.org/distfiles/ include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,LTRACE,ltrace,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +AUTOTOOL_STYLE:= autoreconf +CONFIGURE_ARGS+= --disable-werror + ltrace-install: $(INSTALL_DIR) $(IDIR_LTRACE)/usr/sbin $(INSTALL_BIN) $(WRKINST)/usr/bin/ltrace \ diff --git a/package/ltrace/patches/patch-breakpoints_c b/package/ltrace/patches/patch-breakpoints_c deleted file mode 100644 index 0c8d77c8b..000000000 --- a/package/ltrace/patches/patch-breakpoints_c +++ /dev/null @@ -1,14 +0,0 @@ ---- ltrace-0.7.3.orig/breakpoints.c 2013-09-09 11:46:54.000000000 +0200 -+++ ltrace-0.7.3/breakpoints.c 2013-10-16 11:26:00.000000000 +0200 -@@ -159,9 +159,10 @@ int - breakpoint_clone(struct breakpoint *retp, struct Process *new_proc, - struct breakpoint *bp, struct Process *old_proc) - { -+ __attribute__((unused))int rc; - struct library_symbol *libsym = NULL; - if (bp->libsym != NULL) { -- int rc = proc_find_symbol(new_proc, bp->libsym, NULL, &libsym); -+ rc = proc_find_symbol(new_proc, bp->libsym, NULL, &libsym); - assert(rc == 0); - } - diff --git a/package/ltrace/patches/patch-breakpoints_c.orig b/package/ltrace/patches/patch-breakpoints_c.orig deleted file mode 100644 index 6c69f0d34..000000000 --- a/package/ltrace/patches/patch-breakpoints_c.orig +++ /dev/null @@ -1,14 +0,0 @@ ---- ltrace-0.7.3.orig/breakpoints.c 2013-09-09 11:46:54.000000000 +0200 -+++ ltrace-0.7.3/breakpoints.c 2013-10-16 11:13:21.000000000 +0200 -@@ -159,9 +159,10 @@ int - breakpoint_clone(struct breakpoint *retp, struct Process *new_proc, - struct breakpoint *bp, struct Process *old_proc) - { -+ int rc; - struct library_symbol *libsym = NULL; - if (bp->libsym != NULL) { -- int rc = proc_find_symbol(new_proc, bp->libsym, NULL, &libsym); -+ rc = proc_find_symbol(new_proc, bp->libsym, NULL, &libsym); - assert(rc == 0); - } - diff --git a/package/ltrace/patches/patch-dwarf_prototypes_h b/package/ltrace/patches/patch-dwarf_prototypes_h new file mode 100644 index 000000000..f6f5a19c2 --- /dev/null +++ b/package/ltrace/patches/patch-dwarf_prototypes_h @@ -0,0 +1,11 @@ +--- ltrace-0.7.4.orig/dwarf_prototypes.h 2014-05-24 21:16:56.000000000 +0200 ++++ ltrace-0.7.4/dwarf_prototypes.h 2014-05-25 09:20:51.081105735 +0200 +@@ -1,8 +1,6 @@ + #pragma once + + #include +-#include +- + #include "prototype.h" + #include "library.h" + diff --git a/package/ltrace/patches/patch-handle_event_c b/package/ltrace/patches/patch-handle_event_c deleted file mode 100644 index c40853052..000000000 --- a/package/ltrace/patches/patch-handle_event_c +++ /dev/null @@ -1,19 +0,0 @@ ---- ltrace-0.7.3.orig/handle_event.c 2013-02-05 12:05:39.000000000 +0100 -+++ ltrace-0.7.3/handle_event.c 2013-10-16 11:29:03.000000000 +0200 -@@ -533,6 +533,7 @@ calc_time_spent(Process *proc) { - - static void - handle_sysret(Event *event) { -+ __attribute__((unused))unsigned d; - debug(DEBUG_FUNCTION, "handle_sysret(pid=%d, sysnum=%d)", event->proc->pid, event->e_un.sysnum); - if (event->proc->state != STATE_IGNORED) { - if (opt_T || options.summary) { -@@ -544,7 +545,7 @@ handle_sysret(Event *event) { - event->e_un.sysnum)); - - assert(event->proc->callstack_depth > 0); -- unsigned d = event->proc->callstack_depth - 1; -+ d = event->proc->callstack_depth - 1; - assert(event->proc->callstack[d].is_syscall); - callstack_pop(event->proc); - } diff --git a/package/ltrace/patches/patch-proc_c b/package/ltrace/patches/patch-proc_c deleted file mode 100644 index 5571a51c3..000000000 --- a/package/ltrace/patches/patch-proc_c +++ /dev/null @@ -1,32 +0,0 @@ ---- ltrace-0.7.3.orig/proc.c 2013-02-05 12:05:39.000000000 +0100 -+++ ltrace-0.7.3/proc.c 2013-10-16 11:37:49.000000000 +0200 -@@ -329,6 +329,7 @@ clone_single_bp(void *key, void *value, - int - process_clone(struct Process *retp, struct Process *proc, pid_t pid) - { -+ __attribute__((unused))int rc; - if (process_bare_init(retp, proc->filename, pid, 0) < 0) { - fail1: - fprintf(stderr, "failed to clone process %d->%d : %s\n", -@@ -432,7 +433,7 @@ process_clone(struct Process *retp, stru - * library. */ - if (!elem->is_syscall && elem->c_un.libfunc != NULL) { - struct library_symbol *libfunc = elem->c_un.libfunc; -- int rc = proc_find_symbol(retp, libfunc, -+ rc = proc_find_symbol(retp, libfunc, - NULL, &elem->c_un.libfunc); - assert(rc == 0); - } -@@ -937,10 +938,11 @@ proc_add_breakpoint(struct Process *proc - void - proc_remove_breakpoint(struct Process *proc, struct breakpoint *bp) - { -+ __attribute__((unused))struct breakpoint *removed; - debug(DEBUG_FUNCTION, "proc_remove_breakpoint(pid=%d, %s@%p)", - proc->pid, breakpoint_name(bp), bp->addr); - check_leader(proc); -- struct breakpoint *removed = dict_remove(proc->breakpoints, bp->addr); -+ removed = dict_remove(proc->breakpoints, bp->addr); - assert(removed == bp); - } - -- cgit v1.2.3