Gentoo Archives: gentoo-commits

From: Craig Andrews <candrews@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/bitcoin-tx/files/, dev-util/bitcoin-tx/
Date: Sun, 13 Jan 2019 03:18:13
Message-Id: 1547349438.4ccfcada730b9bb00f67968b7cf5d016800b6a6d.candrews@gentoo
1 commit: 4ccfcada730b9bb00f67968b7cf5d016800b6a6d
2 Author: Luke Dashjr <luke-jr+git <AT> utopios <DOT> org>
3 AuthorDate: Sat Jan 12 13:46:11 2019 +0000
4 Commit: Craig Andrews <candrews <AT> gentoo <DOT> org>
5 CommitDate: Sun Jan 13 03:17:18 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4ccfcada
7
8 dev-util/bitcoin-tx-0.17.1: Fix build without libevent
9
10 Fixes: https://bugs.gentoo.org/675256
11 Signed-off-by: Luke Dashjr <luke-jr+git <AT> utopios.org>
12 Signed-off-by: Craig Andrews <candrews <AT> gentoo.org>
13
14 dev-util/bitcoin-tx/bitcoin-tx-0.17.1.ebuild | 2 ++
15 dev-util/bitcoin-tx/files/0.17.1-no-libevent.patch | 20 ++++++++++++++++++++
16 2 files changed, 22 insertions(+)
17
18 diff --git a/dev-util/bitcoin-tx/bitcoin-tx-0.17.1.ebuild b/dev-util/bitcoin-tx/bitcoin-tx-0.17.1.ebuild
19 index a431bbafab7..4346aa02591 100644
20 --- a/dev-util/bitcoin-tx/bitcoin-tx-0.17.1.ebuild
21 +++ b/dev-util/bitcoin-tx/bitcoin-tx-0.17.1.ebuild
22 @@ -63,6 +63,8 @@ src_prepare() {
23 mkdir -p src/obj || die
24 echo "#define BUILD_SUFFIX gentoo${PVR#${PV}}" >src/obj/build.h || die
25
26 + eapply "${FILESDIR}/${PV}-no-libevent.patch"
27 +
28 eautoreconf
29 rm -r src/leveldb src/secp256k1 || die
30 }
31
32 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
33 new file mode 100644
34 index 00000000000..b0e4a954875
35 --- /dev/null
36 +++ b/dev-util/bitcoin-tx/files/0.17.1-no-libevent.patch
37 @@ -0,0 +1,20 @@
38 +--- a/configure.ac
39 ++++ b/configure.ac
40 +@@ -1101,7 +1101,7 @@ if test x$use_pkgconfig = xyes; then
41 + if test x$use_qr != xno; then
42 + BITCOIN_QT_CHECK([PKG_CHECK_MODULES([QR], [libqrencode], [have_qrencode=yes], [have_qrencode=no])])
43 + fi
44 +- if test x$build_bitcoin_cli$build_bitcoin_tx$build_bitcoind$bitcoin_enable_qt$use_tests != xnonononono; then
45 ++ if test x$build_bitcoin_cli$build_bitcoind$bitcoin_enable_qt$use_tests != xnononono; then
46 + PKG_CHECK_MODULES([EVENT], [libevent],, [AC_MSG_ERROR(libevent not found.)])
47 + if test x$TARGET_OS != xwindows; then
48 + PKG_CHECK_MODULES([EVENT_PTHREADS], [libevent_pthreads],, [AC_MSG_ERROR(libevent_pthreads not found.)])
49 +@@ -1126,7 +1126,7 @@ else
50 + AC_CHECK_HEADER([openssl/ssl.h],, AC_MSG_ERROR(libssl headers missing),)
51 + AC_CHECK_LIB([ssl], [main],SSL_LIBS=-lssl, AC_MSG_ERROR(libssl missing))
52 +
53 +- if test x$build_bitcoin_cli$build_bitcoin_tx$build_bitcoind$bitcoin_enable_qt$use_tests != xnonononono; then
54 ++ if test x$build_bitcoin_cli$build_bitcoind$bitcoin_enable_qt$use_tests != xnononono; then
55 + AC_CHECK_HEADER([event2/event.h],, AC_MSG_ERROR(libevent headers missing),)
56 + AC_CHECK_LIB([event],[main],EVENT_LIBS=-levent,AC_MSG_ERROR(libevent missing))
57 + if test x$TARGET_OS != xwindows; then