diff options
Diffstat (limited to 'package/oprofile')
| -rw-r--r-- | package/oprofile/Makefile | 25 | ||||
| -rw-r--r-- | package/oprofile/patches/patch-libop_op_cpu_type_c | 42 |
2 files changed, 17 insertions, 50 deletions
diff --git a/package/oprofile/Makefile b/package/oprofile/Makefile index e217a2606..c4da8d426 100644 --- a/package/oprofile/Makefile +++ b/package/oprofile/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= oprofile -PKG_VERSION:= 0.9.9 -PKG_RELEASE:= 4 -PKG_HASH:= 1e523400daaba7b8d0d15269e977a08b40edfea53970774b69ae130e25117597 +PKG_VERSION:= 1.0.0 +PKG_RELEASE:= 1 +PKG_HASH:= 847110b4ecdcf8c8353cd38f94c1b704aad4bfcd9453e38b88d112cfb7e3c45a PKG_DESCR:= system-wide profiles PKG_SECTION:= app/debug PKG_DEPENDS:= libpopt libbfd libstdcxx @@ -30,11 +30,20 @@ CONFIGURE_ARGS+= --with-binutils-libname=binutils \ --with-binutils=${STAGING_TARGET_DIR}/usr/lib oprofile-install: - $(INSTALL_DIR) $(IDIR_OPROFILE)/usr/{bin,share} - $(INSTALL_BIN) $(WRKINST)/usr/bin/opcontrol $(IDIR_OPROFILE)/usr/bin/ - $(INSTALL_BIN) $(WRKINST)/usr/bin/ophelp $(IDIR_OPROFILE)/usr/bin/ - $(INSTALL_BIN) $(WRKINST)/usr/bin/opreport $(IDIR_OPROFILE)/usr/bin/ - $(INSTALL_BIN) $(WRKINST)/usr/bin/oprofiled $(IDIR_OPROFILE)/usr/bin/ + $(INSTALL_DIR) $(IDIR_OPROFILE)/usr/{bin,lib/oprofile,share} + $(INSTALL_BIN) $(WRKINST)/usr/bin/ocount \ + $(WRKINST)/usr/bin/opannotate \ + $(WRKINST)/usr/bin/oparchive \ + $(WRKINST)/usr/bin/op-check-perfevents \ + $(WRKINST)/usr/bin/operf \ + $(WRKINST)/usr/bin/opgprof \ + $(WRKINST)/usr/bin/ophelp \ + $(WRKINST)/usr/bin/opimport \ + $(WRKINST)/usr/bin/opjitconv \ + $(WRKINST)/usr/bin/opreport \ + $(IDIR_OPROFILE)/usr/bin/ ${CP} ${WRKINST}/usr/share/oprofile ${IDIR_OPROFILE}/usr/share/ + ${CP} ${WRKINST}/usr/lib/oprofile/libopagent.so* \ + ${IDIR_OPROFILE}/usr/lib/oprofile include ${ADK_TOPDIR}/mk/pkg-bottom.mk diff --git a/package/oprofile/patches/patch-libop_op_cpu_type_c b/package/oprofile/patches/patch-libop_op_cpu_type_c deleted file mode 100644 index 6064fc5e7..000000000 --- a/package/oprofile/patches/patch-libop_op_cpu_type_c +++ /dev/null @@ -1,42 +0,0 @@ ---- 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 <elf.h> - #include <link.h> - -+#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; |