diff options
Diffstat (limited to 'sys-cluster/paraver-kernel/files/paraver-kernel-4.10.1-unbundle-libbsctools.patch')
| -rw-r--r-- | sys-cluster/paraver-kernel/files/paraver-kernel-4.10.1-unbundle-libbsctools.patch | 213 |
1 files changed, 0 insertions, 213 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 deleted file mode 100644 index 3895473e6..000000000 --- a/sys-cluster/paraver-kernel/files/paraver-kernel-4.10.1-unbundle-libbsctools.patch +++ /dev/null @@ -1,213 +0,0 @@ ---- a/api/eventlabels.h -+++ b/api/eventlabels.h -@@ -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; ---- a/api/Makefile.am -+++ b/api/Makefile.am -@@ -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 ---- a/api/paramedir.cpp -+++ b/api/paramedir.cpp -@@ -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 ---- a/api/statelabels.h -+++ b/api/statelabels.h -@@ -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; ---- a/api/trace.cpp -+++ b/api/trace.cpp -@@ -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" ---- a/api/tracecutter.cpp -+++ b/api/tracecutter.cpp -@@ -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; ---- a/configure.ac -+++ b/configure.ac -@@ -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]) ---- a/m4/macros.m4 -+++ b/m4/macros.m4 -@@ -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 ---- a/Makefile.am -+++ b/Makefile.am -@@ -11,7 +11,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 -@@ -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 -+} ---- 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 - - |