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 4D1D4138334 for ; Sun, 13 Jan 2019 03:18:13 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 130E8E0C41; Sun, 13 Jan 2019 03:18:12 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id C5D0DE0C41 for ; Sun, 13 Jan 2019 03:18:10 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 36B05335C8C for ; Sun, 13 Jan 2019 03:18:08 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 194354F5 for ; Sun, 13 Jan 2019 03:18:06 +0000 (UTC) From: "Craig Andrews" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Craig Andrews" Message-ID: <1547349438.4ccfcada730b9bb00f67968b7cf5d016800b6a6d.candrews@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/bitcoin-tx/files/, dev-util/bitcoin-tx/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-util/bitcoin-tx/bitcoin-tx-0.17.1.ebuild dev-util/bitcoin-tx/files/0.17.1-no-libevent.patch X-VCS-Directories: dev-util/bitcoin-tx/files/ dev-util/bitcoin-tx/ X-VCS-Committer: candrews X-VCS-Committer-Name: Craig Andrews X-VCS-Revision: 4ccfcada730b9bb00f67968b7cf5d016800b6a6d X-VCS-Branch: master Date: Sun, 13 Jan 2019 03:18:06 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 9e2b5e6e-cddd-46ac-9d62-3228164a88bb X-Archives-Hash: 0f9ded0fcb9958802d7ba38eec0f4457 commit: 4ccfcada730b9bb00f67968b7cf5d016800b6a6d Author: Luke Dashjr utopios org> AuthorDate: Sat Jan 12 13:46:11 2019 +0000 Commit: Craig Andrews gentoo org> CommitDate: Sun Jan 13 03:17:18 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4ccfcada dev-util/bitcoin-tx-0.17.1: Fix build without libevent Fixes: https://bugs.gentoo.org/675256 Signed-off-by: Luke Dashjr utopios.org> Signed-off-by: Craig Andrews gentoo.org> dev-util/bitcoin-tx/bitcoin-tx-0.17.1.ebuild | 2 ++ dev-util/bitcoin-tx/files/0.17.1-no-libevent.patch | 20 ++++++++++++++++++++ 2 files changed, 22 insertions(+) diff --git a/dev-util/bitcoin-tx/bitcoin-tx-0.17.1.ebuild b/dev-util/bitcoin-tx/bitcoin-tx-0.17.1.ebuild index a431bbafab7..4346aa02591 100644 --- a/dev-util/bitcoin-tx/bitcoin-tx-0.17.1.ebuild +++ b/dev-util/bitcoin-tx/bitcoin-tx-0.17.1.ebuild @@ -63,6 +63,8 @@ src_prepare() { mkdir -p src/obj || die echo "#define BUILD_SUFFIX gentoo${PVR#${PV}}" >src/obj/build.h || die + eapply "${FILESDIR}/${PV}-no-libevent.patch" + eautoreconf rm -r src/leveldb src/secp256k1 || die } diff --git a/dev-util/bitcoin-tx/files/0.17.1-no-libevent.patch b/dev-util/bitcoin-tx/files/0.17.1-no-libevent.patch new file mode 100644 index 00000000000..b0e4a954875 --- /dev/null +++ b/dev-util/bitcoin-tx/files/0.17.1-no-libevent.patch @@ -0,0 +1,20 @@ +--- a/configure.ac ++++ b/configure.ac +@@ -1101,7 +1101,7 @@ if test x$use_pkgconfig = xyes; then + if test x$use_qr != xno; then + BITCOIN_QT_CHECK([PKG_CHECK_MODULES([QR], [libqrencode], [have_qrencode=yes], [have_qrencode=no])]) + fi +- if test x$build_bitcoin_cli$build_bitcoin_tx$build_bitcoind$bitcoin_enable_qt$use_tests != xnonononono; then ++ if test x$build_bitcoin_cli$build_bitcoind$bitcoin_enable_qt$use_tests != xnononono; then + PKG_CHECK_MODULES([EVENT], [libevent],, [AC_MSG_ERROR(libevent not found.)]) + if test x$TARGET_OS != xwindows; then + PKG_CHECK_MODULES([EVENT_PTHREADS], [libevent_pthreads],, [AC_MSG_ERROR(libevent_pthreads not found.)]) +@@ -1126,7 +1126,7 @@ else + AC_CHECK_HEADER([openssl/ssl.h],, AC_MSG_ERROR(libssl headers missing),) + AC_CHECK_LIB([ssl], [main],SSL_LIBS=-lssl, AC_MSG_ERROR(libssl missing)) + +- if test x$build_bitcoin_cli$build_bitcoin_tx$build_bitcoind$bitcoin_enable_qt$use_tests != xnonononono; then ++ if test x$build_bitcoin_cli$build_bitcoind$bitcoin_enable_qt$use_tests != xnononono; then + AC_CHECK_HEADER([event2/event.h],, AC_MSG_ERROR(libevent headers missing),) + AC_CHECK_LIB([event],[main],EVENT_LIBS=-levent,AC_MSG_ERROR(libevent missing)) + if test x$TARGET_OS != xwindows; then