mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-09-14 03:49:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

classes/package: Use HOST_OS for runtime dependencies

Browse Source 
The code was using TARGET_OS to try and detect what type of OS the
packages would be running on, but this is incorrect. TARGET_OS is the OS
for which the package will generate output (e.g. GCC output target or
GDB debugging target). The OS where the package will run is the HOST_OS.
Note that HOST_OS only differs from TARGET_OS when doing a
canadian cross compile, and even then in our case only when doing so for
a non-Linux host (e.g. MinGW).

Fix the code to use HOST_OS instead.

(From OE-Core rev: f284c5b2df220b520b025a59874e04ef4becd829)

Signed-off-by: Joshua Watt <JPEWhacker@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Joshua Watt
2020-07-21 12:52:19 -05:00
committed by Richard Purdie
parent 3afe7395ee
commit 0f5ae7e79b
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
meta/classes/package.bbclass
View File

@@ -1039,7 +1039,7 @@ python split_and_strip_files () {
dvar = d.getVar('PKGD') dvar = d.getVar('PKGD')
pn = d.getVar('PN') pn = d.getVar('PN')
targetos = d.getVar('TARGET_OS') hostos = d.getVar('HOST_OS')
oldcwd = os.getcwd() oldcwd = os.getcwd()
os.chdir(dvar) os.chdir(dvar)
@@ -1194,7 +1194,7 @@ python split_and_strip_files () {
if (d.getVar('INHIBIT_PACKAGE_DEBUG_SPLIT') != '1'): if (d.getVar('INHIBIT_PACKAGE_DEBUG_SPLIT') != '1'):
results = oe.utils.multiprocess_launch(splitdebuginfo, list(elffiles), d, extraargs=(dvar, debugdir, debuglibdir, debugappend, debugsrcdir, d)) results = oe.utils.multiprocess_launch(splitdebuginfo, list(elffiles), d, extraargs=(dvar, debugdir, debuglibdir, debugappend, debugsrcdir, d))
if debugsrcdir and not targetos.startswith("mingw"): if debugsrcdir and not hostos.startswith("mingw"):
if (d.getVar('PACKAGE_DEBUG_STATIC_SPLIT') == '1'): if (d.getVar('PACKAGE_DEBUG_STATIC_SPLIT') == '1'):
results = oe.utils.multiprocess_launch(splitstaticdebuginfo, staticlibs, d, extraargs=(dvar, debugstaticdir, debugstaticlibdir, debugstaticappend, debugsrcdir, d)) results = oe.utils.multiprocess_launch(splitstaticdebuginfo, staticlibs, d, extraargs=(dvar, debugstaticdir, debugstaticlibdir, debugstaticappend, debugsrcdir, d))
else: else:
@@ -1761,7 +1761,7 @@ python package_do_shlibs() {
else: else:
shlib_pkgs = packages.split() shlib_pkgs = packages.split()
targetos = d.getVar('TARGET_OS') hostos = d.getVar('HOST_OS')
workdir = d.getVar('WORKDIR') workdir = d.getVar('WORKDIR')
@@ -1912,9 +1912,9 @@ python package_do_shlibs() {
soname = None soname = None
if cpath.islink(file): if cpath.islink(file):
continue continue
if targetos == "darwin" or targetos == "darwin8": if hostos == "darwin" or hostos == "darwin8":
darwin_so(file, needed, sonames, renames, pkgver) darwin_so(file, needed, sonames, renames, pkgver)
elif targetos.startswith("mingw"): elif hostos.startswith("mingw"):
mingw_dll(file, needed, sonames, renames, pkgver) mingw_dll(file, needed, sonames, renames, pkgver)
elif os.access(file, os.X_OK) or lib_re.match(file): elif os.access(file, os.X_OK) or lib_re.match(file):
linuxlist.append(file) linuxlist.append(file)