From 5e0c3460eaee4b882d552124c15f7f5825494831 Mon Sep 17 00:00:00 2001 From: Martin Quinson Date: Fri, 22 Jan 2016 16:28:28 +0100 Subject: [PATCH] do not include libboost-context in the jar MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit - This is difficult because we may need to include libboost-chrono or other libraries. - This breaks the tests on some systems because of messages similar to | OpenJDK Client VM warning: You have loaded library | /tmp/simgrid-java7021501405032421762/libboost_context.so which might | have disabled stack guard. The VM will try to fix the stack guard now. - This make it difficult to build the jar on windows while allowing parallel build. So don't include the external libraries in the jar at all. We will have to generate the native libraries with no dependencies for the stable releases. --- tools/cmake/Java.cmake | 3 --- 1 file changed, 3 deletions(-) diff --git a/tools/cmake/Java.cmake b/tools/cmake/Java.cmake index 50045009d6..613272c90f 100644 --- a/tools/cmake/Java.cmake +++ b/tools/cmake/Java.cmake @@ -135,9 +135,6 @@ if(enable_lib_in_jar) # Find what to copy set(JAVALIBS ${CMAKE_BINARY_DIR}/lib/${LIBSIMGRID_SO} ${CMAKE_BINARY_DIR}/lib/${LIBSIMGRID_JAVA_SO}) - if (HAVE_BOOST_CONTEXT) - set(JAVALIBS ${JAVALIBS} ${Boost_CONTEXT_LIBRARY_RELEASE}) - endif() if(MINGW) find_library(WINPTHREAD_DLL NAME winpthread winpthread-1 -- 2.20.1