Multiple bugfixes and improvements after building gtk+ from scratch.

- Fix a bug in unzip-extraction.sh that skipped the package that
  requested unzip and instead used the origin template.
- Pass CFLAGS, CXXFLAGS and CPPFLAGS through the environment and unset
  them once the package has been installed.
- Do not show the dependencies required for a pkg more than once time.

--HG--
extra : convert_revision : 731135558d29787ab5178b80df3578420872709d
This commit is contained in:
Juan RP
2008-10-03 14:32:26 +02:00
parent 6d6d456951
commit 902512dd96
10 changed files with 41 additions and 30 deletions

View File

@@ -1,3 +1,4 @@
#
# This helper does the required steps to be able to build and install
# perl modules into the correct location.
#

View File

@@ -1,4 +1,5 @@
# This script will transform the pkg-config files with correct
#
# This helper will transform the pkg-config files with correct
# directories pointing at PKGFS_MASTERDIR specified in the config file.
#
pkgconfig_transform_file()

View File

@@ -1,19 +1,26 @@
# Helper for templates using extract_sufx=".zip" that installs the unzip
# package if it's not available in PKGFS_MASTERDIR.
#
# This helper is used in templates using extract_sufx=".zip".
# This checks if unzip is installed and installs it if it's not
# and sets the unzip_cmd variable appropiately.
#
unzip_version="5.52"
# Save pkgname before installing unzip.
save_pkgname=$pkgname
# If unzip is already installed just return immediately.
check_installed_tmpl unzip-$unzip_version
if [ "$?" -ne 0 ]; then
echo "=> unzip not installed, will install it."
install_tmpl unzip-$unzip_version
#
# Continue with origin template that called us.
# Continue with previous template that called us.
#
reset_tmpl_vars
run_file ${origin_tmpl}
run_file $PKGFS_TEMPLATESDIR/$save_pkgname.tmpl
check_tmpl_vars $save_pkgname
fi
unset save_pkgname
unset unzip_version
unzip_cmd=$PKGFS_MASTERDIR/bin/unzip