From: Alexey Korepanov <kaikaikai@yandex.ru>
Date: Tue, 16 Aug 2016 15:28:03 +0000 (+0100)
Subject: net-misc/i2pd: fix static build #591334
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=d3e0e61cb52c7e845736cc1cf0c50a7bd47fa21e;p=gentoo.git

net-misc/i2pd: fix static build #591334
---

diff --git a/net-misc/i2pd/files/i2pd-2.9.0-static.patch b/net-misc/i2pd/files/i2pd-2.9.0-static.patch
new file mode 100644
index 000000000000..c525db71b933
--- /dev/null
+++ b/net-misc/i2pd/files/i2pd-2.9.0-static.patch
@@ -0,0 +1,25 @@
+From 2e74d91ddc1a776692dd7398e0126a6bd1f2a92a Mon Sep 17 00:00:00 2001
+From: Jeff Becker <ampernand@gmail.com>
+Date: Tue, 16 Aug 2016 10:25:56 -0400
+Subject: [PATCH] try fixing https://github.com/PurpleI2P/i2pd/issues/612
+
+---
+ build/CMakeLists.txt | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/build/CMakeLists.txt b/build/CMakeLists.txt
+index 7f9b8c6..99d6a5a 100644
+--- a/build/CMakeLists.txt
++++ b/build/CMakeLists.txt
+@@ -369,7 +369,10 @@ if (WITH_BINARY)
+   if (MSYS OR MINGW)
+     set (MINGW_EXTRA -lws2_32 -lmswsock -liphlpapi )
+   endif ()
+-  target_link_libraries( "${PROJECT_NAME}" libi2pd i2pdclient ${DL_LIB} ${Boost_LIBRARIES} ${OPENSSL_LIBRARIES} ${ZLIB_LIBRARY} ${CMAKE_THREAD_LIBS_INIT} ${MINGW_EXTRA} )
++  if (WITH_STATIC)
++    set(DL_LIB ${CMAKE_DL_LIBS})
++  endif()
++  target_link_libraries( "${PROJECT_NAME}" libi2pd i2pdclient ${DL_LIB} ${Boost_LIBRARIES} ${OPENSSL_LIBRARIES} ${ZLIB_LIBRARY} ${CMAKE_THREAD_LIBS_INIT} ${MINGW_EXTRA} ${DL_LIB})
+ 
+   install(TARGETS "${PROJECT_NAME}" RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT Runtime)
+   set (APPS "\${CMAKE_INSTALL_PREFIX}/bin/${PROJECT_NAME}${CMAKE_EXECUTABLE_SUFFIX}")
diff --git a/net-misc/i2pd/i2pd-2.9.0.ebuild b/net-misc/i2pd/i2pd-2.9.0-r1.ebuild
similarity index 95%
rename from net-misc/i2pd/i2pd-2.9.0.ebuild
rename to net-misc/i2pd/i2pd-2.9.0-r1.ebuild
index 27c574b7929b..a864fb540317 100644
--- a/net-misc/i2pd/i2pd-2.9.0.ebuild
+++ b/net-misc/i2pd/i2pd-2.9.0-r1.ebuild
@@ -35,7 +35,8 @@ CMAKE_USE_DIR="${S}/build"
 
 DOCS=( README.md docs/i2pd.conf debian/tunnels.conf debian/subscriptions.txt )
 
-PATCHES=( "${FILESDIR}/${PN}-2.5.1-fix_installed_components.patch" )
+PATCHES=( "${FILESDIR}/i2pd-2.9.0-static.patch" \
+	"${FILESDIR}/${PN}-2.5.1-fix_installed_components.patch" )
 
 src_configure() {
 	mycmakeargs=(