summaryrefslogtreecommitdiffstats
path: root/meta/classes
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2008-01-23 21:03:26 +0000
committerRichard Purdie <richard@openedhand.com>2008-01-23 21:03:26 +0000
commit69683bfe8c72c1d39034bb81f517e0733b2dbcc5 (patch)
tree340329eda50e9d256d9d9b7f557544d0b9dae4a3 /meta/classes
parent21441368996e0724d7488307254e3029d8b07b8a (diff)
downloadpoky-69683bfe8c72c1d39034bb81f517e0733b2dbcc5.tar.gz
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.bbclass26
1 files changed, 4 insertions, 22 deletions
diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass
index 8e5d9b425f..cc06dec813 100644
--- a/meta/classes/package.bbclass
+++ b/meta/classes/package.bbclass
@@ -520,6 +520,8 @@ if [ x"$D" = "x" ]; then
520fi 520fi
521} 521}
522 522
523SHLIBSDIR = "${STAGING_DIR}/${HOST_SYS}/shlibs"
524
523python package_do_shlibs() { 525python package_do_shlibs() {
524 import os, re, os.path 526 import os, re, os.path
525 527
@@ -538,24 +540,14 @@ python package_do_shlibs() {
538 bb.error("WORKDIR not defined") 540 bb.error("WORKDIR not defined")
539 return 541 return
540 542
541 staging = bb.data.getVar('STAGING_DIR', d, 1)
542 if not staging:
543 bb.error("STAGING_DIR not defined")
544 return
545
546 ver = bb.data.getVar('PV', d, 1) 543 ver = bb.data.getVar('PV', d, 1)
547 if not ver: 544 if not ver:
548 bb.error("PV not defined") 545 bb.error("PV not defined")
549 return 546 return
550 547
551 host_sys = bb.data.getVar('HOST_SYS', d, 1)
552 if not host_sys:
553 bb.error("HOST_SYS not defined")
554 return
555
556 pkgdest = bb.data.getVar('PKGDEST', d, 1) 548 pkgdest = bb.data.getVar('PKGDEST', d, 1)
557 549
558 shlibs_dir = os.path.join(staging, host_sys, "shlibs") 550 shlibs_dir = bb.data.getVar('SHLIBSDIR', d, 1)
559 bb.mkdirhier(shlibs_dir) 551 bb.mkdirhier(shlibs_dir)
560 552
561 needed = {} 553 needed = {}
@@ -672,19 +664,9 @@ python package_do_pkgconfig () {
672 bb.error("WORKDIR not defined") 664 bb.error("WORKDIR not defined")
673 return 665 return
674 666
675 staging = bb.data.getVar('STAGING_DIR', d, 1)
676 if not staging:
677 bb.error("STAGING_DIR not defined")
678 return
679
680 host_sys = bb.data.getVar('HOST_SYS', d, 1)
681 if not host_sys:
682 bb.error("HOST_SYS not defined")
683 return
684
685 pkgdest = bb.data.getVar('PKGDEST', d, 1) 667 pkgdest = bb.data.getVar('PKGDEST', d, 1)
686 668
687 shlibs_dir = os.path.join(staging, host_sys, "shlibs") 669 shlibs_dir = bb.data.getVar('SHLIBSDIR', d, 1)
688 bb.mkdirhier(shlibs_dir) 670 bb.mkdirhier(shlibs_dir)
689 671
690 pc_re = re.compile('(.*)\.pc$') 672 pc_re = re.compile('(.*)\.pc$')