diff options
Diffstat (limited to 'package/devel')
| -rw-r--r-- | package/devel/gdb/Makefile | 2 | ||||
| -rw-r--r-- | package/devel/trace-cmd/Makefile | 4 | ||||
| -rw-r--r-- | package/devel/trace-cmd/patches/100-compile_fix.patch | 10 | ||||
| -rw-r--r-- | package/devel/trace-cmd/patches/110-fix_sscanf_alloc.patch | 20 | ||||
| -rw-r--r-- | package/devel/trace-cmd/patches/110-mac80211_tracepoint.patch | 24 | ||||
| -rw-r--r-- | package/devel/valgrind/Makefile | 9 |
6 files changed, 32 insertions, 37 deletions
diff --git a/package/devel/gdb/Makefile b/package/devel/gdb/Makefile index da5dd3fab..766318891 100644 --- a/package/devel/gdb/Makefile +++ b/package/devel/gdb/Makefile @@ -23,7 +23,7 @@ include $(INCLUDE_DIR)/package.mk define Package/gdb/Default SECTION:=devel CATEGORY:=Development - DEPENDS:=@!(avr32||cris) +libthread-db +PACKAGE_zlib:zlib + DEPENDS:=@!(avr32||cris) +!USE_MUSL:libthread-db +PACKAGE_zlib:zlib URL:=http://www.gnu.org/software/gdb/ endef diff --git a/package/devel/trace-cmd/Makefile b/package/devel/trace-cmd/Makefile index 1d555db4d..5263841aa 100644 --- a/package/devel/trace-cmd/Makefile +++ b/package/devel/trace-cmd/Makefile @@ -1,13 +1,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=trace-cmd -PKG_VERSION:=v2.0.1 +PKG_VERSION:=v2.2.1 PKG_RELEASE=1 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/trace-cmd.git PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) -PKG_SOURCE_VERSION:=1776cf9a24f95b2623fe7ee380d708bb8c6d8a73 +PKG_SOURCE_VERSION:=8c10a774f1f8586cd8b0e3ce8666a376cb1d98e3 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz # PKG_MIRROR_MD5SUM:=6a08dfa2519a969d184e7bb5bb390620 PKG_INSTALL:=1 diff --git a/package/devel/trace-cmd/patches/100-compile_fix.patch b/package/devel/trace-cmd/patches/100-compile_fix.patch index 151c123b4..d0f34f93f 100644 --- a/package/devel/trace-cmd/patches/100-compile_fix.patch +++ b/package/devel/trace-cmd/patches/100-compile_fix.patch @@ -1,13 +1,3 @@ ---- a/event-utils.h -+++ b/event-utils.h -@@ -22,6 +22,7 @@ - - #include <string.h> - #include <ctype.h> -+#include <stdarg.h> - - /* Can be overridden */ - void die(const char *fmt, ...); --- a/trace-listen.c +++ b/trace-listen.c @@ -17,6 +17,7 @@ diff --git a/package/devel/trace-cmd/patches/110-fix_sscanf_alloc.patch b/package/devel/trace-cmd/patches/110-fix_sscanf_alloc.patch deleted file mode 100644 index c0af0c629..000000000 --- a/package/devel/trace-cmd/patches/110-fix_sscanf_alloc.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- a/trace-util.c -+++ b/trace-util.c -@@ -110,7 +110,7 @@ void parse_cmdlines(struct pevent *peven - - line = strtok_r(file, "\n", &next); - while (line) { -- sscanf(line, "%d %as", &pid, -+ sscanf(line, "%d %ms", &pid, - (float *)(void *)&comm); /* workaround gcc warning */ - pevent_register_comm(pevent, comm, pid); - free(comm); -@@ -133,7 +133,7 @@ void parse_proc_kallsyms(struct pevent * - line = strtok_r(file, "\n", &next); - while (line) { - mod = NULL; -- ret = sscanf(line, "%as %c %as\t[%as", -+ ret = sscanf(line, "%ms %c %ms\t[%ms", - (float *)(void *)&addr_str, /* workaround gcc warning */ - &ch, - (float *)(void *)&func, diff --git a/package/devel/trace-cmd/patches/110-mac80211_tracepoint.patch b/package/devel/trace-cmd/patches/110-mac80211_tracepoint.patch new file mode 100644 index 000000000..e2a68972a --- /dev/null +++ b/package/devel/trace-cmd/patches/110-mac80211_tracepoint.patch @@ -0,0 +1,24 @@ +--- a/plugin_mac80211.c ++++ b/plugin_mac80211.c +@@ -179,12 +179,15 @@ static int drv_config(struct trace_seq * + { 2, "IDLE" }, + { 3, "QOS"}, + ); +- pevent_print_num_field(s, " chan:%d/", event, "center_freq", record, 1); +- print_enum(s, event, "channel_type", data, +- { 0, "noht" }, +- { 1, "ht20" }, +- { 2, "ht40-" }, +- { 3, "ht40+" }); ++ pevent_print_num_field(s, " chan:%d@", event, "control_freq", record, 1); ++ print_enum(s, event, "chan_width", data, ++ { 0, "20_noht" }, ++ { 1, "20" }, ++ { 2, "40" }, ++ { 3, "80" }, ++ { 4, "80p80" }, ++ { 5, "160" }); ++ + trace_seq_putc(s, ' '); + SF("power_level"); + diff --git a/package/devel/valgrind/Makefile b/package/devel/valgrind/Makefile index dfefa0925..d17a78147 100644 --- a/package/devel/valgrind/Makefile +++ b/package/devel/valgrind/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2006-2012 OpenWrt.org +# Copyright (C) 2006-2013 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -8,17 +8,18 @@ include $(TOPDIR)/rules.mk PKG_NAME:=valgrind -PKG_VERSION:=3.8.0 +PKG_VERSION:=3.8.1 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=http://valgrind.org/downloads/ -PKG_MD5SUM:=ec04dfd1256307432b2a7b520398c526 +PKG_MD5SUM:=288758010b271119a0ffc0183f1d6e38 PKG_MAINTAINER:=Felix Fietkau <nbd@openwrt.org> PKG_FIXUP = autoreconf PKG_INSTALL := 1 +PKG_BUILD_PARALLEL := 1 include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/kernel.mk @@ -26,7 +27,7 @@ include $(INCLUDE_DIR)/kernel.mk define Package/valgrind SECTION:=devel CATEGORY:=Development - DEPENDS:=@mips||mipsel||i386||powerpc||TARGET_omap4 +libpthread +librt + DEPENDS:=@mips||mipsel||i386||powerpc||arm_v7 +libpthread +librt TITLE:=debugging and profiling tools for Linux URL:=http://www.valgrind.org endef |