From 7581244583161583ee8b49bd7b8a33385fbbd204 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andrius=20=C5=A0tikonas?= Date: Sun, 14 Mar 2021 23:54:32 +0000 Subject: [PATCH] binutils-2.14: rebuild first half of intl/aclocal.m4. Fixes: #65 --- sysa/binutils-2.14/binutils-2.14.sh | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/sysa/binutils-2.14/binutils-2.14.sh b/sysa/binutils-2.14/binutils-2.14.sh index 78bec51..252f7dc 100755 --- a/sysa/binutils-2.14/binutils-2.14.sh +++ b/sysa/binutils-2.14/binutils-2.14.sh @@ -10,7 +10,6 @@ src_prepare() { # Rebuild aclocal.m4 files # aclocal.m4 in libiberty seems to be hand-written - # FIXME intl, needs gettext.m4 for dir in binutils bfd gas gprof ld opcodes; do cd $dir rm aclocal.m4 @@ -18,6 +17,20 @@ src_prepare() { cd .. done + # intl/aclocal.m4 consists of two parts. + # First is generated by aclocal and second is from + # gettext.m4 file that is handwritten + # Here we rebuild just the first part + cd intl + csplit -sf file -n 1 aclocal.m4 '/This file is derived from/' + rm file0 + mv file1 gettext.m4 + # Build with aclocal-1.4 instead of 1.3 + sed -i 's/AM_PROG_INSTALL/AC_PROG_INSTALL/' configure.in + aclocal-1.4 + cat gettext.m4 >> aclocal.m4 + cd .. + for dir in binutils bfd gas intl libiberty ld opcodes; do cd $dir rm config.in