tracefilegen: 2015-11-14 -> 2017-05-13

Updated while resolving the build issue with gcc7 that is being tracked
in #31747.
This commit is contained in:
Andreas Rammhold 2017-11-25 14:00:22 +01:00
parent fbbda41e05
commit 4bda3c4225
No known key found for this signature in database
GPG Key ID: E432E410B5E48C86
3 changed files with 29 additions and 26 deletions

View File

@ -1,17 +0,0 @@
source "$stdenv"/setup
cp --recursive "$src" ./
chmod --recursive u=rwx ./"$(basename "$src")"
cd ./"$(basename "$src")"
cmake ./
make
mkdir --parents "$out"/bin
cp ./TraceFileGen "$out"/bin
mkdir --parents "$out"/share/doc/"$name"/html
cp --recursive ./Documentation/html/* "$out/share/doc/$name/html/"

View File

@ -1,18 +1,25 @@
{ stdenv, fetchgit, cmake }:
{ stdenv, fetchFromGitHub, cmake }:
stdenv.mkDerivation rec {
name = "tracefilegen-2015-11-14";
name = "tracefilegen-2017-05-13";
src = fetchgit {
url = "https://github.com/GarCoSim/TraceFileGen.git";
rev = "4acf75b142683cc475c6b1c841a221db0753b404";
sha256 = "0mh661l9d1lczv0mr2y9swzqqlwikyqiv1hdd71r9v8cvm54y5ij";
src = fetchFromGitHub {
owner = "GarCoSim";
repo = "TraceFileGen";
rev = "0ebfd1fdb54079d4bdeaa81fc9267ecb9f016d60";
sha256 = "1gsx18ksgz5gwl3v62vgrmhxc0wc99i74qwhpn0h57zllk41drjc";
};
buildInputs = [ cmake ];
nativeBuildInputs = [ cmake ];
builder = ./builder.sh;
patches = [ ./gcc7.patch ];
installPhase = ''
install -Dm755 TraceFileGen $out/bin/TraceFileGen
mkdir -p $out/share/doc/${name}/
cp -ar $src/Documentation/html $out/share/doc/${name}/.
'';
meta = with stdenv.lib; {
description = "Automatically generate all types of basic memory management operations and write into trace files";

View File

@ -0,0 +1,13 @@
diff --git a/Utils/Logger.cpp b/Utils/Logger.cpp
index 747cd63..e3efdf1 100644
--- a/Utils/Logger.cpp
+++ b/Utils/Logger.cpp
@@ -29,7 +29,7 @@ Logger::Logger(char* tracepath) {
trace = fopen(tracepath, "w");
// dot file is not used, set null as default value
- dot = '\0';
+ dot = nullptr;
//dot = fopen("gcKons.dot", "w");
//fprintf(dot,"digraph G {\n");
}