commit: 9580aa992eaaf12c4ebc82d0ae7581d1eeb58f1d Author: Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com> AuthorDate: Tue Jun 7 15:12:08 2022 +0000 Commit: Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com> CommitDate: Tue Jun 7 15:26:03 2022 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=9580aa99
sys-cluster/paraver-kernel: add 4.10.1, drop 4.9.0 Closes: https://bugs.gentoo.org/840698 Signed-off-by: Alessandro Barbieri <lssndrbarbieri <AT> gmail.com> sys-cluster/paraver-kernel/Manifest | 2 +- ...araver-kernel-4.10.1-unbundle-libbsctools.patch | 225 ++++++++++++++++++ ...kernel-4.9.0-fix-gcc-11-compilation-error.patch | 20 -- .../paraver-kernel-unbundle-libbsctools.patch | 264 --------------------- ...l-4.9.0.ebuild => paraver-kernel-4.10.1.ebuild} | 7 +- 5 files changed, 229 insertions(+), 289 deletions(-) diff --git a/sys-cluster/paraver-kernel/Manifest b/sys-cluster/paraver-kernel/Manifest index db4733fe4..2e51847fe 100644 --- a/sys-cluster/paraver-kernel/Manifest +++ b/sys-cluster/paraver-kernel/Manifest @@ -1 +1 @@ -DIST paraver-kernel-4.9.0.tar.gz 2144621 BLAKE2B 93cb6a751462ff0f39261e89fba11664ac07ff20f557e41a899cf958fa5bc7751bca5fc7d1bb3c734cb3ba60e84e7c113ed86641e985a807814b0be039a943ac SHA512 efd781c2288e4b7ce847d6010fd79b83c9db32f5f9b4696009feaa56558aa1f20f86955e920dec6a6355377fe4cf09f9ed23caa55e63596dc0ebb289933cc149 +DIST paraver-kernel-4.10.1.gh.tar.gz 2154910 BLAKE2B a90364eefb3c6195f106736dab89d71e9e413a5ba8d7655d4956fdaf8ebe229a1f4c485c847d9a0719c89d26dc849decc575a5d27f0d72ea84295079dd8b4914 SHA512 42cd02d44c3b2950b56d3c2557fc729e6ae3f295e6dde2362698f29a72cb67e8ac8cf2749204bbc79721ed2fb1ba64ca1ae32a6d69add878dc131f55547b8574 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 new file mode 100644 index 000000000..c54e943fb --- /dev/null +++ b/sys-cluster/paraver-kernel/files/paraver-kernel-4.10.1-unbundle-libbsctools.patch @@ -0,0 +1,225 @@ +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.000000000 +0200 ++++ paraver-kernel-4.10.1/api/eventlabels.h 2022-06-07 16:52:15.526426696 +0200 +@@ -32,7 +32,7 @@ + #ifdef OLD_PCFPARSER + #include "utils/pcfparser/old/ParaverTraceConfig.h" + #else +-#include "utils/pcfparser/UIParaverTraceConfig.h" ++#include "UIParaverTraceConfig.h" + #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.000000000 +0200 ++++ paraver-kernel-4.10.1/api/Makefile.am 2022-06-07 17:07:09.261765112 +0200 +@@ -1,20 +1,6 @@ + + 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 + + if MINGW_ENABLED + noinst_LTLIBRARIES = libparavertraceconfig.la +@@ -23,6 +9,9 @@ + libparaver_api_la_LIBADD = libparavertraceconfig.la + endif + ++libparaver_api_la_LIBADD = -lparavertraceconfig ++libparaver_api_la_LDFLAGS = -lparavertraceconfig ++ + libparaver_api_la_SOURCES = \ + cfg.cpp \ + cfgs4d.cpp \ +@@ -61,9 +50,6 @@ + workspace.cpp \ + workspacemanager.cpp + +-if !MINGW_ENABLED +- libparaver_api_la_SOURCES += $(PCFPARSER_FILES) +-endif + + include_HEADERS = \ + cfg.h \ +@@ -121,16 +107,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 $(DESTDIR)$(includedir)/utils/pcfparser +- +- $(mkdir_p) $(DESTDIR)$(includedir)/utils/pcfparser/old +- cp -f ../utils/pcfparser/old/ParaverTraceConfig.h $(DESTDIR)$(includedir)/utils/pcfparser/old +- +-uninstall-hook: +- test -d $(DESTDIR)$(includedir)/utils/pcfparser && rm -rf $(DESTDIR)$(includedir)/utils/pcfparser + + + # 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.000000000 +0200 ++++ paraver-kernel-4.10.1/api/paramedir.cpp 2022-06-07 16:55:57.063567741 +0200 +@@ -57,7 +57,7 @@ + #ifdef OLD_PCFPARSER + #include "utils/pcfparser/old/ParaverTraceConfig.h" + #else +-#include "utils/pcfparser/UIParaverTraceConfig.h" ++#include "UIParaverTraceConfig.h" + #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.000000000 +0200 ++++ paraver-kernel-4.10.1/api/statelabels.h 2022-06-07 16:56:27.090733938 +0200 +@@ -31,7 +31,7 @@ + #ifdef OLD_PCFPARSER + #include "utils/pcfparser/old/ParaverTraceConfig.h" + #else +-#include "utils/pcfparser/UIParaverTraceConfig.h" ++#include "UIParaverTraceConfig.h" + #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.000000000 +0200 ++++ paraver-kernel-4.10.1/api/trace.cpp 2022-06-07 16:56:49.155856065 +0200 +@@ -29,7 +29,7 @@ + #include "utils/pcfparser/old/ParaverStatesColor.h" + #include "utils/pcfparser/old/ParaverGradientColor.h" + #else +-#include "utils/pcfparser/UIParaverTraceConfig.h" ++#include "UIParaverTraceConfig.h" + #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.000000000 +0200 ++++ paraver-kernel-4.10.1/api/tracecutter.cpp 2022-06-07 16:57:09.200968638 +0200 +@@ -31,7 +31,7 @@ + #ifdef OLD_PCFPARSER + #include "utils/pcfparser/old/ParaverTraceConfig.h" + #else +-#include "utils/pcfparser/UIParaverTraceConfig.h" ++#include "UIParaverTraceConfig.h" + #endif + + using namespace libparaver; +diff -ru /var/tmp/portage/sys-cluster/paraver-kernel-4.10.1/work/paraver-kernel-4.10.1/configure.ac paraver-kernel-4.10.1/configure.ac +--- /var/tmp/portage/sys-cluster/paraver-kernel-4.10.1/work/paraver-kernel-4.10.1/configure.ac 2022-05-30 11:36:33.000000000 +0200 ++++ paraver-kernel-4.10.1/configure.ac 2022-06-07 16:58:23.699588409 +0200 +@@ -55,7 +55,6 @@ + AC_CONFIG_HEADERS(config_traits.h) + AX_PROG_ENABLE_DEPENDENCIES_AWARE_INSTALL + AX_PROG_ENABLE_EXTENDED_OBJECTS +-AX_PROG_ENABLE_OLD_PCFPARSER + AX_PROG_ENABLE_OMPSS + AX_PROG_ENABLE_OPENMP + AX_PROG_ENABLE_MINGW +@@ -89,4 +88,4 @@ + AC_SUBST([AM_CXXFLAGS]) + AC_SUBST([AM_LDFLAGS]) + +-AC_OUTPUT([Makefile src/Makefile api/Makefile include/Makefile utils/Makefile utils/include/Makefile utils/src/Makefile utils/pcfparser/Makefile utils/pcfparser/old/Makefile]) ++AC_OUTPUT([Makefile src/Makefile api/Makefile include/Makefile utils/Makefile utils/include/Makefile utils/src/Makefile]) +diff -ru /var/tmp/portage/sys-cluster/paraver-kernel-4.10.1/work/paraver-kernel-4.10.1/m4/macros.m4 paraver-kernel-4.10.1/m4/macros.m4 +--- /var/tmp/portage/sys-cluster/paraver-kernel-4.10.1/work/paraver-kernel-4.10.1/m4/macros.m4 2022-05-30 11:36:33.000000000 +0200 ++++ paraver-kernel-4.10.1/m4/macros.m4 2022-06-07 16:58:46.022774121 +0200 +@@ -36,27 +36,6 @@ + + + +-# AX_PROG_ENABLE_OLD_PCFPARSER +-# ---------------------------- +-AC_DEFUN([AX_PROG_ENABLE_OLD_PCFPARSER], +-[ +- AC_ARG_ENABLE(old_pcfparser, +- AC_HELP_STRING( +- [--enable-old-pcfparser], +- [enable compilation with old pcfparser (default: disabled)] +- ), +- [enable_old_pcfparser="${enableval}"], +- [enable_old_pcfparser="no"] +- ) +- +- if test "${enable_old_pcfparser}" = "yes" ; then +- AC_MSG_NOTICE([Using old pcfparser.]) +- AC_DEFINE([OLD_PCFPARSER], 1, [Old pcfparser enabled by user.]) +- fi +- +- AM_CONDITIONAL(MAKE_OLD_PCFPARSER, test "${enable_old_pcfparser}" = "yes" ) +-]) +- + + + # AX_PROG_ENABLE_OMPSS +diff -ru /var/tmp/portage/sys-cluster/paraver-kernel-4.10.1/work/paraver-kernel-4.10.1/Makefile.am paraver-kernel-4.10.1/Makefile.am +--- /var/tmp/portage/sys-cluster/paraver-kernel-4.10.1/work/paraver-kernel-4.10.1/Makefile.am 2022-05-30 11:36:33.000000000 +0200 ++++ paraver-kernel-4.10.1/Makefile.am 2022-06-07 16:59:30.543135745 +0200 +@@ -11,7 +11,7 @@ + api/paramedir.cpp + + paramedir_bin_LDADD = \ +- -lz \ ++ -lz -lparavertraceconfig \ + api/libparaver-api.la \ + src/libparaver-kernel.la + +diff -ru /var/tmp/portage/sys-cluster/paraver-kernel-4.10.1/work/paraver-kernel-4.10.1/src/ktraceeditactions.cpp paraver-kernel-4.10.1/src/ktraceeditactions.cpp +--- /var/tmp/portage/sys-cluster/paraver-kernel-4.10.1/work/paraver-kernel-4.10.1/src/ktraceeditactions.cpp 2022-05-30 11:36:33.000000000 +0200 ++++ paraver-kernel-4.10.1/src/ktraceeditactions.cpp 2022-06-07 17:00:17.452495350 +0200 +@@ -45,7 +45,7 @@ + #ifdef OLD_PCFPARSER + #include "utils/pcfparser/old/ParaverTraceConfig.h" + #else +-#include "utils/pcfparser/UIParaverTraceConfig.h" ++#include "UIParaverTraceConfig.h" + #endif + + using std::set; +@@ -841,4 +841,4 @@ + tmpSequence->executeNextAction( whichTrace ); + + return true; +-} +\ Manca newline alla fine del file ++} +diff -ru /var/tmp/portage/sys-cluster/paraver-kernel-4.10.1/work/paraver-kernel-4.10.1/src/Makefile.am paraver-kernel-4.10.1/src/Makefile.am +--- /var/tmp/portage/sys-cluster/paraver-kernel-4.10.1/work/paraver-kernel-4.10.1/src/Makefile.am 2022-05-30 11:36:33.000000000 +0200 ++++ paraver-kernel-4.10.1/src/Makefile.am 2022-06-07 17:01:37.570126911 +0200 +@@ -58,7 +58,10 @@ + traceeditblocks.cpp \ + traceheaderexception.cpp\ + tracestream.cpp +- ++ ++libparaver_kernel_la_LIBADD = -lparavertraceconfig ++libparaver_kernel_la_LDFLAGS = -lparavertraceconfig ++ + noinst_HEADERS = \ + cell.cpp \ + column.cpp \ +diff -ru /var/tmp/portage/sys-cluster/paraver-kernel-4.10.1/work/paraver-kernel-4.10.1/utils/Makefile.am paraver-kernel-4.10.1/utils/Makefile.am +--- /var/tmp/portage/sys-cluster/paraver-kernel-4.10.1/work/paraver-kernel-4.10.1/utils/Makefile.am 2022-05-30 11:36:33.000000000 +0200 ++++ paraver-kernel-4.10.1/utils/Makefile.am 2022-06-07 17:02:02.100351099 +0200 +@@ -1,6 +1,5 @@ + SUBDIRS = \ + include \ +- pcfparser \ + src + + 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 deleted file mode 100644 index a007d1b35..000000000 --- a/sys-cluster/paraver-kernel/files/paraver-kernel-4.9.0-fix-gcc-11-compilation-error.patch +++ /dev/null @@ -1,20 +0,0 @@ -From 6ed43d980aba622e27402efdaaf32591fcb72b02 Mon Sep 17 00:00:00 2001 -From: Eloy Martinez <[email protected]> -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 deleted file mode 100644 index f760dd06a..000000000 --- a/sys-cluster/paraver-kernel/files/paraver-kernel-unbundle-libbsctools.patch +++ /dev/null @@ -1,264 +0,0 @@ ---- 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 <map> - #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 $(DESTDIR)$(includedir)/utils/pcfparser -- -- $(mkdir_p) $(DESTDIR)$(includedir)/utils/pcfparser/old -- cp -f ../utils/pcfparser/old/ParaverTraceConfig.h $(DESTDIR)$(includedir)/utils/pcfparser/old -- --uninstall-hook: -- test -d $(DESTDIR)$(includedir)/utils/pcfparser && rm -rf $(DESTDIR)$(includedir)/utils/pcfparser -- -- - # Erases everything which should not be uploaded to CVS - mrproper: distclean - rm -fr Makefile.in ---- a/api/paramedir.cpp -+++ b/api/paramedir.cpp -@@ -54,11 +54,7 @@ - #include "eventdrivencutter.h" - #include "eventtranslator.h" - --#ifdef OLD_PCFPARSER --#include "utils/pcfparser/old/ParaverTraceConfig.h" --#else --#include "utils/pcfparser/UIParaverTraceConfig.h" --#endif -+#include "UIParaverTraceConfig.h" - - // PARAMEDIR OPTIONS - typedef struct TOptionParamedir ---- a/api/statelabels.cpp -+++ b/api/statelabels.cpp -@@ -24,10 +24,6 @@ - - #include "statelabels.h" - --#ifdef OLD_PCFPARSER --#include "utils/pcfparser/old/ParaverState.h" --#endif -- - using namespace std; - - const string StateLabels::unknownLabel = "Unknown"; ---- a/api/statelabels.h -+++ b/api/statelabels.h -@@ -28,11 +28,7 @@ - #include <map> - #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/trace.cpp -+++ b/api/trace.cpp -@@ -24,13 +24,7 @@ - #include "kernelconnection.h" - #include "trace.h" - --#ifdef OLD_PCFPARSER --#include "utils/pcfparser/old/ParaverTraceConfig.h" --#include "utils/pcfparser/old/ParaverStatesColor.h" --#include "utils/pcfparser/old/ParaverGradientColor.h" --#else --#include "utils/pcfparser/UIParaverTraceConfig.h" --#endif -+#include "UIParaverTraceConfig.h" - - #include "progresscontroller.h" - #include <sstream> ---- a/api/tracecutter.cpp -+++ b/api/tracecutter.cpp -@@ -28,11 +28,7 @@ - //#include "ktracecutter.h" - #include "kernelconnection.h" - --#ifdef OLD_PCFPARSER --#include "utils/pcfparser/old/ParaverTraceConfig.h" --#else --#include "utils/pcfparser/UIParaverTraceConfig.h" --#endif -+#include "UIParaverTraceConfig.h" - - using namespace libparaver; - ---- a/configure.ac -+++ b/configure.ac -@@ -52,7 +52,6 @@ - AC_CONFIG_HEADERS(config_traits.h) - AX_PROG_ENABLE_DEPENDENCIES_AWARE_INSTALL - AX_PROG_ENABLE_EXTENDED_OBJECTS --AX_PROG_ENABLE_OLD_PCFPARSER - AX_PROG_ENABLE_OMPSS - AX_PROG_ENABLE_OPENMP - AX_PROG_ENABLE_MINGW -@@ -82,4 +81,4 @@ - CXXFLAGS="-I../include/ -I../api/ -I../ -I../../ $CXXFLAGS $BOOST_CPPFLAGS $CXXFLAGS_EXTRAE $XML_CPPFLAGS $MINGW_CPPFLAGS -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE -DBOOST_DATE_TIME_POSIX_TIME_STD_CONFIG" - LDFLAGS="$LDFLAGS $BOOST_LDFLAGS $BOOST_SERIALIZATION_LIB $BOOST_DATE_TIME_LIB $LDFLAGS_EXTRAE $BOOST_RPATH $XML_LIBS $MINGW_LIBS" - --AC_OUTPUT([Makefile src/Makefile api/Makefile include/Makefile utils/Makefile utils/include/Makefile utils/src/Makefile utils/pcfparser/Makefile utils/pcfparser/old/Makefile]) -+AC_OUTPUT([Makefile src/Makefile api/Makefile include/Makefile utils/Makefile utils/include/Makefile utils/src/Makefile]) ---- a/m4/macros.m4 -+++ b/m4/macros.m4 -@@ -36,29 +36,6 @@ - - - --# AX_PROG_ENABLE_OLD_PCFPARSER --# ---------------------------- --AC_DEFUN([AX_PROG_ENABLE_OLD_PCFPARSER], --[ -- AC_ARG_ENABLE(old_pcfparser, -- AC_HELP_STRING( -- [--enable-old-pcfparser], -- [enable compilation with old pcfparser (default: disabled)] -- ), -- [enable_old_pcfparser="${enableval}"], -- [enable_old_pcfparser="no"] -- ) -- -- if test "${enable_old_pcfparser}" = "yes" ; then -- AC_MSG_NOTICE([Using old pcfparser.]) -- AC_DEFINE([OLD_PCFPARSER], 1, [Old pcfparser enabled by user.]) -- fi -- -- AM_CONDITIONAL(MAKE_OLD_PCFPARSER, test "${enable_old_pcfparser}" = "yes" ) --]) -- -- -- - # AX_PROG_ENABLE_OMPSS - # -------------------- - AC_DEFUN([AX_PROG_ENABLE_OMPSS], ---- a/Makefile.am -+++ b/Makefile.am -@@ -15,7 +15,7 @@ - api/paramedir.cpp - - paramedir_bin_LDADD = \ -- -lz \ -+ -lz -lparavertraceconfig \ - api/libparaver-api.la \ - src/libparaver-kernel.la - ---- a/src/ktraceeditactions.cpp -+++ b/src/ktraceeditactions.cpp -@@ -42,11 +42,7 @@ - #include "traceoptions.h" - #include "ParaverMetadataManager.h" - #include "ktrace.h" --#ifdef OLD_PCFPARSER --#include "utils/pcfparser/old/ParaverTraceConfig.h" --#else --#include "utils/pcfparser/UIParaverTraceConfig.h" --#endif -+#include "UIParaverTraceConfig.h" - - using std::set; - -@@ -841,4 +837,4 @@ - tmpSequence->executeNextAction( whichTrace ); - - return true; --} -\ Manca newline alla fine del file -+} ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -58,7 +58,10 @@ - traceeditblocks.cpp \ - traceheaderexception.cpp\ - tracestream.cpp -- -+ -+libparaver_kernel_la_LIBADD = -lparavertraceconfig -+libparaver_kernel_la_LDFLAGS = -lparavertraceconfig -+ - noinst_HEADERS = \ - cell.cpp \ - column.cpp \ ---- a/utils/Makefile.am -+++ b/utils/Makefile.am -@@ -1,6 +1,5 @@ - SUBDIRS = \ - include \ -- pcfparser \ - src - - diff --git a/sys-cluster/paraver-kernel/paraver-kernel-4.9.0.ebuild b/sys-cluster/paraver-kernel/paraver-kernel-4.10.1.ebuild similarity index 83% rename from sys-cluster/paraver-kernel/paraver-kernel-4.9.0.ebuild rename to sys-cluster/paraver-kernel/paraver-kernel-4.10.1.ebuild index cb9d199f3..8ad0de49c 100644 --- a/sys-cluster/paraver-kernel/paraver-kernel-4.9.0.ebuild +++ b/sys-cluster/paraver-kernel/paraver-kernel-4.10.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 2019-2021 Gentoo Authors +# Copyright 2019-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -10,7 +10,7 @@ HOMEPAGE=" http://tools.bsc.es/paraver https://github.com/bsc-performance-tools/paraver-kernel " -SRC_URI="https://github.com/bsc-performance-tools/paraver-kernel/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" +SRC_URI="https://github.com/bsc-performance-tools/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz" LICENSE="LGPL-2.1" SLOT="0" @@ -31,8 +31,7 @@ DEPEND="${RDEPEND}" DOCS=( README NEWS AUTHORS ChangeLog ) REQUIRED_USE="extrae? ( openmp )" PATCHES=( - "${FILESDIR}/${PN}-unbundle-libbsctools.patch" - "${FILESDIR}/${P}-fix-gcc-11-compilation-error.patch" + "${FILESDIR}/${P}-unbundle-libbsctools.patch" ) src_prepare() {
