current ablfs-more branch omits some packages
| Newsgroups | gmane.linux.lfs.automated |
|---|---|
| Message-ID | <CAKjfnjr7iNSbO+iJf-4fFFMs47jmyqwfa_O5Aq3QEgpY6Lb=_g@mail.gmail.com> |
Yesterday I built mesa with ablfs-more branch, but failed on libXext by missing libX11. Then I found that the translate function in make_book.xml translate libX11 to libXXX，so can't pass the if test. I think the solution is separating the package name from tarball name before translate function. My patch attached. -- Key fingerprint: 419F 72F3 F3A9 36EE 1B72 B00B C1C3 4BD4 FDA3 362F -- http://lists.linuxfromscratch.org/sympa/info/alfs-discuss Unsubscribe: See the above information page
0001-fix-packages-whoes-name-contain-digit-characters.patch
(application/octet-stream, 1.2 KB)
From 35f0600b1dbc1bc0cc08d7bb89b07563f2999781 Mon Sep 17 00:00:00 2001 From: Zhang Wen <[email protected]> Date: Mon, 30 Oct 2023 17:12:32 +0800 Subject: [PATCH] fix packages whoes name contain digit characters --- BLFS/xsl/make_book.xsl | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/BLFS/xsl/make_book.xsl b/BLFS/xsl/make_book.xsl index cacdc12..a8dbf8f 100644 --- a/BLFS/xsl/make_book.xsl +++ b/BLFS/xsl/make_book.xsl @@ -517,8 +517,9 @@ package=kwallet and tarball=kwallet-pam-(version).tar.xz. We should not continue in this case. For checking, transform digits into X, and check that package-X occurs in tarball.--> - <xsl:if test="contains(translate($tarball,'0123456789','XXXXXXXXXX'), - concat($package,'-X'))"> + <xsl:variable name="rest" select="substring-after($tarball, $package)" /> + <xsl:variable name="trans_package" select="concat($package, translate($rest, '0123456789', 'XXXXXXXXXX'))" /> + <xsl:if test="contains($trans_package, concat($package,'-X'))"> <xsl:variable name="md5sum"> <xsl:call-template name="md5sum"> <xsl:with-param name="package" select="concat(' ',$package,'-')"/> -- 2.42.0