From 8f5b4a7910b7191aa9fec7d79bc41d101ac31d8b Mon Sep 17 00:00:00 2001 From: Xi Ruoyao Date: Tue, 17 Dec 2024 21:26:26 +0800 Subject: [PATCH] gettext: Remove useless sed The second expression 's/xmlError *err/const &/' does nothing, because " *" actually matches zero, one, or several white spaces, not a white space and an asterisk. And the first expression '/libxml\/xmlerror.h/i #include ' includes a header, but we are not using anything in the header. The intention of the sed command is fix a compatibility issue with system libxml, but LFS does not have a system libxml so the fix is not needed for LFS. And, if we just fix up the second expression to 's/xmlError \*err/const &/' making it actually work, it'll cause a FTBFS with shipped libxml (used in LFS because system does not have libxml), so we cannot easily fix it either. For now just remove the sed. If gettext-0.23.1 isn't released before LFS 12.3 freeze, we can either apply the upstream patch to make it work for both shipped libxml and system libxml, or add the corrected sed with "nodump" and some alarming texts. --- chapter08/gettext.xml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/chapter08/gettext.xml b/chapter08/gettext.xml index 3d5e3ade7..f26d15536 100644 --- a/chapter08/gettext.xml +++ b/chapter08/gettext.xml @@ -43,12 +43,6 @@ Installation of Gettext - First fix some compatibility issues with other programs: - -sed -e '/libxml\/xmlerror.h/i #include <libxml/xmlversion.h>' \ - -e 's/xmlError *err/const &/' \ - -i gettext-tools/src/its.c - Prepare Gettext for compilation: ./configure --prefix=/usr \