aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPierre Labastie <pierre.labastie@neuf.fr>2023-10-31 19:22:43 +0100
committerPierre Labastie <pierre.labastie@neuf.fr>2023-10-31 19:22:43 +0100
commitd4a689157b4c6b9cef775ea176738e6b39a638fc (patch)
treed46790afeb0de4620b58350bcd091eac5bdcaedc
parent96528bf89b9591b0f475b55e98d60279bde90cfa (diff)
compound packages: some subpackages are not built
some subpackage names contain digits (for example libX11), but we test that the tarball name with digits replaced with "X" contain $package-X. The problem is that the digits have been replaced in the whole tarball name, and don't match $package. So translate $package too. Note that there is no problem if some packages have names only differing with digits, since we are sure that the tarball name contain "$package-". We just want to rule out the case when what comes after $package- is not a version string.
-rw-r--r--BLFS/xsl/make_book.xsl8
1 files changed, 5 insertions, 3 deletions
diff --git a/BLFS/xsl/make_book.xsl b/BLFS/xsl/make_book.xsl
index 00c491c4ad..960627a422 100644
--- a/BLFS/xsl/make_book.xsl
+++ b/BLFS/xsl/make_book.xsl
@@ -516,9 +516,11 @@
and kwallet-pam in plasma. So we may arrive here with
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'))">
+ digits into X, and check that package-X occurs in tarball. We
+ have to translate package too, since it may contain digits.-->
+ <xsl:if test=
+ "contains(translate($tarball,'0123456789','XXXXXXXXXX'),
+ concat(translate($package,'0123456789','XXXXXXXXXX'),'-X'))">
<xsl:variable name="md5sum">
<xsl:call-template name="md5sum">
<xsl:with-param name="package" select="concat(' ',$package,'-')"/>