diff options
| author | Richard Purdie <richard@openedhand.com> | 2008-01-23 21:03:26 +0000 |
|---|---|---|
| committer | Richard Purdie <richard@openedhand.com> | 2008-01-23 21:03:26 +0000 |
| commit | 69683bfe8c72c1d39034bb81f517e0733b2dbcc5 (patch) | |
| tree | 340329eda50e9d256d9d9b7f557544d0b9dae4a3 /meta/classes | |
| parent | 21441368996e0724d7488307254e3029d8b07b8a (diff) | |
| download | openembedded-core-69683bfe8c72c1d39034bb81f517e0733b2dbcc5.tar.gz openembedded-core-69683bfe8c72c1d39034bb81f517e0733b2dbcc5.tar.bz2 openembedded-core-69683bfe8c72c1d39034bb81f517e0733b2dbcc5.tar.xz openembedded-core-69683bfe8c72c1d39034bb81f517e0733b2dbcc5.zip | |
package.bbclass: Abstract shlibs path to SHLIBSDIR variable
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@3576 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta/classes')
| -rw-r--r-- | meta/classes/package.bbclass | 26 |
1 files changed, 4 insertions, 22 deletions
diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass index 8e5d9b425..cc06dec81 100644 --- a/meta/classes/package.bbclass +++ b/meta/classes/package.bbclass @@ -520,6 +520,8 @@ if [ x"$D" = "x" ]; then fi } +SHLIBSDIR = "${STAGING_DIR}/${HOST_SYS}/shlibs" + python package_do_shlibs() { import os, re, os.path @@ -538,24 +540,14 @@ python package_do_shlibs() { bb.error("WORKDIR not defined") return - staging = bb.data.getVar('STAGING_DIR', d, 1) - if not staging: - bb.error("STAGING_DIR not defined") - return - ver = bb.data.getVar('PV', d, 1) if not ver: bb.error("PV not defined") return - host_sys = bb.data.getVar('HOST_SYS', d, 1) - if not host_sys: - bb.error("HOST_SYS not defined") - return - pkgdest = bb.data.getVar('PKGDEST', d, 1) - shlibs_dir = os.path.join(staging, host_sys, "shlibs") + shlibs_dir = bb.data.getVar('SHLIBSDIR', d, 1) bb.mkdirhier(shlibs_dir) needed = {} @@ -672,19 +664,9 @@ python package_do_pkgconfig () { bb.error("WORKDIR not defined") return - staging = bb.data.getVar('STAGING_DIR', d, 1) - if not staging: - bb.error("STAGING_DIR not defined") - return - - host_sys = bb.data.getVar('HOST_SYS', d, 1) - if not host_sys: - bb.error("HOST_SYS not defined") - return - pkgdest = bb.data.getVar('PKGDEST', d, 1) - shlibs_dir = os.path.join(staging, host_sys, "shlibs") + shlibs_dir = bb.data.getVar('SHLIBSDIR', d, 1) bb.mkdirhier(shlibs_dir) pc_re = re.compile('(.*)\.pc$') |