From 072781ed1c378ab6d4b7c81dfba4260af8838c69 Mon Sep 17 00:00:00 2001 From: Fredrik Fornwall Date: Sun, 15 Jul 2018 17:05:11 +0200 Subject: [PATCH] texinfo: Use patch instead of sed --- packages/texinfo/build.sh | 8 +++----- packages/texinfo/texindex-texindex.in.patch | 14 ++++++++++++++ 2 files changed, 17 insertions(+), 5 deletions(-) create mode 100644 packages/texinfo/texindex-texindex.in.patch diff --git a/packages/texinfo/build.sh b/packages/texinfo/build.sh index dd62be6aa..a103ba4fe 100644 --- a/packages/texinfo/build.sh +++ b/packages/texinfo/build.sh @@ -1,11 +1,9 @@ TERMUX_PKG_HOMEPAGE=https://www.gnu.org/software/texinfo/ TERMUX_PKG_DESCRIPTION="Documentation system for on-line information and printed output" TERMUX_PKG_VERSION=6.5 -TERMUX_PKG_SRCURL=https://mirrors.kernel.org/gnu/texinfo/texinfo-${TERMUX_PKG_VERSION}.tar.xz -TERMUX_PKG_SHA256=77774b3f4a06c20705cc2ef1c804864422e3cf95235e965b1f00a46df7da5f62 TERMUX_PKG_REVISION=1 +TERMUX_PKG_SHA256=77774b3f4a06c20705cc2ef1c804864422e3cf95235e965b1f00a46df7da5f62 +TERMUX_PKG_SRCURL=https://mirrors.kernel.org/gnu/txinfo/texinfo-${TERMUX_PKG_VERSION}.tar.xz +# gawk is used by texindex: TERMUX_PKG_DEPENDS="ncurses, perl, gawk" TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--disable-perl-xs" -termux_step_post_massage() { - sed -i 's/awk_binary="mawk"/awk_binary="gawk"/g' bin/texindex -} diff --git a/packages/texinfo/texindex-texindex.in.patch b/packages/texinfo/texindex-texindex.in.patch new file mode 100644 index 000000000..a24e1ef6f --- /dev/null +++ b/packages/texinfo/texindex-texindex.in.patch @@ -0,0 +1,14 @@ +Use gawk regardless of what was picked up during build. + +diff -u -r ../texinfo-6.5/texindex/texindex.in ./texindex/texindex.in +--- ../texinfo-6.5/texindex/texindex.in 2016-02-06 12:21:52.000000000 +0000 ++++ ./texindex/texindex.in 2018-07-12 07:29:20.427030482 +0000 +@@ -44,7 +44,7 @@ + # + # else use configured value for awk. + if test -z "$awk_binary"; then +- awk_binary="@AWK@" ++ awk_binary=gawk + fi + # + # that should never be empty, but just in case, else fall back to plain