From 22e24d73762b2cfc79797f94d9e2d9e3f070c418 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Mon, 4 Nov 2013 13:51:33 +0100 Subject: resolve merge conflict --- package/oprofile/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'package/oprofile') diff --git a/package/oprofile/Makefile b/package/oprofile/Makefile index e7ed35b74..e2f5edca9 100644 --- a/package/oprofile/Makefile +++ b/package/oprofile/Makefile @@ -4,9 +4,9 @@ include $(TOPDIR)/rules.mk PKG_NAME:= oprofile -PKG_VERSION:= 0.9.8 +PKG_VERSION:= 0.9.9 PKG_RELEASE:= 1 -PKG_MD5SUM:= 6d127023af1dd1cf24e15411229f3cc8 +PKG_MD5SUM:= 00aec1287da2dfffda17a9b1c0a01868 PKG_DESCR:= system-wide profiles PKG_SECTION:= debug PKG_DEPENDS:= libpopt kmod-oprofile libbfd libstdcxx -- cgit v1.2.3 From 4bef9a612a73c5b18bad38c1ef4ae4924c719ecc Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Tue, 5 Nov 2013 21:23:33 +0100 Subject: fix uclibc compile, patch from upstream --- package/oprofile/Makefile | 2 +- .../patches/patch-daemon_liblegacy_opd_kernel_c | 34 ---------------------- 2 files changed, 1 insertion(+), 35 deletions(-) delete mode 100644 package/oprofile/patches/patch-daemon_liblegacy_opd_kernel_c (limited to 'package/oprofile') diff --git a/package/oprofile/Makefile b/package/oprofile/Makefile index e2f5edca9..d21f0a635 100644 --- a/package/oprofile/Makefile +++ b/package/oprofile/Makefile @@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:= oprofile PKG_VERSION:= 0.9.9 -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_MD5SUM:= 00aec1287da2dfffda17a9b1c0a01868 PKG_DESCR:= system-wide profiles PKG_SECTION:= debug diff --git a/package/oprofile/patches/patch-daemon_liblegacy_opd_kernel_c b/package/oprofile/patches/patch-daemon_liblegacy_opd_kernel_c deleted file mode 100644 index 226522e40..000000000 --- a/package/oprofile/patches/patch-daemon_liblegacy_opd_kernel_c +++ /dev/null @@ -1,34 +0,0 @@ ---- oprofile-0.9.6.orig/daemon/liblegacy/opd_kernel.c 2009-11-24 16:25:17.000000000 +0100 -+++ oprofile-0.9.6/daemon/liblegacy/opd_kernel.c 2010-07-13 18:20:26.727084854 +0200 -@@ -148,6 +148,7 @@ void opd_clear_module_info(void) - */ - static void opd_get_module_info(void) - { -+#if 0 - char * line; - char * cp, * cp2, * cp3; - FILE * fp; -@@ -252,6 +253,7 @@ static void opd_get_module_info(void) - if (line) - free(line); - op_close_file(fp); -+#endif - } - - -@@ -270,6 +272,7 @@ static void opd_get_module_info(void) - */ - static void opd_drop_module_sample(unsigned long eip) - { -+#if 0 - char * module_names; - char * name; - size_t size = 1024; -@@ -307,6 +310,7 @@ static void opd_drop_module_sample(unsig - - if (module_names) - free(module_names); -+#endif - } - - -- cgit v1.2.3 From e82d685f38adbc0e50cf47cd0e4893c2e6633d83 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Wed, 6 Nov 2013 21:21:28 +0100 Subject: forgot to add patches dir --- package/oprofile/Makefile | 4 +-- package/oprofile/patches/patch-libop_op_cpu_type_c | 42 ++++++++++++++++++++++ 2 files changed, 44 insertions(+), 2 deletions(-) create mode 100644 package/oprofile/patches/patch-libop_op_cpu_type_c (limited to 'package/oprofile') diff --git a/package/oprofile/Makefile b/package/oprofile/Makefile index d21f0a635..2128a14e7 100644 --- a/package/oprofile/Makefile +++ b/package/oprofile/Makefile @@ -5,11 +5,11 @@ include $(TOPDIR)/rules.mk PKG_NAME:= oprofile PKG_VERSION:= 0.9.9 -PKG_RELEASE:= 2 +PKG_RELEASE:= 3 PKG_MD5SUM:= 00aec1287da2dfffda17a9b1c0a01868 PKG_DESCR:= system-wide profiles PKG_SECTION:= debug -PKG_DEPENDS:= libpopt kmod-oprofile libbfd libstdcxx +PKG_DEPENDS:= libpopt kmod-oprofile libbfd libstdcxx libgcc PKG_BUILDDEP:= popt binutils PKG_URL:= http://oprofile.sourceforge.net/ PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=oprofile/} diff --git a/package/oprofile/patches/patch-libop_op_cpu_type_c b/package/oprofile/patches/patch-libop_op_cpu_type_c new file mode 100644 index 000000000..6064fc5e7 --- /dev/null +++ b/package/oprofile/patches/patch-libop_op_cpu_type_c @@ -0,0 +1,42 @@ +--- oprofile-0.9.9.orig/libop/op_cpu_type.c 2013-07-29 17:55:07.000000000 +0200 ++++ oprofile-0.9.9/libop/op_cpu_type.c 2013-11-05 20:55:54.000000000 +0100 +@@ -23,9 +23,17 @@ + #include + #include + ++#include "config.h" + #include "op_cpu_type.h" + #include "op_hw_specific.h" + ++ ++/* A macro to be used for ppc64 architecture-specific code. The '__powerpc__' macro ++ * is defined for both ppc64 and ppc32 architectures, so we must further qualify by ++ * including the 'HAVE_LIBPFM' macro, since that macro will be defined only for ppc64. ++ */ ++#define PPC64_ARCH (HAVE_LIBPFM) && ((defined(__powerpc__) || defined(__powerpc64__))) ++ + struct cpu_descr { + char const * pretty; + char const * name; +@@ -176,6 +184,7 @@ static char * _get_cpuinfo_cpu_type(char + return _get_cpuinfo_cpu_type_line(buf, len, prefix, 1); + } + ++#if PPC64_ARCH + // The aux vector stuff below is currently only used by ppc64 arch + static ElfW(auxv_t) * auxv_buf = NULL; + +@@ -313,6 +322,13 @@ static op_cpu _get_ppc64_cpu_type(void) + return cpu_type; + } + ++#else ++static op_cpu _get_ppc64_cpu_type(void) ++{ ++ return CPU_NO_GOOD; ++} ++#endif ++ + static op_cpu _get_arm_cpu_type(void) + { + unsigned long cpuid, vendorid; -- cgit v1.2.3 From c7ad18d922ef28e547806027a3325c99fb974c00 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Wed, 6 Nov 2013 21:30:49 +0100 Subject: add -lpthread --- package/oprofile/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'package/oprofile') diff --git a/package/oprofile/Makefile b/package/oprofile/Makefile index 2128a14e7..63724cbdb 100644 --- a/package/oprofile/Makefile +++ b/package/oprofile/Makefile @@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:= oprofile PKG_VERSION:= 0.9.9 -PKG_RELEASE:= 3 +PKG_RELEASE:= 4 PKG_MD5SUM:= 00aec1287da2dfffda17a9b1c0a01868 PKG_DESCR:= system-wide profiles PKG_SECTION:= debug @@ -22,6 +22,7 @@ include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,OPROFILE,oprofile,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +TARGET_LDFLAGS+= -lpthread CONFIGURE_ARGS+= --with-kernel-support oprofile-install: -- cgit v1.2.3