* [gentoo-commits] repo/gentoo:master commit in: net-libs/libbitcoinconsensus/files/, net-libs/libbitcoinconsensus/
@ 2016-07-01 23:28 Anthony G. Basile
0 siblings, 0 replies; 3+ messages in thread
From: Anthony G. Basile @ 2016-07-01 23:28 UTC (permalink / raw
To: gentoo-commits
commit: 2c978e47a95b4cdc14e5cacff5617607979dacb0
Author: Luke Dashjr <luke-jr+git <AT> utopios <DOT> org>
AuthorDate: Fri Jul 1 17:27:37 2016 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Fri Jul 1 23:31:39 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2c978e47
Bugfix: net-libs/libbitcoinconsensus-0.12.0: Build without univalue
Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org>
.../files/0.12.0-no_univalue.patch | 35 ++++++++++++++++++++++
.../libbitcoinconsensus-0.12.0.ebuild | 6 ++++
2 files changed, 41 insertions(+)
diff --git a/net-libs/libbitcoinconsensus/files/0.12.0-no_univalue.patch b/net-libs/libbitcoinconsensus/files/0.12.0-no_univalue.patch
new file mode 100644
index 0000000..c6d8f63
--- /dev/null
+++ b/net-libs/libbitcoinconsensus/files/0.12.0-no_univalue.patch
@@ -0,0 +1,35 @@
+From c0251eab760f00fa9515fdf7b13c5ac28e37f0f9 Mon Sep 17 00:00:00 2001
+From: Luke Dashjr <luke-jr+git@utopios.org>
+Date: Thu, 30 Jun 2016 01:51:09 +0000
+Subject: [PATCH] Bugfix: Allow building libbitcoinconsensus without any
+ univalue
+
+---
+ configure.ac | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
+diff --git a/configure.ac b/configure.ac
+index 24f9f09..a23c645 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -750,6 +750,10 @@ fi
+
+ dnl univalue check
+
++if test x$build_bitcoin_cli$build_bitcoin_tx$build_bitcoind$bitcoin_enable_qt$use_tests$use_bench = xnononononono; then
++ system_univalue=yes
++else
++
+ if test x$system_univalue != xno ; then
+ found_univalue=no
+ if test x$use_pkgconfig = xyes; then
+@@ -782,6 +786,9 @@ if test x$system_univalue = xno ; then
+ UNIVALUE_CFLAGS='-I$(srcdir)/univalue/include'
+ UNIVALUE_LIBS='univalue/libunivalue.la'
+ fi
++
++fi
++
+ AM_CONDITIONAL([EMBEDDED_UNIVALUE],[test x$system_univalue = xno])
+ AC_SUBST(UNIVALUE_CFLAGS)
+ AC_SUBST(UNIVALUE_LIBS)
diff --git a/net-libs/libbitcoinconsensus/libbitcoinconsensus-0.12.0.ebuild b/net-libs/libbitcoinconsensus/libbitcoinconsensus-0.12.0.ebuild
index 2a45987..5b8dc1e 100644
--- a/net-libs/libbitcoinconsensus/libbitcoinconsensus-0.12.0.ebuild
+++ b/net-libs/libbitcoinconsensus/libbitcoinconsensus-0.12.0.ebuild
@@ -16,6 +16,12 @@ LICENSE="MIT"
SLOT="0"
KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+src_prepare() {
+ bitcoincore_prepare
+ epatch "${FILESDIR}/${PV}-no_univalue.patch"
+ bitcoincore_autoreconf
+}
+
src_configure() {
bitcoincore_conf \
--with-libs
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-libs/libbitcoinconsensus/files/, net-libs/libbitcoinconsensus/
@ 2017-01-24 1:17 Andreas Sturmlechner
0 siblings, 0 replies; 3+ messages in thread
From: Andreas Sturmlechner @ 2017-01-24 1:17 UTC (permalink / raw
To: gentoo-commits
commit: ef1b16c65ae9e33470c078cfe596edb3095ba55c
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 22 21:09:46 2017 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Jan 24 01:17:25 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ef1b16c6
net-libs/libbitcoinconsensus: Drop old
Package-Manager: portage-2.3.0
net-libs/libbitcoinconsensus/Manifest | 16 -----
.../files/0.12.0-no_univalue.patch | 35 -----------
.../files/bugfix_bench_checks.patch | 69 ----------------------
.../libbitcoinconsensus-0.10.0.ebuild | 25 --------
.../libbitcoinconsensus-0.10.1.ebuild | 25 --------
.../libbitcoinconsensus-0.11.0.ebuild | 26 --------
.../libbitcoinconsensus-0.11.1.ebuild | 27 ---------
.../libbitcoinconsensus-0.11.2.ebuild | 27 ---------
.../libbitcoinconsensus-0.12.0.ebuild | 35 -----------
.../libbitcoinconsensus-0.12.1.ebuild | 29 ---------
.../libbitcoinconsensus-0.13.0.ebuild | 28 ---------
net-libs/libbitcoinconsensus/metadata.xml | 5 --
12 files changed, 347 deletions(-)
diff --git a/net-libs/libbitcoinconsensus/Manifest b/net-libs/libbitcoinconsensus/Manifest
index 5a77ef5..d8e0329 100644
--- a/net-libs/libbitcoinconsensus/Manifest
+++ b/net-libs/libbitcoinconsensus/Manifest
@@ -1,20 +1,4 @@
-DIST bitcoin-0.10.0.ljr20150311.patches.tar.xz 34836 SHA256 353b82a933d234daaaed3f807f940a701646c7c9669867fbf5cdb48a1065312c SHA512 dc2a24f141d591f288e846f29a3263dea463f77dda22b92f91e781a8500c695be8b6f497251b6c960e1acdf43e839a7f0bc06fb7a18cdbda90b3d6a61f21c4af WHIRLPOOL 3b898c529e7967750dabcbb235657c19bab0ce75b6f47017ae7bdc7943acb8001cc19eff2d319e1ad405037ecf0674759a575116b1b0c1f32fde89a98f0052a3
-DIST bitcoin-0.10.1.ljr20150428.patches.tar.xz 34980 SHA256 f3770c478bd541fcc75c1f64664ae810aa67da7535f11859034dcc7067546713 SHA512 edf7c8aa81c8890da61224eddde61cec62058514fa76a50ab25cc7db272f6c656f5c46f8b9468f6059eb7c1be624de834867c0a7c1c2559a5231b763e40c13a2 WHIRLPOOL 2b8d878bf3d599393da177403e2199e63bb2634d14438079b5c8821c07441e26fb8b5cd150281c9923534f474763d9f3c2cab9424ab7a319de059c1b3bb49c4e
-DIST bitcoin-0.11.0.ljr20150711.patches.tar.xz 79740 SHA256 2f9608ee18f10fccaeda239baf82fd74180a562eb92aec72f7959c7211228bbb SHA512 cafa5cf0b7a56894b07e949bb401016c46456f6043da86f54023f930e9836a420c88ca9e94067edcf2150495cb637b1938478332f7f7669394ea90351f3b4623 WHIRLPOOL 1bab46c50b7bc8709359ea98a9a75f4b476dd81540421f6696b4085f4acf8fd3d040e591230df1f83625ada89d0d178040f747ae02f76d1dd73787c86e73dac4
-DIST bitcoin-0.11.1.ljr20150921.patches.tar.xz 85116 SHA256 b8f7912a90f74dbd710f769e2d5df79ad494caef98a34ddd08496870d8826cd8 SHA512 f428fbd726cba8f82a0afe1dd09bed477896c7186770eb0da53e12f342d5dc260419c2c216d8fdad5038a18d88ca746b9c275d50659fbefc6d2b456ce8e5aade WHIRLPOOL de1a89142bcb2a6df11466cc497ff6d6d599cdca909c14b713dd5579e243fb27fdd0baeb3de4205645fa34bf403cc3b3d50137a45be62955382f038146586c3a
-DIST bitcoin-0.11.2.ljr20151118.patches.tar.xz 98552 SHA256 de44c8604de476d282820c2419ccbba3bef3eb054887cdd16b0ab4e7ff450dcb SHA512 283d0b6550fa1c6d2347e146c350b2afb9d7ca0c2e8ad150a8dcb6c0522abd17ca31ba8dcdee7e2d7020561be6e8bdc9bd33f7d21e7901ca675ff990441a97ef WHIRLPOOL 24f25ba32d1c22e1e795aba13e202af661b9e23992b633382cdd62953d744862901494726c36075eb0ae186bd6e60e4c15148e0f46a2401efffa1b419b4d2390
-DIST bitcoin-0.12.0.knots20160226.rc1.patches.tar.xz 145776 SHA256 93431aa2c1d66c41d52bbf8810df27228f5a0823db2416312d6e07a20dc78dea SHA512 042c02dc64591f4edbad1cc421ee90e84d628f93292fd42b190728960a65eb76d0234d821ce2df92a3a66328a5368b5b42670ebf130045d92d74d74287a90990 WHIRLPOOL b4543468936c6e16a8636c2eaed1d6f76a20958c2f2fda6f9c6a389cc79111369d906c08878e3eb7b2d6bad8299e3e16ad38a190dab80996f63adfda8c1c93f2
-DIST bitcoin-0.12.1.knots20160629.rc2.patches.tar.xz 283700 SHA256 9bc8ff0946dfcd10d82b0f9ce3b509b23da244cddc3707013a9a8eebe64df1af SHA512 25860908625d8e501e079e0cbb946432ca086edcacdcb59dc81d49eac309bfb70e4c4701aeb0d45cd51ffbebead4f211590b4870dff22c2886c949fd8e600643 WHIRLPOOL da6c35551e87da57a4d0d67ee12e239638b02b634c4fc2c08912a1b56dd6348f595929af03719238d7bfc8f4e490b39672cc7671ec1c84f8c36b77a8f37fe643
-DIST bitcoin-0.13.0.knots20160814.patches.tar.xz 128520 SHA256 be92292d55e624ce8494210a51d6228f20d3f7b5ee2faf4185ba326a5f18fd30 SHA512 6a02c8bdfbf4373b6e6cff6ebbfe70e71121caae50e39b68e7e73b3dbe83b5717a03710c4a444ed9b5b9d09aee9494affcf52b86f1b05987d16953324d954ca2 WHIRLPOOL c41dbadc730f1b8df2244dd294c63a1989ebaf4bc2057435eeb0743555345a6158c36b34589427c22eb717af9358096fb6ab3dd851fffc5cafafa76c812b7fd8
DIST bitcoin-0.13.1.knots20161027.patches.tar.xz 386532 SHA256 b3242fa3bf7959de31aba47b4124e582d0a3d2924a5fe48f91676ef586a5d2f0 SHA512 de4fee50bb6fcf416f4d0d52283ae4b80fd06a544e9312808bec167b471bc1a20d6ded1ebba92cef937b2bd7ebae19c5c1153d6a10dad40cba4fb6c0a98b4fb6 WHIRLPOOL 768d3d1fdfe15d5d36d3d724224e3e33da5292764b3264bba89e3186e03d05cf57e957c071850bacc0fb49c7aae6cfd01bb649ffd82acfa4cfe695ef4b7e3b43
DIST bitcoin-0.13.2.knots20170102.patches.tar.xz 434012 SHA256 837dbc5a69a25a844681971e3b5bc22c93655e893fc579094556c10bc038488a SHA512 a19b9d469ff03396375c6f97e3e1f7f24243518e4ca46390bc33debbe5c09dffc8ee8fff4d656b385e38ef0c70e46a474170fd377b8cb94d6cdc2ff58114b061 WHIRLPOOL a5eaf1076eae2162d672ad705e8085e7034e163095d0645cd3ee522a11062fba8928a2d2dad94bda28538698f61fe46b3501fe978ff7940237e3f6895eafa6ae
-DIST bitcoin-v0.10.0.tgz 5022212 SHA256 ecff92e184fac4a96684085590a67554a27db72d0ac235b7cc054887644c0b70 SHA512 f362a9d4ba405c02b2d01024a61b68f984dd6e441ef2254d05bf65cfe803c8b084bd3b14a76a3472251d96087e450091f95f26a691c248836c6d0b43dece8255 WHIRLPOOL 2185413c6d073b0dcb30001c8fb56301390206680ffc6d705ed99e102e68e5c4c1d08c495c38703631696fa9a4a3784befd71acfbec0e94b164bbbfde76158c3
-DIST bitcoin-v0.10.1.tgz 5053846 SHA256 51bff5ba2372ca53782c5fec3d9b4b4226e94b5ac0b1b4b2b5949b97082af256 SHA512 f89330b93f22ba5f393c9a7a48ce28196be0e16468e5d99c459e889c458cc3a7c3f6e4537996571aa8ccb0ebb2eedf80ad028da136a2e08e2f8631f69ac5f2fc WHIRLPOOL 0cfb182f355151cde75601d2260cc92801e2dc1231ae2fca67610e699bb5f0cae826b09f456ca8afa283730954f11a8b180f43ae5a5297d129093fc0f9f53b4e
-DIST bitcoin-v0.11.0.tgz 5898627 SHA256 a52cb63e96a13626243c78662ea659c90277728b8f40d27846e82fdf81ce58e3 SHA512 bf1e05e115ecc375bfe9e342bf65db74784926e599a05f42f33b43781775d0469826228876269fcdc8a469bce45cb3dd4513e1f9dda5d36cc40adbb9aaf6f054 WHIRLPOOL ca2f3feb9815ad9bfac0b573bc0a3a7bb55bb7467724d84a6baf6a469983625727bb0fd01722a0be74e2df0a29833aadc152d036819be660270733b57089e9bf
-DIST bitcoin-v0.11.1.tgz 5945124 SHA256 3b6907c70a0d79823e873f9212f253b5abc96c61859d9686d102a1a08be8febc SHA512 8c4acf0386a5a17525ac4fa5ecfb66ff13fde65052b4aeba9f847344c9149ddff2af81323b6b9a675ea9fdc76f654546f96725a7fb80a9e4aa545f5ede17ee63 WHIRLPOOL 4f4984d8a4af5604a47dc0c5538b35a9233c09c0181929ca285bd89368044d11eb6be4eb376eaf1e9c695078deb243abdfb0bbd36a161ffdf043a5db0f424dcc
-DIST bitcoin-v0.11.2.tgz 5958338 SHA256 1adb0b5ea6dcbf9e3de9c6338b4f0d0abc6f72d8023ac5451370cdf43c9971c4 SHA512 0a76ca482c71e9a88e14e274d082bce796b2a9abd48d0fb40e41d169479ced144530825b36e1ab0953dac80b823607aaa8be52fe631f7df9a5062dc2a4bf4e66 WHIRLPOOL 9d8c98b45919e3323a27eacf1c0cc28d992bf7fe1cef9f738dab880e104613e8fb9184ecaa5ad3ea2234625254f3329c7ab5c939f6076d50b9f1ce970db85b9d
-DIST bitcoin-v0.12.0.tgz 6708553 SHA256 a5bac23b087c183821f06c19947cba2399ced09ee2b02c751ecbda9f808d8e33 SHA512 2c6bec18eed7b8145ee711ae143b425e08ed3243454083a1a91eb2a1f16abcac2a5e053f83c9ae840cbbdea3960856b613ba17d269d8b60706379744a4cf9f4b WHIRLPOOL bd159d52567a84a577c0581cdd8df02030c25b32ee44df26e1081b588cbddde0d951226c1c46e69077d2e2887c98874455f340bb3fe01bede85d044ef1bb02e8
-DIST bitcoin-v0.12.1.tgz 6755692 SHA256 3ff2947e956dcc52c37fc2302839ad2725cb68266a3542bd932e784a363d38c0 SHA512 27a795af8bd53238172c582f1310457d9895f8fdddfa37e9dc58e27e032d7a543fc8341985b5a25a339ff7a971654eac9cb56fd409acb8ec095769535cafcaf4 WHIRLPOOL 095840a3b326a2e644c41ff0711379a420650bd69a772329146f5cbf2ece7182c8929da467f217cafebbe48fbb987a20762b18d9500b632c57c81a95b8380d93
-DIST bitcoin-v0.13.0.tgz 5836862 SHA256 f7dfb156667c366390339773cf86efe3dda9318fd3a6d3c25bb0026b93d772af SHA512 ed49df78cab36ba30c83591724f1a21f7d2c49aa9cd5185ac09b52473aebcb7f406885d593cc7d99ffc87e3607bbeb8a7668a15a892fc6c654d31a5cfe3f53c1 WHIRLPOOL 3d03247795f37afd7a08543986d41df6b03d416993aee603637b5bae783bd6cfaf0521e264224e5d8e1b923ea7ce53e47a967ad72ec83a8982a995309aa98b62
DIST bitcoin-v0.13.1.tgz 5955845 SHA256 8523eb58fcbba68d07ccff0ce3a8878c3de9c9b532949d36dae56969bf3594e0 SHA512 396196fa5325b650c61b966820454712d7e6c3e7a61cb95bacab59a0b6257d113c60105393a2ad1c33623ae81026e15c7356433fd7bafe2888e6b961487259c3 WHIRLPOOL 6795bdd3d57b358c97ffa71f4dbfdae938500c0be190bdaf73829575f34d1a17443e34d71ddb1cae495640b01e8be3de8b8de490cd34ce6fe680c0069e9fd067
DIST bitcoin-v0.13.2.tgz 6088472 SHA256 f2148eef9ad1a938e2ca053d4ba5712f05245afbcff616e839011ec07324352a SHA512 2c053f1f55a426499e50cbadfccfd7c47be25fd10bb8e3d21fb6f408261c5a0c35f2745891e0eeb0fe953428337e40b6dc730499fcd3ba465315d592352833ca WHIRLPOOL fb25d8cc0360435f1a8c2eb3465911d080eecc9247cb8373ca73bf5bf8a1cce02028e9f0e86102d55049c7a1c164fd04d3e777976c3aa66a21ce5f9ff3d602eb
diff --git a/net-libs/libbitcoinconsensus/files/0.12.0-no_univalue.patch b/net-libs/libbitcoinconsensus/files/0.12.0-no_univalue.patch
deleted file mode 100644
index c6d8f63..00000000
--- a/net-libs/libbitcoinconsensus/files/0.12.0-no_univalue.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From c0251eab760f00fa9515fdf7b13c5ac28e37f0f9 Mon Sep 17 00:00:00 2001
-From: Luke Dashjr <luke-jr+git@utopios.org>
-Date: Thu, 30 Jun 2016 01:51:09 +0000
-Subject: [PATCH] Bugfix: Allow building libbitcoinconsensus without any
- univalue
-
----
- configure.ac | 7 +++++++
- 1 file changed, 7 insertions(+)
-
-diff --git a/configure.ac b/configure.ac
-index 24f9f09..a23c645 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -750,6 +750,10 @@ fi
-
- dnl univalue check
-
-+if test x$build_bitcoin_cli$build_bitcoin_tx$build_bitcoind$bitcoin_enable_qt$use_tests$use_bench = xnononononono; then
-+ system_univalue=yes
-+else
-+
- if test x$system_univalue != xno ; then
- found_univalue=no
- if test x$use_pkgconfig = xyes; then
-@@ -782,6 +786,9 @@ if test x$system_univalue = xno ; then
- UNIVALUE_CFLAGS='-I$(srcdir)/univalue/include'
- UNIVALUE_LIBS='univalue/libunivalue.la'
- fi
-+
-+fi
-+
- AM_CONDITIONAL([EMBEDDED_UNIVALUE],[test x$system_univalue = xno])
- AC_SUBST(UNIVALUE_CFLAGS)
- AC_SUBST(UNIVALUE_LIBS)
diff --git a/net-libs/libbitcoinconsensus/files/bugfix_bench_checks.patch b/net-libs/libbitcoinconsensus/files/bugfix_bench_checks.patch
deleted file mode 100644
index 7319875..00000000
--- a/net-libs/libbitcoinconsensus/files/bugfix_bench_checks.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-commit 789200f22b3aa744f6d0054a702e3f7ea6303db4
-Author: Luke Dashjr <luke-jr+git@utopios.org>
-Date: Tue Mar 1 14:14:29 2016 +0000
-
- Bugfix: Check for bench_bitcoin being enabled where needed, and skip UniValue dependency when unused
-
-diff --git a/configure.ac b/configure.ac
-index e4fc443..a289e13 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -570,7 +570,7 @@ BITCOIN_QT_INIT
- dnl sets $bitcoin_enable_qt, $bitcoin_enable_qt_test, $bitcoin_enable_qt_dbus
- BITCOIN_QT_CONFIGURE([$use_pkgconfig], [qt5])
-
--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_bitcoin_tx$build_bitcoind$bitcoin_enable_qt$use_tests$use_bench = xnononononono; then
- use_boost=no
- else
- use_boost=yes
-@@ -754,7 +754,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_utils$build_bitcoind$bitcoin_enable_qt$use_tests != xnononono; then
-+ if test x$build_bitcoin_utils$build_bitcoind$bitcoin_enable_qt$use_tests$use_bench != xnonononono; 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.)])
-@@ -779,7 +779,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_utils$build_bitcoind$bitcoin_enable_qt$use_tests != xnononono; then
-+ if test x$build_bitcoin_utils$build_bitcoind$bitcoin_enable_qt$use_tests$use_bench != xnonononono; 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
-@@ -810,6 +810,11 @@ fi
-
- dnl univalue check
-
-+AC_MSG_WARN([x$build_bitcoin_cli,$build_bitcoin_tx,$build_bitcoind,$bitcoin_enable_qt,$use_tests])
-+if test x$build_bitcoin_cli$build_bitcoin_tx$build_bitcoind$bitcoin_enable_qt$use_tests$use_bench = xnononononono; then
-+ system_univalue=yes
-+else
-+
- if test x$system_univalue != xno ; then
- found_univalue=no
- if test x$use_pkgconfig = xyes; then
-@@ -842,6 +847,8 @@ if test x$system_univalue = xno ; then
- UNIVALUE_CFLAGS='-I$(srcdir)/univalue/include'
- UNIVALUE_LIBS='univalue/libunivalue.la'
- fi
-+
-+fi
- AM_CONDITIONAL([EMBEDDED_UNIVALUE],[test x$system_univalue = xno])
- AC_SUBST(UNIVALUE_CFLAGS)
- AC_SUBST(UNIVALUE_LIBS)
-@@ -991,8 +998,8 @@ else
- AC_MSG_RESULT([no])
- fi
-
--if test x$build_bitcoin_cli$build_bitcoin_tx$build_bitcoin_libs$build_bitcoind$bitcoin_enable_qt$use_tests = xnononononono; then
-- AC_MSG_ERROR([No targets! Please specify at least one of: --with-utils --with-libs --with-daemon --with-gui or --enable-tests])
-+if test x$build_bitcoin_cli$build_bitcoin_tx$build_bitcoin_libs$build_bitcoind$bitcoin_enable_qt$use_tests$use_bench = xnonononononono; then
-+ AC_MSG_ERROR([No targets! Please specify at least one of: --with-utils --with-libs --with-daemon --with-gui --enable-tests or --enable-bench])
- fi
-
- AM_CONDITIONAL([TARGET_DARWIN], [test x$TARGET_OS = xdarwin])
diff --git a/net-libs/libbitcoinconsensus/libbitcoinconsensus-0.10.0.ebuild b/net-libs/libbitcoinconsensus/libbitcoinconsensus-0.10.0.ebuild
deleted file mode 100644
index 7cc6b5e..00000000
--- a/net-libs/libbitcoinconsensus/libbitcoinconsensus-0.10.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 2010-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-BITCOINCORE_COMMITHASH="047a89831760ff124740fe9f58411d57ee087078"
-BITCOINCORE_LJR_DATE="20150311"
-BITCOINCORE_IUSE="test"
-inherit bitcoincore eutils
-
-DESCRIPTION="Bitcoin Core consensus library"
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-
-src_configure() {
- bitcoincore_conf \
- --with-libs
-}
-
-src_install() {
- bitcoincore_src_install
- prune_libtool_files
-}
diff --git a/net-libs/libbitcoinconsensus/libbitcoinconsensus-0.10.1.ebuild b/net-libs/libbitcoinconsensus/libbitcoinconsensus-0.10.1.ebuild
deleted file mode 100644
index 0e8ac59..00000000
--- a/net-libs/libbitcoinconsensus/libbitcoinconsensus-0.10.1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 2010-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-BITCOINCORE_COMMITHASH="d8ac90184254fea3a7f4991fd0529dfbd750aea0"
-BITCOINCORE_LJR_DATE="20150428"
-BITCOINCORE_IUSE="test"
-inherit bitcoincore eutils
-
-DESCRIPTION="Bitcoin Core consensus library"
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-
-src_configure() {
- bitcoincore_conf \
- --with-libs
-}
-
-src_install() {
- bitcoincore_src_install
- prune_libtool_files
-}
diff --git a/net-libs/libbitcoinconsensus/libbitcoinconsensus-0.11.0.ebuild b/net-libs/libbitcoinconsensus/libbitcoinconsensus-0.11.0.ebuild
deleted file mode 100644
index 10f8dbf..00000000
--- a/net-libs/libbitcoinconsensus/libbitcoinconsensus-0.11.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 2010-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-BITCOINCORE_COMMITHASH="d26f951802c762de04fb68e1a112d611929920ba"
-BITCOINCORE_LJR_DATE="20150711"
-BITCOINCORE_IUSE="ljr test"
-inherit bitcoincore eutils
-
-DESCRIPTION="Bitcoin Core consensus library"
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-
-src_configure() {
- bitcoincore_conf \
- --with-libs
-}
-
-src_install() {
- bitcoincore_src_install
- dodoc doc/bips.md
- prune_libtool_files
-}
diff --git a/net-libs/libbitcoinconsensus/libbitcoinconsensus-0.11.1.ebuild b/net-libs/libbitcoinconsensus/libbitcoinconsensus-0.11.1.ebuild
deleted file mode 100644
index e7e0b22..00000000
--- a/net-libs/libbitcoinconsensus/libbitcoinconsensus-0.11.1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 2010-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-BITCOINCORE_COMMITHASH="cf33f196e79b1e61d6266f8e5190a0c4bfae7224"
-BITCOINCORE_LJR_DATE="20150921"
-BITCOINCORE_IUSE="ljr test"
-BITCOINCORE_POLICY_PATCHES="cltv dcmp"
-inherit bitcoincore eutils
-
-DESCRIPTION="Bitcoin Core consensus library"
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-
-src_configure() {
- bitcoincore_conf \
- --with-libs
-}
-
-src_install() {
- bitcoincore_src_install
- dodoc doc/bips.md
- prune_libtool_files
-}
diff --git a/net-libs/libbitcoinconsensus/libbitcoinconsensus-0.11.2.ebuild b/net-libs/libbitcoinconsensus/libbitcoinconsensus-0.11.2.ebuild
deleted file mode 100644
index bf74046..00000000
--- a/net-libs/libbitcoinconsensus/libbitcoinconsensus-0.11.2.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 2010-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-BITCOINCORE_COMMITHASH="7e278929df53e1fb4191bc5ba3176a177ce718bf"
-BITCOINCORE_LJR_DATE="20151118"
-BITCOINCORE_IUSE="ljr test"
-BITCOINCORE_POLICY_PATCHES="dcmp"
-inherit bitcoincore eutils
-
-DESCRIPTION="Bitcoin Core consensus library"
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-
-src_configure() {
- bitcoincore_conf \
- --with-libs
-}
-
-src_install() {
- bitcoincore_src_install
- dodoc doc/bips.md
- prune_libtool_files
-}
diff --git a/net-libs/libbitcoinconsensus/libbitcoinconsensus-0.12.0.ebuild b/net-libs/libbitcoinconsensus/libbitcoinconsensus-0.12.0.ebuild
deleted file mode 100644
index c4cfcce..00000000
--- a/net-libs/libbitcoinconsensus/libbitcoinconsensus-0.12.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2010-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-BITCOINCORE_COMMITHASH="188ca9c305d3dd0fb462b9d6a44048b1d99a05f3"
-BITCOINCORE_LJR_DATE="20160226"
-BITCOINCORE_LJR_PREV="rc1"
-BITCOINCORE_IUSE="test"
-BITCOINCORE_NEED_LIBSECP256K1=1
-BITCOINCORE_NO_DEPEND="libevent"
-inherit bitcoincore eutils
-
-DESCRIPTION="Bitcoin Core consensus library"
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-
-src_prepare() {
- bitcoincore_prepare
- epatch "${FILESDIR}/${PV}-no_univalue.patch"
- bitcoincore_autoreconf
-}
-
-src_configure() {
- bitcoincore_conf \
- --with-libs
-}
-
-src_install() {
- bitcoincore_src_install
- dodoc doc/bips.md
- prune_libtool_files
-}
diff --git a/net-libs/libbitcoinconsensus/libbitcoinconsensus-0.12.1.ebuild b/net-libs/libbitcoinconsensus/libbitcoinconsensus-0.12.1.ebuild
deleted file mode 100644
index 94327d2..00000000
--- a/net-libs/libbitcoinconsensus/libbitcoinconsensus-0.12.1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 2010-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-BITCOINCORE_COMMITHASH="9779e1e1f320a45255f2e81325f2feceec3fa944"
-BITCOINCORE_LJR_DATE="20160629"
-BITCOINCORE_LJR_PREV="rc2"
-BITCOINCORE_IUSE="test"
-BITCOINCORE_NEED_LIBSECP256K1=1
-BITCOINCORE_NO_DEPEND="libevent"
-inherit bitcoincore eutils
-
-DESCRIPTION="Bitcoin Core consensus library"
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-
-src_configure() {
- bitcoincore_conf \
- --with-libs
-}
-
-src_install() {
- bitcoincore_src_install
- dodoc doc/bips.md
- prune_libtool_files
-}
diff --git a/net-libs/libbitcoinconsensus/libbitcoinconsensus-0.13.0.ebuild b/net-libs/libbitcoinconsensus/libbitcoinconsensus-0.13.0.ebuild
deleted file mode 100644
index 78e8fbe..00000000
--- a/net-libs/libbitcoinconsensus/libbitcoinconsensus-0.13.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 2010-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-BITCOINCORE_COMMITHASH="a402396dce64c42ea73535b7dde4a9164d430438"
-BITCOINCORE_LJR_DATE="20160814"
-BITCOINCORE_IUSE="test"
-BITCOINCORE_NEED_LIBSECP256K1=1
-BITCOINCORE_NO_DEPEND="libevent"
-inherit bitcoincore eutils
-
-DESCRIPTION="Bitcoin Core consensus library"
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~x86 ~amd64-linux ~x86-linux"
-
-src_configure() {
- bitcoincore_conf \
- --with-libs
-}
-
-src_install() {
- bitcoincore_src_install
- dodoc doc/bips.md
- prune_libtool_files
-}
diff --git a/net-libs/libbitcoinconsensus/metadata.xml b/net-libs/libbitcoinconsensus/metadata.xml
index 1f18c29..ebea8b7 100644
--- a/net-libs/libbitcoinconsensus/metadata.xml
+++ b/net-libs/libbitcoinconsensus/metadata.xml
@@ -9,11 +9,6 @@
<email>luke-jr+gentoobugs@utopios.org</email>
<name>Luke Dashjr</name>
</maintainer>
- <use>
- <flag name="bitcoin_policy_cltv">Check LockTime Verify policy: Your node will recognise and assist OP_CHECKLOCKTIMEVERIFY (BIP65) transactions</flag>
- <flag name="bitcoin_policy_dcmp">Data Carrier Multi-Push policy: Your node will assist transactions with multiple pushes in their data carrier (if any)</flag>
- <flag name="ljr">Enable Luke Dashjr's patches</flag>
- </use>
<upstream>
<remote-id type="github">bitcoin/bitcoin</remote-id>
</upstream>
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-libs/libbitcoinconsensus/files/, net-libs/libbitcoinconsensus/
@ 2023-01-05 4:38 Sam James
0 siblings, 0 replies; 3+ messages in thread
From: Sam James @ 2023-01-05 4:38 UTC (permalink / raw
To: gentoo-commits
commit: 2cb57b28857e157cbce78d316ebc25588dbdebca
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 5 02:53:35 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Jan 5 04:37:45 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2cb57b28
net-libs/libbitcoinconsensus: add 24.0.1
Signed-off-by: Sam James <sam <AT> gentoo.org>
net-libs/libbitcoinconsensus/Manifest | 1 +
.../libbitcoinconsensus/files/24.0.1-syslibs.patch | 281 +++++++++++++++++++++
.../libbitcoinconsensus-24.0.1.ebuild | 94 +++++++
3 files changed, 376 insertions(+)
diff --git a/net-libs/libbitcoinconsensus/Manifest b/net-libs/libbitcoinconsensus/Manifest
index 0408f94aa093..c33fa9abf302 100644
--- a/net-libs/libbitcoinconsensus/Manifest
+++ b/net-libs/libbitcoinconsensus/Manifest
@@ -1,4 +1,5 @@
DIST bitcoin-0.21.0.knots20210130.patches.tar.xz 505040 BLAKE2B c8999de4158b8781bba6ad014ae14859f1e0bab3080c59a18910cf7447eb56da4b17a0e1843fdd3669d22636df9e4ddcc4526e4293bfd86dc884983a29a5f76c SHA512 7ee27da3d26be0e93ecddff7bb21ef1746bcdb07f9a2b0ea48065367b4c44391e974e04a21e511c05fca8f55971ab8e3c3ac01a3775cc52a537d9e10966d9871
DIST bitcoin-22.0.knots20211108.patches.tar.xz 1318256 BLAKE2B d6e56bc0ca1d706e99e7f42d8f335f016335b6bf3637c733d993696872f0a4c655cc58fc0394dfdf9916e13f0d7fbdcebf25fbdc9a165227e3c59133033644c0 SHA512 daab5860b7c7e137b6bf350cdc153e6e19172e49935640d1f6fe1f1be1e4df805b1db7fd30b0f95a560106956adab70cc6282fe933ae9de153cb971dd280f83d
+DIST bitcoin-24.0.1.tar.gz 11412628 BLAKE2B 2a8c83aecd12d8d40305d78ede1f389884ee62cfe4af39a9b416b8887a595f3393d599ebe9ddeb576bba5896923feb7ee45ba32d7d4cb0ce9e6d0ef39ecf83c7 SHA512 de1ddb543429f70b0b55a46500e0bc4807cca1b1655a28f8ab186d6f6e620f8cf82420bbdf412976ffed9bc6d742926b19933429c734edaf7430a4f8c37e1685
DIST bitcoin-v0.21.0.tar.gz 7533957 BLAKE2B 01247cbb9fca2381a8c08ab1c88c479c640963caef22e4207aab46b05813dbf2a5286ac9e98132fb34db0e9ac6c18c79e45a89de166f5c6d480d8ac6e14ecca2 SHA512 c58187996932b0151432a65885b7e8a7b216fb1ab0576fb7d4b5e9620d957594b05e181153e2e0e50bcd5ce764861ec11019ffbb1095d3e704f441e61ac6a04f
DIST bitcoin-v22.0.tar.gz 7977783 BLAKE2B ba212037bc8efcfbbbf6340c48ed886c4a5aa93e4a34097eafea39734a6f4e25fa6b174f894655f63c504380d8761657771795bfcc641018bf1f1661deef9321 SHA512 1b4b17360e97f390ae678adb7a239c359d3a1288799710683e26f09fc53341b6fca3211465fa3e4fdee37324d85ec1a31ffd1a3714e969df13441f755fa4b7ad
diff --git a/net-libs/libbitcoinconsensus/files/24.0.1-syslibs.patch b/net-libs/libbitcoinconsensus/files/24.0.1-syslibs.patch
new file mode 100644
index 000000000000..00404a2ff021
--- /dev/null
+++ b/net-libs/libbitcoinconsensus/files/24.0.1-syslibs.patch
@@ -0,0 +1,281 @@
+Originally based on 22.0-fix_build_without_leveldb.patch.
+
+- Allow system libsecp256k1
+- Allow system leveldb
+- Abort if runtime leveldb != compiled-against leveldb
+- Handle berkdb support being disabled better
+--- a/configure.ac
++++ b/configure.ac
+@@ -1362,6 +1362,23 @@ if test "$enable_fuzz_binary" = "yes"; then
+ CHECK_RUNTIME_LIB
+ fi
+
++dnl Check for libsecp256k1, only if explicitly requested
++AC_ARG_WITH([system-libsecp256k1],
++ [AS_HELP_STRING([--with-system-libsecp256k1],
++ [Build with system libsecp256k1 (default is no; DANGEROUS; NOT SUPPORTED)])],
++ [system_libsecp256k1=$withval],
++ [system_libsecp256k1=no]
++)
++if test x$system_libsecp256k1 != xno; then
++ PKG_CHECK_MODULES([libsecp256k1],[libsecp256k1],,[true])
++else
++ libsecp256k1_CFLAGS='-I$(srcdir)/secp256k1/include'
++ libsecp256k1_LIBS='secp256k1/libsecp256k1.la'
++fi
++AM_CONDITIONAL([EMBEDDED_LIBSECP256K1],[test x$system_libsecp256k1 = xno])
++AC_SUBST(libsecp256k1_CFLAGS)
++AC_SUBST(libsecp256k1_LIBS)
++
+ if test "$enable_wallet" != "no"; then
+ dnl Check for libdb_cxx only if wallet enabled
+ if test "$use_bdb" != "no"; then
+@@ -1413,11 +1430,76 @@ if test "$use_usdt" != "no"; then
+ fi
+ AM_CONDITIONAL([ENABLE_USDT_TRACEPOINTS], [test "$use_usdt" = "yes"])
+
++build_leveldb=yes
+ if test "$build_bitcoin_cli$build_bitcoin_tx$build_bitcoin_util$build_bitcoind$bitcoin_enable_qt$use_bench$use_tests" = "nonononononono"; then
+ use_upnp=no
+ use_natpmp=no
+ use_zmq=no
++ build_leveldb=no
++fi
++
++if test x$build_leveldb = xno; then
++ system_leveldb=no
++fi
++dnl Check for leveldb, only if explicitly requested
++if test x$system_leveldb != xno; then
++ build_leveldb=no
++ LEVELDB_CPPFLAGS=
++ AC_CHECK_LIB([leveldb],[main],[
++ LIBLEVELDB=-lleveldb
++ ],[
++ AC_MSG_ERROR([leveldb library not found; using --with-system-leveldb is not supported anyway])
++ ])
++ AC_CHECK_HEADER([leveldb/filter_policy.h],[],[
++ AC_MSG_ERROR([LevelDB headers not found; using --with-system-leveldb is not supported anyway])
++ ])
++ AC_CHECK_HEADER([leveldb/helpers/memenv.h],[
++ AC_MSG_CHECKING([for memenv.h path])
++ BITCOIN_SUBDIR_TO_INCLUDE([LEVELDB_CPPFLAGS],[leveldb/helpers/],[memenv])
++ ],[
++ AC_CHECK_HEADER([memenv.h],[],[
++ AC_MSG_ERROR([LevelDB headers not found; using --with-system-leveldb is not supported anyway])
++ ])
++ ])
++
++ AC_MSG_CHECKING([library containing leveldb::NewMemEnv])
++ TEMP_LIBS="$LIBS"
++ TEMP_CPPFLAGS="$CPPFLAGS"
++ CPPFLAGS="$CPPFLAGS $LEVELDB_CPPFLAGS"
++ for searchlib in "" "-lmemenv" ERR; do
++ if test "x$searchlib" = "xERR"; then
++ AC_MSG_RESULT([no])
++ AC_MSG_ERROR([LevelDB's memenv helper not found; using --with-system-leveldb is not supported anyway])
++ fi
++ searchlib="$searchlib $LIBLEVELDB"
++ LIBS="$searchlib $TEMP_LIBS"
++ AC_LINK_IFELSE([AC_LANG_SOURCE([
++ #include <leveldb/env.h>
++ #include <leveldb/helpers/memenv.h>
++
++ int main() {
++ leveldb::Env *myenv = leveldb::NewMemEnv(leveldb::Env::Default());
++ delete myenv;
++ }
++ ])],[
++ AC_MSG_RESULT([$searchlib])
++ LIBMEMENV="$searchlib"
++ break
++ ])
++ done
++ LIBS="$TEMP_LIBS"
++ CPPFLAGS="$TEMP_CPPFLAGS"
+ fi
++AM_CONDITIONAL([EMBEDDED_LEVELDB],[test x$build_leveldb = xyes])
++AC_SUBST(LEVELDB_CPPFLAGS)
++AC_SUBST(LIBLEVELDB)
++AC_SUBST(LIBMEMENV)
++AC_ARG_WITH([system-leveldb],
++ [AS_HELP_STRING([--with-system-leveldb],
++ [Build with system LevelDB (default is no; DANGEROUS; NOT SUPPORTED)])],
++ [system_leveldb=$withval],
++ [system_leveldb=no]
++)
+
+ dnl Check for libminiupnpc (optional)
+ if test "$use_upnp" != "no"; then
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -23,7 +23,7 @@ noinst_PROGRAMS =
+ TESTS =
+ BENCHMARKS =
+
+-BITCOIN_INCLUDES=-I$(builddir) -I$(srcdir)/$(MINISKETCH_INCLUDE_DIR_INT) -I$(srcdir)/secp256k1/include -I$(srcdir)/$(UNIVALUE_INCLUDE_DIR_INT) $(LEVELDB_CPPFLAGS)
++BITCOIN_INCLUDES=-I$(builddir) -I$(srcdir)/$(MINISKETCH_INCLUDE_DIR_INT) $(libsecp256k1_CFLAGS) -I$(srcdir)/$(UNIVALUE_INCLUDE_DIR_INT) $(BOOST_CPPFLAGS) $(LEVELDB_CPPFLAGS)
+
+ LIBBITCOIN_NODE=libbitcoin_node.a
+ LIBBITCOIN_COMMON=libbitcoin_common.a
+@@ -32,7 +32,11 @@ LIBBITCOIN_CLI=libbitcoin_cli.a
+ LIBBITCOIN_UTIL=libbitcoin_util.a
+ LIBBITCOIN_CRYPTO_BASE=crypto/libbitcoin_crypto_base.la
+ LIBBITCOINQT=qt/libbitcoinqt.a
++if EMBEDDED_LIBSECP256K1
+ LIBSECP256K1=secp256k1/libsecp256k1.la
++else
++LIBSECP256K1=$(libsecp256k1_LIBS)
++endif
+
+ if ENABLE_ZMQ
+ LIBBITCOIN_ZMQ=libbitcoin_zmq.a
+@@ -67,8 +71,10 @@ LIBBITCOIN_CRYPTO += $(LIBBITCOIN_CRYPTO_ARM_SHANI)
+ endif
+ noinst_LTLIBRARIES += $(LIBBITCOIN_CRYPTO)
+
++if EMBEDDED_LIBSECP256K1
+ $(LIBSECP256K1): $(wildcard secp256k1/src/*.h) $(wildcard secp256k1/src/*.c) $(wildcard secp256k1/include/*)
+ $(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C $(@D) $(@F)
++endif
+
+ # Make is not made aware of per-object dependencies to avoid limiting building parallelization
+ # But to build the less dependent modules first, we manually select their order here:
+@@ -1080,7 +1086,9 @@ endif
+ include Makefile.minisketch.include
+
+ include Makefile.crc32c.include
++if EMBEDDED_LEVELDB
+ include Makefile.leveldb.include
++endif
+
+ include Makefile.test_util.include
+ include Makefile.test_fuzz.include
+--- a/src/Makefile.test.include
++++ b/src/Makefile.test.include
+@@ -377,8 +377,9 @@ if ENABLE_BENCH
+ $(BENCH_BINARY) --sanity-check > /dev/null
+ endif
+ endif
++if EMBEDDED_LIBSECP256K1
+ $(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C secp256k1 check
+-
++endif
+ if ENABLE_TESTS
+ UNIVALUE_TESTS = univalue/test/object univalue/test/unitester
+ noinst_PROGRAMS += $(UNIVALUE_TESTS)
+--- a/src/dbwrapper.cpp
++++ b/src/dbwrapper.cpp
+@@ -7,26 +7,45 @@
+ #include <fs.h>
+ #include <logging.h>
+ #include <random.h>
++#include <node/interface_ui.h>
+ #include <tinyformat.h>
+ #include <util/strencodings.h>
+ #include <util/system.h>
++#include <util/translation.h>
+
+ #include <algorithm>
+ #include <cassert>
+ #include <cstdarg>
+ #include <cstdint>
+ #include <cstdio>
++#include <leveldb/c.h>
+ #include <leveldb/cache.h>
+ #include <leveldb/db.h>
+ #include <leveldb/env.h>
+ #include <leveldb/filter_policy.h>
+-#include <leveldb/helpers/memenv/memenv.h>
++#include <leveldb/helpers/memenv.h>
+ #include <leveldb/iterator.h>
+ #include <leveldb/options.h>
+ #include <leveldb/status.h>
+ #include <memory>
+ #include <optional>
+
++bool dbwrapper_SanityCheck()
++{
++ unsigned long header_version = (leveldb::kMajorVersion << 16) | leveldb::kMinorVersion;
++ unsigned long library_version = (leveldb_major_version() << 16) | leveldb_minor_version();
++
++ if (header_version != library_version) {
++ InitError(Untranslated(strprintf("Compiled with LevelDB %d.%d, but linked with LevelDB %d.%d (incompatible).",
++ leveldb::kMajorVersion, leveldb::kMinorVersion,
++ leveldb_major_version(), leveldb_minor_version()
++ )));
++ return false;
++ }
++
++ return true;
++}
++
+ class CBitcoinLevelDBLogger : public leveldb::Logger {
+ public:
+ // This code is adapted from posix_logger.h, which is why it is using vsprintf.
+--- a/src/dbwrapper.h
++++ b/src/dbwrapper.h
+@@ -31,6 +31,8 @@ class Env;
+ static const size_t DBWRAPPER_PREALLOC_KEY_SIZE = 64;
+ static const size_t DBWRAPPER_PREALLOC_VALUE_SIZE = 1024;
+
++bool dbwrapper_SanityCheck();
++
+ class dbwrapper_error : public std::runtime_error
+ {
+ public:
+--- a/src/kernel/checks.cpp
++++ b/src/kernel/checks.cpp
+@@ -3,9 +3,10 @@
+ // file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+ #include <kernel/checks.h>
+-
++#include <dbwrapper.h>
+ #include <key.h>
+ #include <random.h>
++#include <node/interface_ui.h>
+ #include <util/time.h>
+ #include <util/translation.h>
+
+@@ -15,6 +16,10 @@ namespace kernel {
+
+ std::optional<bilingual_str> SanityChecks(const Context&)
+ {
++ if (!dbwrapper_SanityCheck()) {
++ return Untranslated("Database sanity check failure. Aborting.");
++ }
++
+ if (!ECC_InitSanityCheck()) {
+ return Untranslated("Elliptic curve cryptography sanity check failure. Aborting.");
+ }
+--- a/src/qt/createwalletdialog.cpp
++++ b/src/qt/createwalletdialog.cpp
+@@ -12,6 +12,7 @@
+
+ #include <qt/guiutil.h>
+
++#include <QMessageBox>
+ #include <QPushButton>
+
+ CreateWalletDialog::CreateWalletDialog(QWidget* parent) :
+@@ -94,9 +95,16 @@ CreateWalletDialog::CreateWalletDialog(QWidget* parent) :
+ ui->external_signer_checkbox->setChecked(false);
+ #endif
+
+-#ifndef USE_BDB
+- ui->descriptor_checkbox->setEnabled(false);
+- ui->descriptor_checkbox->setChecked(true);
++#ifdef USE_BDB
++ connect(ui->buttonBox, &QDialogButtonBox::accepted, this, &QDialog::accept);
++#else
++ connect(ui->buttonBox, &QDialogButtonBox::accepted, [this]() {
++ if (!this->isDescriptorWalletChecked()) {
++ QMessageBox::critical(this, tr("Cannot create wallet"), tr("This build was compiled without BDB support, so only experimental descriptor wallets are supported."));
++ return;
++ }
++ this->accept();
++ });
+ #endif
+
+ #ifndef ENABLE_EXTERNAL_SIGNER
diff --git a/net-libs/libbitcoinconsensus/libbitcoinconsensus-24.0.1.ebuild b/net-libs/libbitcoinconsensus/libbitcoinconsensus-24.0.1.ebuild
new file mode 100644
index 000000000000..e0e4b8abae86
--- /dev/null
+++ b/net-libs/libbitcoinconsensus/libbitcoinconsensus-24.0.1.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools flag-o-matic
+
+DESCRIPTION="Bitcoin Core consensus library"
+HOMEPAGE="https://bitcoincore.org/"
+SRC_URI="
+ https://bitcoincore.org/bin/bitcoin-core-${PV}/bitcoin-${PV}.tar.gz
+"
+S="${WORKDIR}"/bitcoin-${PV}
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="+asm knots"
+# Tries to run test/test_bitcoin which isn't built as part of this package
+RESTRICT="test"
+
+RDEPEND=">=dev-libs/libsecp256k1-0.2.0:=[recovery,schnorr]"
+DEPEND="${RDEPEND}"
+
+DOCS=( doc/bips.md doc/release-notes.md doc/shared-libraries.md )
+
+PATCHES=(
+ "${FILESDIR}"/24.0.1-syslibs.patch
+)
+
+pkg_pretend() {
+ elog "You are building ${PN} from Bitcoin Core."
+ elog "For more information, see:"
+ elog "https://bitcoincore.org/en/releases/${PV}/"
+
+ if has_version "<${CATEGORY}/${PN}-0.21.1" ; then
+ ewarn "CAUTION: BITCOIN PROTOCOL CHANGE INCLUDED"
+ ewarn "This release adds enforcement of the Taproot protocol change to the Bitcoin"
+ ewarn "rules, beginning in November. Protocol changes require user consent to be"
+ ewarn "effective, and if enforced inconsistently within the community may compromise"
+ ewarn "your security or others! If you do not know what you are doing, learn more"
+ ewarn "before November. (You must make a decision either way - simply not upgrading"
+ ewarn "is insecure in all scenarios.)"
+ ewarn "To learn more, see https://bitcointaproot.cc"
+ fi
+
+ if [[ ${MERGE_TYPE} != "binary" ]] ; then
+ if ! test-flag-CXX -std=c++17 ; then
+ die "Building ${CATEGORY}/${P} requires at least GCC 7 or Clang 5"
+ fi
+ fi
+}
+
+src_prepare() {
+ default
+
+ eautoreconf
+
+ rm -r src/leveldb src/secp256k1 || die
+}
+
+src_configure() {
+ local myeconfargs=(
+ $(use_enable asm)
+ --without-qtdbus
+ --disable-ebpf
+ --without-natpmp
+ --without-qrencode
+ --without-miniupnpc
+ --disable-tests
+ --disable-wallet
+ --disable-zmq
+ --with-libs
+ --disable-util-cli
+ --disable-util-tx
+ --disable-util-util
+ --disable-util-wallet
+ --disable-bench
+ --without-daemon
+ --without-gui
+ --disable-fuzz
+ --disable-fuzz-binary
+ --disable-ccache
+ --with-system-libsecp256k1
+ )
+
+ econf "${myeconfargs[@]}"
+}
+
+src_install() {
+ default
+
+ find "${ED}" -name '*.la' -delete || die
+}
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2023-01-05 4:38 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-07-01 23:28 [gentoo-commits] repo/gentoo:master commit in: net-libs/libbitcoinconsensus/files/, net-libs/libbitcoinconsensus/ Anthony G. Basile
-- strict thread matches above, loose matches on Subject: below --
2017-01-24 1:17 Andreas Sturmlechner
2023-01-05 4:38 Sam James
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox