diff --git a/packages/bitcoin/build.sh b/packages/bitcoin/build.sh index 07beda076..12c10fce4 100644 --- a/packages/bitcoin/build.sh +++ b/packages/bitcoin/build.sh @@ -5,64 +5,30 @@ TERMUX_PKG_VERSION=0.19.0.1 TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=https://github.com/bitcoin/bitcoin/archive/v$TERMUX_PKG_VERSION.tar.gz TERMUX_PKG_SHA256=1a72f583f7448b3808d84ed7f8d8eb224f44b51291fee774bb9cecbd4fcbaec7 -TERMUX_PKG_DEPENDS="boost, libevent, libzmq, miniupnpc" TERMUX_PKG_CONFFILES="var/service/bitcoind/run var/service/bitcoind/log/run" TERMUX_PKG_BUILD_IN_SRC=true TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" --disable-tests --with-daemon ---with-boost-chrono=boost_chrono ---with-boost-filesystem=boost_filesystem ---with-boost-system=boost_system ---with-boost-thread=boost_thread --with-gui=no ---with-miniupnpc --without-libs +--prefix=${TERMUX_PKG_SRCDIR}/depends/$TERMUX_HOST_PLATFORM +--bindir=$TERMUX_PREFIX/bin " termux_step_pre_configure() { - local db_version=4.8.30 - local db_install_dir=$TERMUX_PKG_BUILDDIR/db-install - local db_build_dir=$TERMUX_PKG_BUILDDIR/db-build - - termux_download https://download.oracle.com/berkeley-db/db-${db_version}.tar.gz \ - $TERMUX_PKG_CACHEDIR/db-${db_version}.tar.gz \ - e0491a07cdb21fb9aa82773bbbedaeb7639cbd0e7f96147ab46141e0045db72a - - tar xf $TERMUX_PKG_CACHEDIR/db-${db_version}.tar.gz - - cd $TERMUX_PKG_BUILDDIR/db-${db_version} - sed -i.old 's/__atomic_compare_exchange/__atomic_compare_exchange_db/' \ - dbinc/atomic.h - sed -i.old 's/atomic_init/atomic_init_db/' dbinc/atomic.h mp/mp_region.c \ - mp/mp_mvcc.c mp/mp_fget.c mutex/mut_method.c mutex/mut_tas.c - termux_step_replace_guess_scripts - - mkdir -p ${db_build_dir} - cd ${db_build_dir} - ../db-${db_version}/dist/configure \ - --host=$TERMUX_HOST_PLATFORM --prefix=${db_install_dir} \ - --disable-shared --enable-static --enable-hash --enable-smallbuild \ - --enable-compat185 --enable-cxx db_cv_atomic=gcc-builtin - make -j $TERMUX_MAKE_PROCESSES - make install_lib install_include - cd $TERMUX_PKG_BUILDDIR - - export BDB_CFLAGS="-I${db_install_dir}/include -DHAVE_CXX_STDHEADERS=1" - export BDB_LIBS="-L${db_install_dir}/lib -ldb_cxx" - - ./autogen.sh + (cd depends && make HOST=$TERMUX_HOST_PLATFORM NO_QT=1 -j $TERMUX_MAKE_PROCESSES) + ./autogen.sh } termux_step_post_make_install() { - mkdir -p $TERMUX_PREFIX/var/service - cd $TERMUX_PREFIX/var/service - mkdir -p bitcoind/log - echo "#!$TERMUX_PREFIX/bin/sh" > bitcoind/run - echo 'exec bitcoind 2>&1' >> bitcoind/run - chmod +x bitcoind/run - touch bitcoind/down - - ln -sf $TERMUX_PREFIX/share/termux-services/svlogger bitcoind/log/run + mkdir -p $TERMUX_PREFIX/var/service + cd $TERMUX_PREFIX/var/service + mkdir -p bitcoind/log + echo "#!$TERMUX_PREFIX/bin/sh" > bitcoind/run + echo 'exec bitcoind 2>&1' >> bitcoind/run + chmod +x bitcoind/run + touch bitcoind/down + ln -sf $TERMUX_PREFIX/share/termux-services/svlogger bitcoind/log/run } diff --git a/packages/bitcoin/libevent-version.patch b/packages/bitcoin/libevent-version.patch new file mode 100644 index 000000000..84023147e --- /dev/null +++ b/packages/bitcoin/libevent-version.patch @@ -0,0 +1,16 @@ +diff --git a/depends/packages/libevent.mk b/depends/packages/libevent.mk +index a3ade899b..66fc46c64 100644 +--- a/depends/packages/libevent.mk ++++ b/depends/packages/libevent.mk +@@ -1,9 +1,8 @@ + package=libevent +-$(package)_version=2.1.8-stable ++$(package)_version=2.1.11-stable + $(package)_download_path=https://github.com/libevent/libevent/archive/ + $(package)_file_name=release-$($(package)_version).tar.gz +-$(package)_sha256_hash=316ddb401745ac5d222d7c529ef1eada12f58f6376a66c1118eee803cb70f83d +- ++$(package)_sha256_hash=229393ab2bf0dc94694f21836846b424f3532585bac3468738b7bf752c03901e + define $(package)_preprocess_cmds + ./autogen.sh + endef