From 5ed69f823f28db12a5f56eb709ed8446f5070df0 Mon Sep 17 00:00:00 2001
From: Pierre Labastie <pierre.labastie@neuf.fr>
Date: Thu, 19 Oct 2023 17:35:25 +0200
Subject: [PATCH] Dependency on xorg7-* only on last package

Our gen-special.sh transforms a dependency on compound packages
(xorg7-*) on a dependency on the list of packages. This generates
a lot of trials when removing circular dependencies, because if the
dependency on xorg7-* is optional, all packages in the list are tried
in turn, while it is sure that anyway the dependecy must be eliminated.
If the dependency is only on the last package, the circular dep
is eliminated at first try.
---
 BLFS/gen-special.sh | 27 +++++++++++++++++++--------
 1 file changed, 19 insertions(+), 8 deletions(-)

diff --git a/BLFS/gen-special.sh b/BLFS/gen-special.sh
index 4dcd904..8b61d68 100755
--- a/BLFS/gen-special.sh
+++ b/BLFS/gen-special.sh
@@ -170,7 +170,25 @@ EOF
 <!-- End dependencies -->
         </module>
 EOF
-    cat >> tmpfile << EOF
+#    cat >> tmpfile << EOF
+#        <xsl:element name="dependency">
+#          <xsl:attribute name="status">
+#            <xsl:value-of select="\$status"/>
+#          </xsl:attribute>
+#          <xsl:attribute name="build">
+#            <xsl:value-of select="\$build"/>
+#          </xsl:attribute>
+#          <xsl:attribute name="name">$packname</xsl:attribute>
+#          <xsl:attribute name="type">ref</xsl:attribute>
+#        </xsl:element>
+#EOF
+    precpack=$packname
+  done
+  cat >>$SPECIAL_FILE << EOF
+     </package>
+   </xsl:when>
+EOF
+  cat >> tmpfile << EOF
         <xsl:element name="dependency">
           <xsl:attribute name="status">
             <xsl:value-of select="\$status"/>
@@ -181,13 +199,6 @@ EOF
           <xsl:attribute name="name">$packname</xsl:attribute>
           <xsl:attribute name="type">ref</xsl:attribute>
         </xsl:element>
-EOF
-  done
-  cat >>$SPECIAL_FILE << EOF
-     </package>
-   </xsl:when>
-EOF
-  cat >> tmpfile << EOF
       </xsl:when>
 EOF
 done