zeroday0619/MahiroOS-jhalfs
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merged r3456 from trunk.

Browse source
This commit is contained in:
Manuel Canales Esparcia 2007-08-12 19:06:52 +00:00
parent 97ad140b32
commit 373f062d01
2 changed files with 18 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
BLFS/libs/func_dependencies
View file

@ -187,6 +187,8 @@ inline_doc
hal-requirements | hal-runtime-dependencies ) continue ;; hal-requirements | hal-runtime-dependencies ) continue ;;
perl-* | tk-perl ) DEP=perl-modules ;; perl-* | tk-perl ) DEP=perl-modules ;;
dbus-* ) DEP=dbus-bindings ;; 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) # Orphan links (proper link must be created when generating the book)
arts ) DEP=aRts ;; arts ) DEP=aRts ;;
@ -309,6 +311,18 @@ inline_doc
# cyrus-sasl-->postgresql-->$KBR5-->openldap-->cyrus-sasl # cyrus-sasl-->postgresql-->$KBR5-->openldap-->cyrus-sasl
[[ "$PKG" = "cyrus-sasl" ]] && continue [[ "$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 ) tk )
# python-->tk-->xorg7-->several combinations-->libxslt-->python # python-->tk-->xorg7-->several combinations-->libxslt-->python
[[ "$PKG" = "python" ]] && continue [[ "$PKG" = "python" ]] && continue

6
BLFS/libs/func_packages
View file

@ -75,8 +75,10 @@ generate_packages() { # Master packages file
for file in `find $BLFS_XML -name "*.xml"` ; do for file in `find $BLFS_XML -name "*.xml"` ; do
pkg_id=$(grep "sect1 id" $file | sed -e 's/<sect1 id="//;s/".*//') pkg_id=$(grep "sect1 id" $file | sed -e 's/<sect1 id="//;s/".*//')
case ${pkg_id} in case ${pkg_id} in
dbus-bindings | perl-modules ) pkg_ver=0.no_version ;; dbus-bindings | \
* ) pkg_ver=$(get_pkg_ver $pkg_id) ;; perl-modules | \
python-modules ) pkg_ver=0.no_version ;;
* ) pkg_ver=$(get_pkg_ver $pkg_id) ;;
esac esac
installed_ver=$(get_installed_ver $pkg_id) installed_ver=$(get_installed_ver $pkg_id)
[[ ! -z "$pkg_id" ]] && echo -e "$pkg_id\t$file\t$pkg_ver\t$installed_ver" >> packages.tmp [[ ! -z "$pkg_id" ]] && echo -e "$pkg_id\t$file\t$pkg_ver\t$installed_ver" >> packages.tmp