Mega patch to improve how build dependencies are handled and
how packages are found. First: I removed all these *-deps.db files and only a single file is used now "build-depends.db"; it's smaller and will be easier to handle in the future... when "run-depends.db" is added :-) Second: there's no need to specify version of package anymore; before you had to do: $ pkgfs.sh install git-1.6.0.2 now you only do: $ pkgfs.sh install git This will read the variables located at PKGFS_TEMPLATESDIR/git.tmpl and will the install the version that is there. --HG-- extra : convert_revision : 9e3e5d70965a69c76f59e322b7c7b674d627af52
This commit is contained in:
parent
4cd4543c72
commit
e9def74b60
175 changed files with 473 additions and 308 deletions
|
@ -18,7 +18,7 @@
|
|||
: ${perl_cmd:=$PKGFS_MASTERDIR/bin/perl}
|
||||
: ${PERL_DESTDIR:=$PKGFS_MASTERDIR}
|
||||
: ${PERL_PREFIX:=$PERL_DESTDIR}
|
||||
: ${PERL_DPREFIX:=$PKGFS_DESTDIR/$pkgname}
|
||||
: ${PERL_DPREFIX:=$PKGFS_DESTDIR/$pkgname-$version}
|
||||
: ${PERL_VERSION:=5.10.0}
|
||||
: ${PERL_LDDLFLAGS:=--whole-archive -shared -L$PKGFS_MASTERDIR/lib}
|
||||
: ${PERL_SITELIBEXP:=$PERL_DPREFIX/lib/perl5/site_perl/$PERL_VERSION}
|
||||
|
|
|
@ -5,11 +5,12 @@
|
|||
pkgconfig_transform_file()
|
||||
{
|
||||
local file="$1"
|
||||
local pkg="$pkgname-$version"
|
||||
|
||||
[ -z "$file" ] && return 1
|
||||
|
||||
$sed_cmd \
|
||||
-e "s|^exec_prefix=$PKGFS_DESTDIR/$pkgname.*$|exec_prefix=\${prefix}|" \
|
||||
-e "s|^exec_prefix=$PKGFS_DESTDIR/$pkg.*$|exec_prefix=\${prefix}|" \
|
||||
-e "s|-L\${libdir}|-L\${libdir} -Wl,-R\${libdir}|" \
|
||||
$file > $file.in && \
|
||||
$mv_cmd $file.in $file
|
||||
|
|
|
@ -12,7 +12,7 @@ save_pkgname=$pkgname
|
|||
check_installed_tmpl unzip-$unzip_version
|
||||
if [ "$?" -ne 0 ]; then
|
||||
echo "=> unzip not installed, will install it."
|
||||
install_tmpl unzip-$unzip_version
|
||||
install_tmpl unzip
|
||||
#
|
||||
# Continue with previous template that called us.
|
||||
#
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue