From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 5199C13832E for ; Tue, 16 Aug 2016 23:38:30 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8B71CE0AC3; Tue, 16 Aug 2016 23:38:26 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 18C92E0AC3 for ; Tue, 16 Aug 2016 23:38:26 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id BEBF9340A98 for ; Tue, 16 Aug 2016 23:38:24 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B2360245E for ; Tue, 16 Aug 2016 23:38:22 +0000 (UTC) From: "Anthony G. Basile" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Anthony G. Basile" Message-ID: <1471390666.d3e0e61cb52c7e845736cc1cf0c50a7bd47fa21e.blueness@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/i2pd/, net-misc/i2pd/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-misc/i2pd/files/i2pd-2.9.0-static.patch net-misc/i2pd/i2pd-2.9.0-r1.ebuild net-misc/i2pd/i2pd-2.9.0.ebuild X-VCS-Directories: net-misc/i2pd/files/ net-misc/i2pd/ X-VCS-Committer: blueness X-VCS-Committer-Name: Anthony G. Basile X-VCS-Revision: d3e0e61cb52c7e845736cc1cf0c50a7bd47fa21e X-VCS-Branch: master Date: Tue, 16 Aug 2016 23:38:22 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: b69a8b92-220f-47f8-9916-6af122a4a178 X-Archives-Hash: 5931c2cec572bebe4210ed6567cc1f34 commit: d3e0e61cb52c7e845736cc1cf0c50a7bd47fa21e Author: Alexey Korepanov yandex ru> AuthorDate: Tue Aug 16 15:28:03 2016 +0000 Commit: Anthony G. Basile gentoo org> CommitDate: Tue Aug 16 23:37:46 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d3e0e61c net-misc/i2pd: fix static build #591334 net-misc/i2pd/files/i2pd-2.9.0-static.patch | 25 ++++++++++++++++++++++ .../{i2pd-2.9.0.ebuild => i2pd-2.9.0-r1.ebuild} | 3 ++- 2 files changed, 27 insertions(+), 1 deletion(-) 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 0000000..c525db7 --- /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 +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 27c574b..a864fb5 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=(