Add pcre-7.8 template and make glib use the installed pcre, rather

than use the included one.

While here, fix a bug in dependency handling when A package depends
B and B depends on C, C was installed two times because it was in
the dependency chain two times.

--HG--
extra : convert_revision : 379e161560cebd650a4f7e9d0f1b99f504317bbe
This commit is contained in:
Juan RP
2008-09-29 22:32:08 +02:00
parent bc450e9c6c
commit 49dff5c7ca
5 changed files with 25 additions and 1 deletions

View File

@@ -362,7 +362,7 @@ extract_tmpl_sources()
{
[ -z "$pkgname" ] && return 1
echo ">>> Extracting \`$pkgname' into $PKGFS_BUILDDIR."
echo ">>> Extracting $pkgname into $PKGFS_BUILDDIR."
$extract_cmd
if [ "$?" -ne 0 ]; then
@@ -425,6 +425,7 @@ build_tmpl_sources()
# For now, just set LDFLAGS.
#
export LDFLAGS="-L$PKGFS_MASTERDIR/lib -Wl,-R$PKGFS_MASTERDIR/lib"
#
# Packages using GNU autoconf
#
@@ -592,9 +593,14 @@ install_dependency_tmpl()
add_dependency_tolist $pkgdepf
for i in ${deps_list}; do
# skip dup deps
check_installed_tmpl $i
[ "$?" -eq 0 ] && continue
echo ">>> Installing dependency: $i"
install_tmpl "${PKGFS_TEMPLATESDIR}/${i%%-deps.db}.tmpl"
done
deps_list=
}
install_xstow_tmpl()