Changeset f1fadeb for BLFS/libs

Timestamp:

05/27/2006 12:16:14 PM (18 years ago)

Author:

Manuel Canales Esparcia <manuel@…>

Branches:

experimental

Children:

ad3bf2c

Parents:

2ca2992

Message:

More circular dependencies fixes.

File:

• BLFS/libs/func_dependencies (modified) (7 diffs)

BLFS/libs/func_dependencies

@@ -66 +66 @@
   # Create target package dependencies list
   case $TARGET in
+    # Skip the creation when all dependencies are circular.
+    alsa-lib | cracklib | libexif | unixodbc ) ;;
     # Meta-packages at target level
     # KDE and Gnome-{core,full} could be made via packages.sh, but not sure yet how.
@@ -92 +94 @@
   #---------------------
   # Write the XInclude
-  echo -e "    $ENTRY_START$PKGXML$ENTRY_END" >> $TARGET-index.xml.tmp
+  case $TARGET in
+    # If there is no usefull XML page, skip it.
+    alsa | arts | gnome-core | gnome-full | kde-core | kde-full | kde-koffice ) ;;
+    * )
+      echo -e "    $ENTRY_START$PKGXML$ENTRY_END" >> $TARGET-index.xml.tmp
+      ;;
+  esac
 
   #------------------P---
@@ -176 +184 @@
 
         # Orphan links (proper link must be created when generating the book)
-      arts )              DEP=aRts ;; # That should be fixed in the BLFS book
+      arts )              DEP=aRts ;;
         # Set values for alternative packages
         # X is a meta-package, thus handled in another way.
@@ -187 +195 @@
     #------------------
     echo -e "\tDEP for $PKG is $DEP" >> depure.txt
-    # Prevent circular dependencies when level 3
+    # Prevent circular dependencies
+    # If all dependencies are circular, the creation of the *.dep file
+    # must be skipped, not placed here, to avoid that the script will bomb
+    # due empty *.xinc files
     case $DEP in
-      python )
-        # cracklib-->python-->tk-->X-->linux-pam-->cracklib
-        [[ "$PKG" = "cracklib" ]] && continue
-        ;;
       jadetex | perl-* | lynx | Links | w3m )
         # Optional dependencies are runtime only
@@ -205 +212 @@
         [[ "$PKG" = "cyrus-sasl" ]] && continue
         ;;
-      doxygen )
-        # alsa-lib-->doxygen-->graphviz-->jdk-->alsa-lib
-        # Commented out due that it bomb "jdk 3" Why??
-        #[[ "$PKG" = "alsa-lib" ]] && continue
-        # libexif-->doxygen-->graphviz-->php-->libexif
-        [[ "$PKG" = "libexif" ]] && continue
-        ;;
-      qt )
-        # unixodbc-->qt-->unixodbc
-        [[ "$PKG" = "unixodbc" ]] && continue
-        ;;
       espgs )
         # sendmail-->espgs-->cups-->php-->sendmail
         [[ "$PKG" = "$MAIL_SERVER" ]] && continue
         ;;
-      graphviz )
-        # libexif-->graphviz-->php-->libexif
-        [[ "$PKG" = "libexif" ]] && continue
-        ;;
       aRts )
         # esound-->aRts-->esound
         [[ "$PKG" = "esound" ]] && continue
         ;;
-      gimp )
-        # imagemagick-->gimp-->imagemagick
+      gimp | sane )
+        # imagemagick-->{sane}-->gimp-->imagemagick
         [[ "$PKG" = "imagemagick" ]] && continue
+        ;;
+      ffmpeg )
+        # alsa-plugins-->ffmpeg-->several-->alsa-plugins
+        [[ "$PKG" = "alsa-plugins" ]] && continue
         ;;
     esac
@@ -240 +236 @@
     echo -e "\t\tDEP_XML is $DEP_XML\n" >> depure.txt
     case $DEP in
-      x-window-system ) ;; # No page for that (proper link must be created when generating the book)
+      x-window-system | alsa ) ;; # No page for that (proper link must be created when generating the book)
       xorg7 ) ;; # This page will be dump in the xorg7.xinc file
       * )
@@ -255 +251 @@
     if [[ ! -f dependencies/$DEP.dep ]] ; then
       case $DEP in
-        alsa-lib ) ;; # Only one optional dependency and is recursive.
-                      # When placed inside the circular dependencies handler
-                      # some packages may bomb. But I don't know yet why
+        # Skip the creation when all dependencies are circular.
+        alsa-lib | cracklib | libexif | unixodbc ) ;;
         # Meta-packages at dependency level (ugly *.dep files, but work for now)
         alsa ) # When dependency "alsa", use all alsa-* packages