diff options
Diffstat (limited to 'www-servers/hiawatha/files/hiawatha-9.0-no-bundled-polarssl.patch')
| -rw-r--r-- | www-servers/hiawatha/files/hiawatha-9.0-no-bundled-polarssl.patch | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/www-servers/hiawatha/files/hiawatha-9.0-no-bundled-polarssl.patch b/www-servers/hiawatha/files/hiawatha-9.0-no-bundled-polarssl.patch new file mode 100644 index 0000000..d48afd4 --- /dev/null +++ b/www-servers/hiawatha/files/hiawatha-9.0-no-bundled-polarssl.patch @@ -0,0 +1,30 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 1f4a312..0d8c6ca 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -92,15 +92,11 @@ include(CPack) + + # PolarSSL + if(ENABLE_SSL) +- option(USE_SHARED_POLARSSL_LIBRARY "Build PolarSSL as a shared library." ON) +- set(CMAKE_INSTALL_NAME_DIR ${CMAKE_INSTALL_FULL_LIBDIR}/hiawatha) +- set(LIB_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR}/hiawatha) +- add_subdirectory(polarssl) +- set(POLARSSL_LIBRARY "polarssl") ++ find_library(POLARSSL_LIBRARY polarssl) + endif() + + # Hiawatha +-include_directories(${CMAKE_CURRENT_BINARY_DIR} polarssl/include) ++include_directories(${CMAKE_CURRENT_BINARY_DIR}) + if(ENABLE_XSLT) + include_directories(${LIBXML2_INCLUDE_DIR} ${LIBXSLT_INCLUDE_DIR}) + endif() +@@ -124,7 +120,6 @@ target_link_libraries(wigwam ${CRYPT_LIBRARY}) + target_link_libraries(hiawatha ${CRYPT_LIBRARY} pthread ${Z_LIBRARY}) + if(ENABLE_SSL) + target_link_libraries(hiawatha ${POLARSSL_LIBRARY}) +- set_target_properties(hiawatha PROPERTIES INSTALL_RPATH ${CMAKE_INSTALL_FULL_LIBDIR}/hiawatha) + endif() + if(ENABLE_XSLT) + target_link_libraries(hiawatha ${LIBXML2_LIBRARIES} ${LIBXSLT_LIBRARIES}) |