package.bbclass: Fix shlibs and pkgconfig magic to use HOST_SYS, not TARGET_SYS

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@3511 311d38ba-8fff-0310-9ca6-ca027cbcb966

diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass
index 7a8ebf4716ba8cb4faecf29151c89d34b7ae8c0b..8e5d9b425f5efc4d193adb98bd09f1d076c2677e 100644 (file)
--- a/meta/classes/package.bbclass
+++ b/meta/classes/package.bbclass
@@ -548,15 +548,14 @@ python package_do_shlibs() {
                bb.error("PV not defined")
                return
 
-       target_sys = bb.data.getVar('TARGET_SYS', d, 1)
-       if not target_sys:
-               bb.error("TARGET_SYS not defined")
+       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, target_sys, "shlibs")
-       old_shlibs_dir = os.path.join(staging, "shlibs")
+       shlibs_dir = os.path.join(staging, host_sys, "shlibs")
        bb.mkdirhier(shlibs_dir)
 
        needed = {}
@@ -613,7 +612,7 @@ python package_do_shlibs() {
 
        shlib_provider = {}
        list_re = re.compile('^(.*)\.list$')
-       for dir in [old_shlibs_dir, shlibs_dir]: 
+       for dir in [shlibs_dir]: 
                if not os.path.exists(dir):
                        continue
                for file in os.listdir(dir):
@@ -678,15 +677,14 @@ python package_do_pkgconfig () {
                bb.error("STAGING_DIR not defined")
                return
 
-       target_sys = bb.data.getVar('TARGET_SYS', d, 1)
-       if not target_sys:
-               bb.error("TARGET_SYS not defined")
+       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, target_sys, "shlibs")
-       old_shlibs_dir = os.path.join(staging, "shlibs")
+       shlibs_dir = os.path.join(staging, host_sys, "shlibs")
        bb.mkdirhier(shlibs_dir)
 
        pc_re = re.compile('(.*)\.pc$')
@@ -736,7 +734,7 @@ python package_do_pkgconfig () {
                                f.write('%s\n' % p)
                        f.close()
 
-       for dir in [old_shlibs_dir, shlibs_dir]:
+       for dir in [shlibs_dir]:
                if not os.path.exists(dir):
                        continue
                for file in os.listdir(dir):