From 7423ba3502f5aee9c4cb87c9188eed4c1aa9c9d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Sun, 1 Nov 2020 20:34:54 +0700 Subject: [PATCH] Revert "m4: fix bootstrap on host with texinfo installed" This reverts commit 66bf185310ef656f05f8b9c24fb58470e8f27a8f. --- srcpkgs/m4/template | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/srcpkgs/m4/template b/srcpkgs/m4/template index 776693c7669..111dc6a6b07 100644 --- a/srcpkgs/m4/template +++ b/srcpkgs/m4/template @@ -1,24 +1,18 @@ # Template file for 'm4' pkgname=m4 version=1.4.18 -revision=3 +revision=2 +patch_args="-Np1" bootstrap=yes +replaces="chroot-m4>=0" build_style=gnu-configure configure_args="--enable-changeword --enable-threads" short_desc="GNU version of UNIX m4 macro language processor" -maintainer="Enno Boland " -license="GPL-3.0-or-later" homepage="https://www.gnu.org/software/m4/" +license="GPL-3.0-or-later" +maintainer="Enno Boland " distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.xz" checksum=f2c1e86ca0a404ff281631bdc8377638992744b175afb806e25871a24a934e07 -replaces="chroot-m4>=0" -patch_args="-Np1" - -post_patch() { - # If texinfo was installed in host system, - # bootstrap is falling - vsed -i '1i @documentencoding ISO-8859-1' doc/m4.texi -} pre_check() { case "$XBPS_TARGET_MACHINE" in