Merge branch 'develop' of github.com:ethereum/cpp-ethereum into develop

CMakeLists.txt

@@ -112,6 +112,13 @@ include(EthExecutableHelper)
 
 createBuildInfo()
 
+if (EVMJIT)
+	# Workaround for Ubuntu broken LLVM package
+	link_directories(/usr/lib/llvm-3.5/lib)
+	
+	add_subdirectory(evmjit)
+endif()
+
 add_subdirectory(libdevcore)
 add_subdirectory(libevmcore)
 add_subdirectory(liblll)
@@ -156,10 +163,6 @@ if (NOT HEADLESS)
 	
 endif()
 
-if (EVMJIT)
-	add_subdirectory(evmjit)
-endif()
-
 enable_testing()
 add_test(NAME alltests WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/test COMMAND testeth)
 

evmjit

@@ -1 +1 @@
-Subproject commit ed63ced24456c28b6dba345b8fc61e680ed406d7
+Subproject commit 1b490244bf4864b96448d56a7cd20f3d5b0a0b9b

neth/main.cpp

@@ -415,6 +415,7 @@ int main(int argc, char** argv)
 	if (!(mainwin = initscr()))
 	{
 		cerr << "Error initialising ncurses.";
+		delete [] str;
 		return -1;
 	}
 
@@ -1023,7 +1024,7 @@ void print_in_middle(WINDOW *win, int starty, int startx, int width, string str,
 
 	length = str.length();
 	temp = (width - length) / 2;
-	x = startx + (int)temp;
+	x = x + (int)temp;
 	wattron(win, color);
 	mvwprintw(win, y, x, "%s", str.c_str());
 	wattroff(win, color);