citrun

commit 9f24643c8b7425f5b9fb80dcc4b3e10c63401b68
parent 3f8eb225f53a332141834d283c13647af2152aac
Author: Kyle Milz <kyle@getaddrinfo.net>
Date:   Thu, 24 Mar 2016 23:37:48 -0600

patches: regen debian

Diffstat:
M
patches/debian.diff
 | 
29
+++++++++++++++++++----------

1 file changed, 19 insertions(+), 10 deletions(-)
diff --git a/patches/debian.diff b/patches/debian.diff
@@ -1,21 +1,21 @@
 diff --git a/SCV/Project.pm b/SCV/Project.pm
-index 6ff2664..5f4c540 100644
+index 5b608cc..2d21b88 100644
 --- a/SCV/Project.pm
 +++ b/SCV/Project.pm
 @@ -49,7 +49,7 @@ EOF
  	syswrite( $makefile_fh, $makefile );
  
  	# Use the wrapper to make sure it works
--	my $ret = system( "wrap/scv_wrap_test make -C $tmp_dir" );
-+	my $ret = system( "wrap/scv_wrap_test bmake -C $tmp_dir" );
+-	my $ret = system( "wrap/scv_wrap make -C $tmp_dir" );
++	my $ret = system( "wrap/scv_wrap bmake -C $tmp_dir" );
  	die "make failed: $ret\n" if ($ret);
  }
  
 diff --git a/instrument/Makefile b/instrument/Makefile
-index 5d3511b..24389a8 100644
+index 5d3511b..9069cdf 100644
 --- a/instrument/Makefile
 +++ b/instrument/Makefile
-@@ -18,12 +18,13 @@ LDADD += -Wl,--start-group \
+@@ -18,12 +18,14 @@ LDADD += -Wl,--start-group \
  	-lclangFrontendTool \
  	-lclangLex \
  	-lclangParse \
@@ -26,20 +26,29 @@ index 5d3511b..24389a8 100644
  	-lclangSerialization \
  	-lclangTooling \
  	-Wl,--end-group \
-+	-lstdc++
++	-lstdc++ \
++	-lbsd
  
  LDADD += `llvm-config --libs bitreader mcparser transformutils option --system-libs`
  
 diff --git a/instrument/main.cc b/instrument/main.cc
-index 3b54a1b..3480838 100644
+index ce10a7f..fa7d58a 100644
 --- a/instrument/main.cc
 +++ b/instrument/main.cc
-@@ -80,7 +80,7 @@ instrument(int argc, char *argv[], std::vector<std::string> &source_files)
+@@ -2,6 +2,7 @@
+ #include <libgen.h>
+ #include <string.h>
+ #include <unistd.h>
++#include <bsd/stdlib.h>			// setprogname
+ 
+ #include <fstream>
+ #include <iostream>
+@@ -83,7 +84,7 @@ instrument(int argc, char *argv[], std::vector<std::string> const &source_files)
  	// that will return a new MyFrontendAction object every time.  To
  	// further customize this, we could create our own factory class.
  	// int ret = Tool.run(new MFAF(inst_files));
 -	int ret = Tool.run(newFrontendActionFactory<MyFrontendAction>());
 +	int ret = Tool.run(&(*newFrontendActionFactory<MyFrontendAction>()));
  	if (ret)
- 		errx(1, "Instrumentation failed");
- }
+ 		warnx("Instrumentation failed");
+ 	return ret;