diff options
| author | René 'Necoro' Neumann <necoro@necoro.net> | 2013-07-01 18:50:52 +0200 |
|---|---|---|
| committer | René 'Necoro' Neumann <necoro@necoro.net> | 2013-07-01 18:50:52 +0200 |
| commit | d542366e406446a7018b0be00dd124536ae246a3 (patch) | |
| tree | 9228808aaaf83db5fd3c318c937eda7d66f41f68 /www-servers/hiawatha/files | |
| parent | 8cde9088f85882c2538180f0d88e73d685476249 (diff) | |
| download | overlay-d542366e406446a7018b0be00dd124536ae246a3.tar.gz overlay-d542366e406446a7018b0be00dd124536ae246a3.tar.bz2 overlay-d542366e406446a7018b0be00dd124536ae246a3.zip | |
Updated hiawatha from sunrise
Diffstat (limited to 'www-servers/hiawatha/files')
| -rw-r--r-- | www-servers/hiawatha/files/hiawatha-9.0-no-bundled-polarssl.patch | 38 | ||||
| -rw-r--r-- | www-servers/hiawatha/files/hiawatha.initd | 2 |
2 files changed, 1 insertions, 39 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 deleted file mode 100644 index 2f32001..0000000 --- a/www-servers/hiawatha/files/hiawatha-9.0-no-bundled-polarssl.patch +++ /dev/null @@ -1,38 +0,0 @@ -Hiawatha bundles PolarSSL. This is bad. Use the system-wide one. - -Upstream is not going to remove the bundling (it even uses .c files -for certain operation when SSL is not enabled), so we need to keep this -patch around. - -From: René Neumann <gentoo@necoro.eu> - -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}) diff --git a/www-servers/hiawatha/files/hiawatha.initd b/www-servers/hiawatha/files/hiawatha.initd index fc6d3a4..9c04296 100644 --- a/www-servers/hiawatha/files/hiawatha.initd +++ b/www-servers/hiawatha/files/hiawatha.initd @@ -1,5 +1,5 @@ #!/sbin/runscript -# Copyright 1999-2008 Gentoo Foundation +# Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: $ |