diff options
| author | Phil Blundell <philb@gnu.org> | 2004-07-23 18:53:27 +0000 |
|---|---|---|
| committer | Phil Blundell <philb@gnu.org> | 2004-07-23 18:53:27 +0000 |
| commit | 4f9016cf24bc694bbefb3441ef53e0df1604db67 (patch) | |
| tree | ed745765635960709cdd513254aeb97d3b33547a | |
| parent | af43388b231af963d452a69c9f85edd46cabcb7a (diff) | |
Merge bk://openembedded@openembedded.bkbits.net/packages
into workhouse.nexus.co.uk:/home/pb/oe/oe-packages
2004/07/23 19:50:15+01:00 nexus.co.uk!pb
also read .pcdeps file
BKrev: 41015ea7XZkmevEaMXnH45XjVPeJpw
| -rw-r--r-- | classes/base.oeclass | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/classes/base.oeclass b/classes/base.oeclass index 5bffe724b5..88b0b3e0be 100644 --- a/classes/base.oeclass +++ b/classes/base.oeclass @@ -575,15 +575,22 @@ def explode_deps(s): python read_shlibdeps () { packages = (oe.data.getVar('PACKAGES', d, 1) or "").split() for pkg in packages: + rdepends = explode_deps(oe.data.getVar('RDEPENDS_' + pkg, d, 1) or oe.data.getVar('RDEPENDS', d, 1) or "") shlibsfile = oe.data.expand("${WORKDIR}/install/" + pkg + ".shlibdeps", d) if os.access(shlibsfile, os.R_OK): fd = file(shlibsfile) lines = fd.readlines() fd.close() - rdepends = explode_deps(oe.data.getVar('RDEPENDS_' + pkg, d, 1) or oe.data.getVar('RDEPENDS', d, 1) or "") for l in lines: rdepends.append(l.rstrip()) - oe.data.setVar('RDEPENDS_' + pkg, " " + " ".join(rdepends), d) + pcfile = oe.data.expand("${WORKDIR}/install/" + pkg + ".pcdeps", d) + if os.access(pcfile, os.R_OK): + fd = file(pcfile) + lines = fd.readlines() + fd.close() + for l in lines: + rdepends.append(l.rstrip()) + oe.data.setVar('RDEPENDS_' + pkg, " " + " ".join(rdepends), d) } python read_subpackage_metadata () { |