From 88facc1a95b7bb9ff9b110224074da65e877173e Mon Sep 17 00:00:00 2001 From: Henrik Grimler Date: Fri, 11 Feb 2022 07:49:24 +0100 Subject: [PATCH] btfs2: update to 2.0.2 --- packages/btfs2/build.sh | 21 +++++++--------- .../karalabe-usb-pthread_barrier.patch.diff | 24 ------------------- 2 files changed, 8 insertions(+), 37 deletions(-) delete mode 100644 packages/btfs2/karalabe-usb-pthread_barrier.patch.diff diff --git a/packages/btfs2/build.sh b/packages/btfs2/build.sh index 274d84d312..172354cbb7 100644 --- a/packages/btfs2/build.sh +++ b/packages/btfs2/build.sh @@ -3,27 +3,22 @@ TERMUX_PKG_DESCRIPTION="Decentralized file system integrating with TRON network TERMUX_PKG_LICENSE="Apache-2.0, MIT" TERMUX_PKG_LICENSE_FILE="LICENSE-APACHE, LICENSE-MIT" TERMUX_PKG_MAINTAINER="Simbad Marino " -TERMUX_PKG_VERSION=2.0.1 +TERMUX_PKG_VERSION=2.0.2 TERMUX_PKG_SRCURL=https://github.com/bittorrent/go-btfs/archive/refs/tags/btfs-v${TERMUX_PKG_VERSION}.tar.gz -TERMUX_PKG_SHA256=85a12f42339b41de4b0cd3096df93f654053836b164a4f92f482d315a4a353b2 +TERMUX_PKG_SHA256=81a80a66d4a328ea0a355a0f10e32c0821c6f79c7a39e310410de6c77ece5683 TERMUX_PKG_AUTO_UPDATE=true TERMUX_PKG_AUTO_UPDATE_TAG_REGEXP="\d+\.\d+\.\d+" TERMUX_PKG_BUILD_IN_SRC=true -termux_step_make() { +termux_step_pre_configure() { termux_setup_golang - make build || : - local _GOPATH=$(go env GOPATH) - pushd $_GOPATH/pkg/mod/github.com/karalabe/usb@* - local target=hidapi/libusb/hid.c - chmod 0755 $(dirname $target) - chmod 0644 $target - patch -p1 < $TERMUX_PKG_BUILDER_DIR/karalabe-usb-pthread_barrier.patch.diff - popd + export CGO_ENABLED=0 +} + +termux_step_make() { make build - mv $TERMUX_PKG_SRCDIR/cmd/btfs/btfs $TERMUX_PKG_SRCDIR/cmd/btfs/btfs2 } termux_step_make_install() { - install -Dm700 -t $TERMUX_PREFIX/bin $TERMUX_PKG_SRCDIR/cmd/btfs/btfs2 + install -m700 cmd/btfs/btfs $TERMUX_PREFIX/bin/btfs2 } diff --git a/packages/btfs2/karalabe-usb-pthread_barrier.patch.diff b/packages/btfs2/karalabe-usb-pthread_barrier.patch.diff deleted file mode 100644 index 683cefff87..0000000000 --- a/packages/btfs2/karalabe-usb-pthread_barrier.patch.diff +++ /dev/null @@ -1,24 +0,0 @@ -From e188e2d7eefa1a057a20921236f22a6008b29c93 Mon Sep 17 00:00:00 2001 -From: Fredrik Fornwall -Date: Thu, 12 Dec 2019 01:07:20 +0100 -Subject: [PATCH] Fix build when targetting Android 7 or later - -Support for pthread_barrier was introduced in Android 7, so trying to -build a custom implementation of that clashes with the system headers. ---- - hidapi/libusb/hid.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/hidapi/libusb/hid.c b/hidapi/libusb/hid.c -index 474dff4..dd6fd8c 100644 ---- a/hidapi/libusb/hid.c -+++ b/hidapi/libusb/hid.c -@@ -49,7 +49,7 @@ - - #include "hidapi.h" - --#ifdef __ANDROID__ -+#if defined(__ANDROID__) && __ANDROID_API__ < __ANDROID_API_N__ - - /* Barrier implementation because Android/Bionic don't have pthread_barrier. - This implementation came from Brent Priddy and was posted on