From 4d85b6f26c2fcdb2a61ca3fc607459012c3ec5e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Bylica?= Date: Sun, 21 Dec 2014 01:32:04 +0100 Subject: [PATCH 1/3] Workaround for Ubuntu broken LLVM package (llvm-3.5-dev does not have correct cmake files) --- CMakeLists.txt | 11 +++++++---- evmjit | 2 +- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index df33ca0e8..db5ddb864 100644 --- a/CMakeLists.txt +++ b/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) diff --git a/evmjit b/evmjit index ed63ced24..1b490244b 160000 --- a/evmjit +++ b/evmjit @@ -1 +1 @@ -Subproject commit ed63ced24456c28b6dba345b8fc61e680ed406d7 +Subproject commit 1b490244bf4864b96448d56a7cd20f3d5b0a0b9b From abea5ded667c42421e5d0e01cd580f0cb76d6093 Mon Sep 17 00:00:00 2001 From: caktux Date: Sun, 21 Dec 2014 00:14:20 -0500 Subject: [PATCH 2/3] fix 'Value stored to 'x' is never read' in neth --- neth/main.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neth/main.cpp b/neth/main.cpp index 1eac7fb1f..599461dcb 100644 --- a/neth/main.cpp +++ b/neth/main.cpp @@ -1023,7 +1023,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); From 5446b44fc6bfae9b59d4c6a065c9aceaf11f0347 Mon Sep 17 00:00:00 2001 From: caktux Date: Sun, 21 Dec 2014 03:24:04 -0500 Subject: [PATCH 3/3] fix memory leak on str in neth --- neth/main.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/neth/main.cpp b/neth/main.cpp index 1eac7fb1f..6a7b799cc 100644 --- a/neth/main.cpp +++ b/neth/main.cpp @@ -415,6 +415,7 @@ int main(int argc, char** argv) if (!(mainwin = initscr())) { cerr << "Error initialising ncurses."; + delete [] str; return -1; }