diff options
| author |   Alexey Korepanov <kaikaikai@yandex.ru> | 2019-05-22 00:10:23 +0100 |
|---|---|---|
| committer |   Michał Górny <mgorny@gentoo.org> | 2019-06-06 19:11:05 +0200 |
| commit | 4246473bb004e13e13f1f0b79c9a612dfa881836 (patch) | |
| tree | fa6cf946bf82d87ecce2f9bc05c2af678abc7367 /net-vpn/i2pd/files | |
| parent | net-vpn/i2pd: add proxy maintainers project (diff) | |
| download | gentoo-4246473bb004e13e13f1f0b79c9a612dfa881836.tar.gz gentoo-4246473bb004e13e13f1f0b79c9a612dfa881836.tar.bz2 gentoo-4246473bb004e13e13f1f0b79c9a612dfa881836.zip | |
net-vpn/i2pd: bump EAPI to 7
Signed-off-by: Alexey Korepanov <kaikaikai@yandex.ru>
Closes: https://github.com/gentoo/gentoo/pull/11998
Signed-off-by: Michał Górny <mgorny@gentoo.org>
Diffstat (limited to 'net-vpn/i2pd/files')
| -rw-r--r-- | net-vpn/i2pd/files/i2pd-2.25.0-lib-path.patch | 22 | ||||
| -rw-r--r-- | net-vpn/i2pd/files/i2pd-2.25.0-link.patch | 13 |
2 files changed, 35 insertions, 0 deletions
diff --git a/net-vpn/i2pd/files/i2pd-2.25.0-lib-path.patch b/net-vpn/i2pd/files/i2pd-2.25.0-lib-path.patch new file mode 100644 index 000000000000..af0590be32f7 --- /dev/null +++ b/net-vpn/i2pd/files/i2pd-2.25.0-lib-path.patch @@ -0,0 +1,22 @@ +diff --git a/build/CMakeLists.txt b/build/CMakeLists.txt +index 949f6a46..a6d29990 100644 +--- a/build/CMakeLists.txt ++++ b/build/CMakeLists.txt +@@ -103,8 +103,6 @@ set_target_properties(libi2pd PROPERTIES PREFIX "") + if (WITH_LIBRARY) + install(TARGETS libi2pd + EXPORT libi2pd +- ARCHIVE DESTINATION lib +- LIBRARY DESTINATION lib + COMPONENT Libraries) + # TODO Make libi2pd available to 3rd party projects via CMake as imported target + # FIXME This pulls stdafx +@@ -135,8 +133,6 @@ set_target_properties(libi2pdclient PROPERTIES PREFIX "") + if (WITH_LIBRARY) + install(TARGETS libi2pdclient + EXPORT libi2pdclient +- ARCHIVE DESTINATION lib +- LIBRARY DESTINATION lib + COMPONENT Libraries) + endif() + diff --git a/net-vpn/i2pd/files/i2pd-2.25.0-link.patch b/net-vpn/i2pd/files/i2pd-2.25.0-link.patch new file mode 100644 index 000000000000..52c5dc745273 --- /dev/null +++ b/net-vpn/i2pd/files/i2pd-2.25.0-link.patch @@ -0,0 +1,13 @@ +diff --git a/build/CMakeLists.txt b/build/CMakeLists.txt +index e50bbc865..949f6a46e 100644 +https://github.com/PurpleI2P/i2pd/issues/1353 +--- a/build/CMakeLists.txt ++++ b/build/CMakeLists.txt +@@ -470,6 +470,7 @@ if (WITH_BINARY) + if (WITH_STATIC) + set(DL_LIB ${CMAKE_DL_LIBS}) + endif() ++ target_link_libraries(libi2pd ${Boost_LIBRARIES} ${ZLIB_LIBRARY}) + target_link_libraries( "${PROJECT_NAME}" libi2pd libi2pdclient ${DL_LIB} ${Boost_LIBRARIES} ${OPENSSL_LIBRARIES} ${ZLIB_LIBRARY} ${CMAKE_THREAD_LIBS_INIT} ${MINGW_EXTRA} ${DL_LIB} ${CMAKE_REQUIRED_LIBRARIES}) + + install(TARGETS "${PROJECT_NAME}" RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT Runtime) |