Fix mtd-utils build and bump msmtp and nano on CI

This commit is contained in:
Butta 2020-08-25 00:19:52 +05:30
parent 7efb0fb6f9
commit 094ad5be38
3 changed files with 3 additions and 2 deletions

View File

@ -1,4 +1,4 @@
--- ../tools.c.orig 2020-08-01 05:02:12.989413738 +0200
--- a/tools.c.orig 2020-08-01 05:02:12.989413738 +0200
+++ ./src/tools.c 2020-08-01 05:02:39.633413719 +0200
@@ -345,7 +345,7 @@
#ifdef SYSCONFDIR

View File

@ -6,3 +6,4 @@ TERMUX_PKG_SRCURL=ftp://ftp.infradead.org/pub/mtd-utils/mtd-utils-$TERMUX_PKG_VE
TERMUX_PKG_SHA256=8ad4c5f34716d40646aa28724a2f5616d325a6f119254f914e26976f1f76e9d6
TERMUX_PKG_DEPENDS="openssl, liblzo, libuuid, zlib, zstd"
TERMUX_PKG_BUILD_IN_SRC=true
TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--without-ubifs"

View File

@ -17,7 +17,7 @@ TERMUX_PKG_RM_AFTER_INSTALL="bin/rnano share/man/man1/rnano.1 share/nano/man-htm
termux_step_pre_configure() {
LDFLAGS+=" -landroid-glob"
if $TERMUX_DEBUG; then
# When doing debug build, -D_FORTIFY_SOURCE=2 gives this error:
#When doing debug build, -D_FORTIFY_SOURCE=2 gives this error:
# /home/builder/.termux-build/_lib/16-aarch64-21-v3/bin/../sysroot/usr/include/bits/fortify/string.h:79:26: error: use of undeclared identifier '__USE_FORTIFY_LEVEL'
export CFLAGS=${CFLAGS/-D_FORTIFY_SOURCE=2/}
fi