Skip to content

Commit 4a73827

Browse files
fix(main/e2fsprogs): enable libarchive support
Fixes #24127
1 parent 36e44a3 commit 4a73827

File tree

2 files changed

+15
-2
lines changed

2 files changed

+15
-2
lines changed

packages/e2fsprogs/build.sh

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,13 @@ TERMUX_PKG_LICENSE="GPL-2.0, LGPL-2.0"
44
TERMUX_PKG_LICENSE_FILE="NOTICE"
55
TERMUX_PKG_MAINTAINER="@termux"
66
TERMUX_PKG_VERSION="1.47.2"
7+
TERMUX_PKG_REVISION=1
78
TERMUX_PKG_SRCURL=https://www.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v$TERMUX_PKG_VERSION/e2fsprogs-$TERMUX_PKG_VERSION.tar.xz
89
TERMUX_PKG_SHA256=08242e64ca0e8194d9c1caad49762b19209a06318199b63ce74ae4ef2d74e63c
910
TERMUX_PKG_AUTO_UPDATE=true
1011
TERMUX_PKG_CONFFILES="etc/mke2fs.conf"
1112
TERMUX_PKG_NO_STATICSPLIT=true
12-
TERMUX_PKG_DEPENDS="libblkid, libuuid"
13+
TERMUX_PKG_DEPENDS="libarchive, libblkid, libuuid"
1314
TERMUX_PKG_BREAKS="e2fsprogs-dev"
1415
TERMUX_PKG_REPLACES="e2fsprogs-dev"
1516

@@ -23,7 +24,9 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
2324
--disable-libuuid
2425
--disable-libblkid
2526
--disable-uuidd
26-
--with-crond_dir=${TERMUX_PREFIX}/etc/cron.d"
27+
--with-crond_dir=${TERMUX_PREFIX}/etc/cron.d
28+
--with-libarchive
29+
"
2730

2831
# Remove com_err.h to avoid conflicting with krb5-dev:
2932
TERMUX_PKG_RM_AFTER_INSTALL="
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
+++ ./misc/create_inode_libarchive.c
2+
@@ -88,7 +88,7 @@
3+
#if defined(__FreeBSD__)
4+
#define LIBARCHIVE_SO "libarchive.so.7"
5+
#else
6+
-#define LIBARCHIVE_SO "libarchive.so.13"
7+
+#define LIBARCHIVE_SO "libarchive.so"
8+
#endif
9+
10+
static int libarchive_available(void)

0 commit comments

Comments
 (0)