From 2a2dd65db0bf04f4c703ad83d81e85362426cfee Mon Sep 17 00:00:00 2001 From: Leonid Pliushch Date: Mon, 30 Nov 2020 02:56:24 +0200 Subject: [PATCH] moreutils: update to 0.64 --- packages/moreutils/build.sh | 5 ++--- packages/moreutils/fix-compiler.patch | 12 +++++------- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/packages/moreutils/build.sh b/packages/moreutils/build.sh index fbe69c49f..97a81856a 100644 --- a/packages/moreutils/build.sh +++ b/packages/moreutils/build.sh @@ -1,10 +1,9 @@ TERMUX_PKG_HOMEPAGE=http://joeyh.name/code/moreutils/ TERMUX_PKG_DESCRIPTION="A growing collection of the unix tools that nobody thought to write thirty years ago" TERMUX_PKG_LICENSE="GPL-2.0" -TERMUX_PKG_VERSION=0.63 -TERMUX_PKG_REVISION=1 +TERMUX_PKG_VERSION=0.64 TERMUX_PKG_SRCURL=http://ftp.debian.org/debian/pool/main/m/moreutils/moreutils_$TERMUX_PKG_VERSION.orig.tar.xz -TERMUX_PKG_SHA256=01f0b331e07e62c70d58c2dabbb68f5c4ddae4ee6f2d8f070fd1e316108af72c +TERMUX_PKG_SHA256=802ce261864d6f9985b56423af422fc5d5cb8e5226aaaf02a6522faa3035662c TERMUX_PKG_DEPENDS="perl" TERMUX_PKG_BUILD_IN_SRC=true diff --git a/packages/moreutils/fix-compiler.patch b/packages/moreutils/fix-compiler.patch index a8c723113..b7e7b25e5 100644 --- a/packages/moreutils/fix-compiler.patch +++ b/packages/moreutils/fix-compiler.patch @@ -1,14 +1,12 @@ -diff -uNr moreutils-0.63/is_utf8/Makefile moreutils-0.63.mod/is_utf8/Makefile ---- moreutils-0.63/is_utf8/Makefile 2019-01-09 17:14:34.000000000 +0200 -+++ moreutils-0.63.mod/is_utf8/Makefile 2020-01-03 20:49:32.066770922 +0200 -@@ -37,8 +37,8 @@ +diff -uNr moreutils-0.64/is_utf8/Makefile moreutils-0.64.mod/is_utf8/Makefile +--- moreutils-0.64/is_utf8/Makefile 2020-08-29 20:59:47.000000000 +0300 ++++ moreutils-0.64.mod/is_utf8/Makefile 2020-11-30 02:59:43.379944170 +0200 +@@ -37,7 +37,7 @@ SONAME = $(LINKERNAME).$(VERSION) REALNAME = $(SONAME).$(MINOR).$(RELEASE) -CC = gcc --CFLAGS = -O3 -Wextra -Wall -ansi -Wstrict-prototypes +CC ?= gcc -+CFLAGS += -Wextra -Wall -ansi -Wstrict-prototypes + CFLAGS ?= -O3 -Wextra -Wall -ansi -Wstrict-prototypes $(NAME): $(OBJ) - $(CC) $(CFLAGS) -o $(NAME) $(OBJ)