diff options
| author | Manuel Canales Esparcia <manuel@linuxfromscratch.org> | 2007-08-12 19:05:35 +0000 |
|---|---|---|
| committer | Manuel Canales Esparcia <manuel@linuxfromscratch.org> | 2007-08-12 19:05:35 +0000 |
| commit | aac025d60f07cb8e3e8f0052414835e7ae9d24cd (patch) | |
| tree | 9855732c86073cd782b645dbd3920b03ea1fcdb2 | |
| parent | 5e091a2b7ea155906a47ee36c59a3aa65933ef3a (diff) | |
BLFS: python-modules hacks.
| -rw-r--r-- | BLFS/libs/func_dependencies | 14 | ||||
| -rw-r--r-- | BLFS/libs/func_packages | 6 |
2 files changed, 18 insertions, 2 deletions
diff --git a/BLFS/libs/func_dependencies b/BLFS/libs/func_dependencies index 773e3dc8a4..c92416eb60 100644 --- a/BLFS/libs/func_dependencies +++ b/BLFS/libs/func_dependencies @@ -187,6 +187,8 @@ inline_doc hal-requirements | hal-runtime-dependencies ) continue ;; perl-* | tk-perl ) DEP=perl-modules ;; dbus-* ) DEP=dbus-bindings ;; + pyxml | pycairo | pygobject | pygtk | pyorbit | \ + gnome-python | gnome-python-desktop ) DEP=python-modules ;; # Orphan links (proper link must be created when generating the book) arts ) DEP=aRts ;; @@ -309,6 +311,18 @@ inline_doc # cyrus-sasl-->postgresql-->$KBR5-->openldap-->cyrus-sasl [[ "$PKG" = "cyrus-sasl" ]] && continue ;; + python-modules ) + # True circular dependecy + [[ "$PKG" = "python-modules" ]] && continue + # libgsf-->python-modules-->several combinations-->libgsf + [[ "$PKG" = "libgsf" ]] && continue + # gimp-->python-modules-->several combinations-->gimp + [[ "$PKG" = "gimp" ]] && continue + # Used to rebuild the documentation + [[ "$PKG" = "gstreamer" ]] && continue + [[ "$PKG" = "gst-plugins-base" ]] && continue + [[ "$PKG" = "gst-plugins-good" ]] && continue + ;; tk ) # python-->tk-->xorg7-->several combinations-->libxslt-->python [[ "$PKG" = "python" ]] && continue diff --git a/BLFS/libs/func_packages b/BLFS/libs/func_packages index a26117b89b..eb797b6f9e 100644 --- a/BLFS/libs/func_packages +++ b/BLFS/libs/func_packages @@ -75,8 +75,10 @@ generate_packages() { # Master packages file for file in `find $BLFS_XML -name "*.xml"` ; do pkg_id=$(grep "sect1 id" $file | sed -e 's/<sect1 id="//;s/".*//') case ${pkg_id} in - dbus-bindings | perl-modules ) pkg_ver=0.no_version ;; - * ) pkg_ver=$(get_pkg_ver $pkg_id) ;; + dbus-bindings | \ + perl-modules | \ + python-modules ) pkg_ver=0.no_version ;; + * ) pkg_ver=$(get_pkg_ver $pkg_id) ;; esac installed_ver=$(get_installed_ver $pkg_id) [[ ! -z "$pkg_id" ]] && echo -e "$pkg_id\t$file\t$pkg_ver\t$installed_ver" >> packages.tmp |