r3821 - jhalfs/trunk/BLFS/libs

pierre at higgs.linuxfromscratch.org pierre at higgs.linuxfromscratch.org
Sun Feb 22 07:16:49 PST 2015


Author: pierre
Date: Sun Feb 22 07:16:49 2015
New Revision: 3821

Log:
Fix dependency generator:
When the .dep file is scanned during the tree building, it outputs dependencies
in the file order, while when the tree is scanned later, dependencies are
output in alphabetical order. This may eventually lead to a wrong order
at the end. To be sure that both output are the same, just sort
the .dep file before scanning it.

Modified:
   jhalfs/trunk/BLFS/libs/func_dependencies

Modified: jhalfs/trunk/BLFS/libs/func_dependencies
==============================================================================
--- jhalfs/trunk/BLFS/libs/func_dependencies	Sat Feb  7 13:43:13 2015	(r3820)
+++ jhalfs/trunk/BLFS/libs/func_dependencies	Sun Feb 22 07:16:49 2015	(r3821)
@@ -113,6 +113,7 @@
         ../xsl/dependencies.xsl ../packages.xml
 
     if [[ -f ${id_of_dep}.dep ]]; then
+      sort ${id_of_dep}.dep -o ${id_of_dep}.dep
       sed -i "1i${rootlink[*]} $count" ${id_of_dep}.dep
       generate_dependency_tree ${id_of_dep}.dep
 # Test return value, in case we exchange dependencies


More information about the alfs-log mailing list