[gentoo-commits] repo/proj/guru:master commit in: sys-cluster/paraver-kernel/files/, sys-cluster/paraver-kernel/

2022-06-08 Thread Florian Schmaus 
commit: 90d89803d97f4d40c3cce629143edfc009a05213
Author: Alessandro Barbieri  gmail  com>
AuthorDate: Tue Jun  7 17:41:31 2022 +
Commit: Florian Schmaus  gentoo  org>
CommitDate: Tue Jun  7 17:43:22 2022 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=90d89803

sys-cluster/paraver-kernel: link libxml2

Signed-off-by: Alessandro Barbieri  gmail.com>

 ...araver-kernel-4.10.1-unbundle-libbsctools.patch | 60 +-
 ...10.1.ebuild => paraver-kernel-4.10.1-r1.ebuild} |  5 +-
 2 files changed, 28 insertions(+), 37 deletions(-)

diff --git 
a/sys-cluster/paraver-kernel/files/paraver-kernel-4.10.1-unbundle-libbsctools.patch
 
b/sys-cluster/paraver-kernel/files/paraver-kernel-4.10.1-unbundle-libbsctools.patch
index c54e943fb..3895473e6 100644
--- 
a/sys-cluster/paraver-kernel/files/paraver-kernel-4.10.1-unbundle-libbsctools.patch
+++ 
b/sys-cluster/paraver-kernel/files/paraver-kernel-4.10.1-unbundle-libbsctools.patch
@@ -1,6 +1,5 @@
-diff -ru 
/var/tmp/portage/sys-cluster/paraver-kernel-4.10.1/work/paraver-kernel-4.10.1/api/eventlabels.h
 paraver-kernel-4.10.1/api/eventlabels.h
 
/var/tmp/portage/sys-cluster/paraver-kernel-4.10.1/work/paraver-kernel-4.10.1/api/eventlabels.h
2022-05-30 11:36:33.0 +0200
-+++ paraver-kernel-4.10.1/api/eventlabels.h2022-06-07 16:52:15.526426696 
+0200
+--- a/api/eventlabels.h
 b/api/eventlabels.h
 @@ -32,7 +32,7 @@
  #ifdef OLD_PCFPARSER
  #include "utils/pcfparser/old/ParaverTraceConfig.h"
@@ -10,9 +9,8 @@ diff -ru 
/var/tmp/portage/sys-cluster/paraver-kernel-4.10.1/work/paraver-kernel-
  #endif
  
  using namespace libparaver;
-diff -ru 
/var/tmp/portage/sys-cluster/paraver-kernel-4.10.1/work/paraver-kernel-4.10.1/api/Makefile.am
 paraver-kernel-4.10.1/api/Makefile.am
 
/var/tmp/portage/sys-cluster/paraver-kernel-4.10.1/work/paraver-kernel-4.10.1/api/Makefile.am
  2022-05-30 11:36:33.0 +0200
-+++ paraver-kernel-4.10.1/api/Makefile.am  2022-06-07 17:07:09.261765112 
+0200
+--- a/api/Makefile.am
 b/api/Makefile.am
 @@ -1,20 +1,6 @@
  
  pkglib_LTLIBRARIES = libparaver-api.la
@@ -71,9 +69,8 @@ diff -ru 
/var/tmp/portage/sys-cluster/paraver-kernel-4.10.1/work/paraver-kernel-
  
  
  # Erases everything which should not be uploaded to CVS
-diff -ru 
/var/tmp/portage/sys-cluster/paraver-kernel-4.10.1/work/paraver-kernel-4.10.1/api/paramedir.cpp
 paraver-kernel-4.10.1/api/paramedir.cpp
 
/var/tmp/portage/sys-cluster/paraver-kernel-4.10.1/work/paraver-kernel-4.10.1/api/paramedir.cpp
2022-05-30 11:36:33.0 +0200
-+++ paraver-kernel-4.10.1/api/paramedir.cpp2022-06-07 16:55:57.063567741 
+0200
+--- a/api/paramedir.cpp
 b/api/paramedir.cpp
 @@ -57,7 +57,7 @@
  #ifdef OLD_PCFPARSER
  #include "utils/pcfparser/old/ParaverTraceConfig.h"
@@ -83,9 +80,8 @@ diff -ru 
/var/tmp/portage/sys-cluster/paraver-kernel-4.10.1/work/paraver-kernel-
  #endif
  
  // PARAMEDIR OPTIONS
-diff -ru 
/var/tmp/portage/sys-cluster/paraver-kernel-4.10.1/work/paraver-kernel-4.10.1/api/statelabels.h
 paraver-kernel-4.10.1/api/statelabels.h
 
/var/tmp/portage/sys-cluster/paraver-kernel-4.10.1/work/paraver-kernel-4.10.1/api/statelabels.h
2022-05-30 11:36:33.0 +0200
-+++ paraver-kernel-4.10.1/api/statelabels.h2022-06-07 16:56:27.090733938 
+0200
+--- a/api/statelabels.h
 b/api/statelabels.h
 @@ -31,7 +31,7 @@
  #ifdef OLD_PCFPARSER
  #include "utils/pcfparser/old/ParaverTraceConfig.h"
@@ -95,9 +91,8 @@ diff -ru 
/var/tmp/portage/sys-cluster/paraver-kernel-4.10.1/work/paraver-kernel-
  #endif
  
  using namespace libparaver;
-diff -ru 
/var/tmp/portage/sys-cluster/paraver-kernel-4.10.1/work/paraver-kernel-4.10.1/api/trace.cpp
 paraver-kernel-4.10.1/api/trace.cpp
 
/var/tmp/portage/sys-cluster/paraver-kernel-4.10.1/work/paraver-kernel-4.10.1/api/trace.cpp
2022-05-30 11:36:33.0 +0200
-+++ paraver-kernel-4.10.1/api/trace.cpp2022-06-07 16:56:49.155856065 
+0200
+--- a/api/trace.cpp
 b/api/trace.cpp
 @@ -29,7 +29,7 @@
  #include "utils/pcfparser/old/ParaverStatesColor.h"
  #include "utils/pcfparser/old/ParaverGradientColor.h"
@@ -107,9 +102,8 @@ diff -ru 
/var/tmp/portage/sys-cluster/paraver-kernel-4.10.1/work/paraver-kernel-
  #endif
  
  #include "progresscontroller.h"
-diff -ru 
/var/tmp/portage/sys-cluster/paraver-kernel-4.10.1/work/paraver-kernel-4.10.1/api/tracecutter.cpp
 paraver-kernel-4.10.1/api/tracecutter.cpp
 
/var/tmp/portage/sys-cluster/paraver-kernel-4.10.1/work/paraver-kernel-4.10.1/api/tracecutter.cpp
  2022-05-30 11:36:33.0 +0200
-+++ paraver-kernel-4.10.1/api/tracecutter.cpp  2022-06-07 16:57:09.200968638 
+0200
+--- a/api/tracecutter.cpp
 b/api/tracecutter.cpp
 @@ -31,7 +31,7 @@
  #ifdef OLD_PCFPARSER
  #include "utils/pcfparser/old/ParaverTraceConfig.h"
@@ -119,9 +113,8 @@ diff -ru 
/var/tmp/portage/sys-cluster/paraver-kernel-4.10.1/work/paraver-kernel-
  #endif
  
  using namespace libparaver;
-diff -ru

[gentoo-commits] repo/proj/guru:master commit in: sys-cluster/paraver-kernel/files/, sys-cluster/paraver-kernel/

2021-08-20 Thread Florian Schmaus 
commit: 083107b1546a15db147df96697e5f954a16a920d
Author: Alessandro Barbieri  gmail  com>
AuthorDate: Wed Aug 18 00:37:17 2021 +
Commit: Florian Schmaus  gentoo  org>
CommitDate: Wed Aug 18 02:22:46 2021 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=083107b1

sys-cluster/paraver-kernel: initial import

Signed-off-by: Alessandro Barbieri  gmail.com>

 sys-cluster/paraver-kernel/Manifest|   1 +
 ...kernel-4.9.0-fix-gcc-11-compilation-error.patch |  20 ++
 .../paraver-kernel-unbundle-libbsctools.patch  | 264 +
 sys-cluster/paraver-kernel/metadata.xml|  19 ++
 .../paraver-kernel/paraver-kernel-4.9.0.ebuild |  75 ++
 5 files changed, 379 insertions(+)

diff --git a/sys-cluster/paraver-kernel/Manifest 
b/sys-cluster/paraver-kernel/Manifest
new file mode 100644
index 0..db4733fe4
--- /dev/null
+++ b/sys-cluster/paraver-kernel/Manifest
@@ -0,0 +1 @@
+DIST paraver-kernel-4.9.0.tar.gz 2144621 BLAKE2B 
93cb6a751462ff0f39261e89fba11664ac07ff20f557e41a899cf958fa5bc7751bca5fc7d1bb3c734cb3ba60e84e7c113ed86641e985a807814b0be039a943ac
 SHA512 
efd781c2288e4b7ce847d6010fd79b83c9db32f5f9b4696009feaa56558aa1f20f86955e920dec6a6355377fe4cf09f9ed23caa55e63596dc0ebb289933cc149

diff --git 
a/sys-cluster/paraver-kernel/files/paraver-kernel-4.9.0-fix-gcc-11-compilation-error.patch
 
b/sys-cluster/paraver-kernel/files/paraver-kernel-4.9.0-fix-gcc-11-compilation-error.patch
new file mode 100644
index 0..a007d1b35
--- /dev/null
+++ 
b/sys-cluster/paraver-kernel/files/paraver-kernel-4.9.0-fix-gcc-11-compilation-error.patch
@@ -0,0 +1,20 @@
+From 6ed43d980aba622e27402efdaaf32591fcb72b02 Mon Sep 17 00:00:00 2001
+From: Eloy Martinez 
+Date: Wed, 30 Jun 2021 11:27:15 +0200
+Subject: [PATCH] Fixed GCC 11 compilation error
+
+---
+ api/recordlist.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/api/recordlist.h
 b/api/recordlist.h
+@@ -142,7 +142,7 @@ struct RLRecord
+ // r1 is less than r2?
+ struct ltrecord
+ {
+-  bool operator()( const RLRecord& r1, const RLRecord& r2 )
++  bool operator()( const RLRecord& r1, const RLRecord& r2 ) const
+   {
+ if ( r1.getTime() < r2.getTime() )
+   return true;

diff --git 
a/sys-cluster/paraver-kernel/files/paraver-kernel-unbundle-libbsctools.patch 
b/sys-cluster/paraver-kernel/files/paraver-kernel-unbundle-libbsctools.patch
new file mode 100644
index 0..f760dd06a
--- /dev/null
+++ b/sys-cluster/paraver-kernel/files/paraver-kernel-unbundle-libbsctools.patch
@@ -0,0 +1,264 @@
+--- a/api/eventlabels.cpp
 b/api/eventlabels.cpp
+@@ -24,11 +24,6 @@
+ 
+ #include "eventlabels.h"
+ 
+-#ifdef OLD_PCFPARSER
+-#include "utils/pcfparser/old/ParaverEventType.h"
+-#include "utils/pcfparser/old/ParaverEventValue.h"
+-#endif
+-
+ using namespace std;
+ 
+ const string EventLabels::unknownLabel = "Unknown";
+--- a/api/eventlabels.h
 b/api/eventlabels.h
+@@ -29,11 +29,7 @@
+ #include 
+ #include "paraverkerneltypes.h"
+ 
+-#ifdef OLD_PCFPARSER
+-#include "utils/pcfparser/old/ParaverTraceConfig.h"
+-#else
+-#include "utils/pcfparser/UIParaverTraceConfig.h"
+-#endif
++#include "UIParaverTraceConfig.h"
+ 
+ using namespace libparaver;
+ 
+--- a/api/Makefile.am
 b/api/Makefile.am
+@@ -1,22 +1,7 @@
+-
+ pkglib_LTLIBRARIES = libparaver-api.la
+ 
+-
+-if MAKE_OLD_PCFPARSER
+-  PCFPARSER_FILES=  ../utils/pcfparser/old/LibException.cpp \
+-../utils/pcfparser/old/ParaverEventType.cpp \
+-../utils/pcfparser/old/ParaverEventValue.cpp \
+-../utils/pcfparser/old/ParaverGradientColor.cpp \
+-../utils/pcfparser/old/ParaverGradientNames.cpp \
+-../utils/pcfparser/old/ParaverState.cpp \
+-../utils/pcfparser/old/ParaverStatesColor.cpp \
+-../utils/pcfparser/old/ParaverTraceConfig.cpp \
+-../utils/pcfparser/old/ParaverTraceConfigGrammar.cpp 
+-else
+-  PCFPARSER_FILES=../utils/pcfparser/ParaverTraceConfig.cpp \
+-  ../utils/pcfparser/UIParaverTraceConfig.cpp
+-endif
+-
++libparaver_api_la_LIBADD = -lparavertraceconfig
++libparaver_api_la_LDFLAGS = -lparavertraceconfig
+ 
+ libparaver_api_la_SOURCES = \
+ cfg.cpp \
+@@ -53,8 +38,7 @@
+ tracesoftwarecounters.cpp \
+ window.cpp \
+ workspace.cpp \
+-workspacemanager.cpp \
+-$(PCFPARSER_FILES)
++workspacemanager.cpp
+ 
+ include_HEADERS = \
+   cfg.h\
+@@ -110,18 +94,6 @@
+   traceeditstates.cpp\
+   zoomhistory.cpp
+ 
+-install-data-hook:
+-  $(mkdir_p) $(DESTDIR)$(includedir)/utils/pcfparser
+-  cp -f ../utils/pcfparser/UIParaverTraceConfig.h 
$(DESTDIR)$(includedir)/utils/pcfparser
+-  cp -f ../utils/pcfparser/UIParaverTraceConfig.ipp