[jhalfs] branch trunk updated: Dependency on xorg7-* only on last package

This is an automated email from the git hooks/post-receive script.

git pushed a commit to branch trunk
in repository jhalfs.

The following commit(s) were added to refs/heads/trunk by this push:
     new 5ed69f8  Dependency on xorg7-* only on last package
5ed69f8 is described below

commit 5ed69f823f28db12a5f56eb709ed8446f5070df0
Author: Pierre Labastie <[email protected]>
AuthorDate: Thu Oct 19 17:35:25 2023 +0200

    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

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.

-- 
http://lists.linuxfromscratch.org/sympa/info/alfs-discuss
Unsubscribe: See the above information page