From 17ba74b1a4fde9b1e6068d64a9bfd8e190aa5bfc Mon Sep 17 00:00:00 2001 From: fosslinux Date: Tue, 21 Apr 2020 10:56:27 +1000 Subject: [PATCH 1/3] xbps-src: Bootstrap requires makeinfo (texinfo) --- xbps-src | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xbps-src b/xbps-src index 459f27eb7b7..c2d5abb96e5 100755 --- a/xbps-src +++ b/xbps-src @@ -394,7 +394,7 @@ umask 022 # # Required utilities in host system for the bootstrap target. readonly REQHOST_UTILS_BOOTSTRAP="file objdump find make gawk bash sed gcc g++ gnat \ - perl bsdtar gzip patch flock pkg-config" + perl bsdtar gzip patch flock pkg-config makeinfo" # Required utilities in host. readonly REQHOST_UTILS="xbps-install xbps-query xbps-rindex xbps-uhelper \ From 2374479a8d304c562ffded522ca14b938e37cbc6 Mon Sep 17 00:00:00 2001 From: fosslinux Date: Tue, 21 Apr 2020 10:56:51 +1000 Subject: [PATCH 2/3] glibc: usr/share/info is not created --- srcpkgs/glibc/template | 1 - 1 file changed, 1 deletion(-) diff --git a/srcpkgs/glibc/template b/srcpkgs/glibc/template index dceecd7e75b..6c382200488 100644 --- a/srcpkgs/glibc/template +++ b/srcpkgs/glibc/template @@ -195,7 +195,6 @@ glibc-devel_package() { vmove usr/include vmove "usr/lib/*.a" vmove "usr/lib/*.o" - vmove usr/share/info } } glibc-locales_package() { From dc1107d9fccc1a3756f9513643595d9f81d75485 Mon Sep 17 00:00:00 2001 From: fosslinux Date: Tue, 21 Apr 2020 10:57:26 +1000 Subject: [PATCH 3/3] m4: Fix texinfo locale break Closes https://github.com/void-linux/void-packages/issues/21163. Credit to rovenmaccorp. --- srcpkgs/m4/template | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/srcpkgs/m4/template b/srcpkgs/m4/template index 111dc6a6b07..12061cef337 100644 --- a/srcpkgs/m4/template +++ b/srcpkgs/m4/template @@ -14,6 +14,10 @@ maintainer="Enno Boland " distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.xz" checksum=f2c1e86ca0a404ff281631bdc8377638992744b175afb806e25871a24a934e07 +pre_build() { + sed -i '1 i @documentencoding ISO-8859-1' doc/m4.texi +} + pre_check() { case "$XBPS_TARGET_MACHINE" in *-musl* )