hera for geth-evmc as a static lib

Author: cdetrio

cmake/ProjectWAVM.cmake

@@ -40,7 +40,7 @@ ExternalProject_Add(wavm
     -DCMAKE_INSTALL_PREFIX=<INSTALL_DIR>
     -DCMAKE_BUILD_TYPE=Release
     -DLLVM_DIR=${LLVM_DIR}
-    -DCMAKE_POSITION_INDEPENDENT_CODE=ON
+    -DCMAKE_POSITION_INDEPENDENT_CODE=OFF
     -DCMAKE_CXX_FLAGS=-Wno-error
     INSTALL_COMMAND ""
     BUILD_BYPRODUCTS ${runtime_library} ${other_libraries}

cmake/ProjectWabt.cmake

@@ -22,10 +22,10 @@ ExternalProject_Add(wabt
     CMAKE_ARGS
     -DCMAKE_INSTALL_PREFIX=<INSTALL_DIR>
     -DCMAKE_BUILD_TYPE=Release
-    -DWITH_EXCEPTIONS=ON
+    -DWITH_EXCEPTIONS=OFF
     -DBUILD_TESTS=OFF
     -DBUILD_TOOLS=OFF
-    -DCMAKE_POSITION_INDEPENDENT_CODE=ON
+    -DCMAKE_POSITION_INDEPENDENT_CODE=OFF
     INSTALL_COMMAND ""
     BUILD_BYPRODUCTS ${wabt_library}
 )

src/CMakeLists.txt

@@ -33,7 +33,7 @@ endif()
 target_include_directories(hera
     PUBLIC $<BUILD_INTERFACE:${hera_include_dir}>$<INSTALL_INTERFACE:include>
 )
-target_link_libraries(hera PUBLIC evmc::evmc PRIVATE hera-buildinfo evmc::instructions)
+target_link_libraries(hera PUBLIC evmc::evmc PUBLIC hera-buildinfo evmc::instructions)
 if(NOT WIN32)
   if(CMAKE_COMPILER_IS_GNUCXX)
     set_target_properties(hera PROPERTIES LINK_FLAGS "-Wl,--no-undefined")

src/binaryen.cpp

@@ -569,11 +569,15 @@ void BinaryenEngine::verifyContract(wasm::Module & module)
     "Contract export (\"memory\") missing."
   );
 
+/*
+***** in the metering benchmarks, inline-block and inline-super both export the inline useGas functions
+// just going to comment this out since here since we need to change Hera for static libs anyway
   ensureCondition(
     module.exports.size() == 2,
     ContractValidationFailure,
     "Contract exports more than (\"main\") and (\"memory\")."
   );
+*/
 
   // The existence of this is ensured above.
   wasm::Export* main_export = module.getExport(wasm::Name("main"));