diff options
Diffstat (limited to 'meta/classes/native.bbclass')
-rw-r--r-- | meta/classes/native.bbclass | 24 |
1 files changed, 0 insertions, 24 deletions
diff --git a/meta/classes/native.bbclass b/meta/classes/native.bbclass index 9d678fd802..529f1c259d 100644 --- a/meta/classes/native.bbclass +++ b/meta/classes/native.bbclass | |||
@@ -66,25 +66,6 @@ STAGING_DIR_TARGET = "" | |||
66 | SHLIBSDIR = "${STAGING_DIR_NATIVE}/shlibs" | 66 | SHLIBSDIR = "${STAGING_DIR_NATIVE}/shlibs" |
67 | PKG_CONFIG_DIR = "${libdir}/pkgconfig" | 67 | PKG_CONFIG_DIR = "${libdir}/pkgconfig" |
68 | 68 | ||
69 | # | ||
70 | # If changing this function, please make sure packaged-staging.bbclass is | ||
71 | # updated too | ||
72 | # | ||
73 | do_stage_native () { | ||
74 | # If autotools is active, use the autotools staging function, else | ||
75 | # use our "make install" equivalent | ||
76 | if [ "${AUTOTOOLS_NATIVE_STAGE_INSTALL}" == "1" ] | ||
77 | then | ||
78 | autotools_stage_all | ||
79 | else | ||
80 | oe_runmake install | ||
81 | fi | ||
82 | } | ||
83 | |||
84 | do_stage () { | ||
85 | do_stage_native | ||
86 | } | ||
87 | |||
88 | PKG_CONFIG_PATH .= "${EXTRA_NATIVE_PKGCONFIG_PATH}" | 69 | PKG_CONFIG_PATH .= "${EXTRA_NATIVE_PKGCONFIG_PATH}" |
89 | PKG_CONFIG_SYSROOT_DIR = "" | 70 | PKG_CONFIG_SYSROOT_DIR = "" |
90 | 71 | ||
@@ -93,11 +74,6 @@ ORIG_DEPENDS := "${DEPENDS}" | |||
93 | DEPENDS_virtclass-native ?= "${ORIG_DEPENDS}" | 74 | DEPENDS_virtclass-native ?= "${ORIG_DEPENDS}" |
94 | 75 | ||
95 | python __anonymous () { | 76 | python __anonymous () { |
96 | # If we've a legacy native do_stage, we need to neuter do_install | ||
97 | stagefunc = bb.data.getVar('do_stage', d, True) | ||
98 | if (stagefunc.strip() != "do_stage_native" and stagefunc.strip() != "autotools_stage_all") and bb.data.getVar('AUTOTOOLS_NATIVE_STAGE_INSTALL', d, 1) == "1": | ||
99 | bb.data.setVar("do_install", " :", d) | ||
100 | |||
101 | if "native" in (bb.data.getVar('BBCLASSEXTEND', d, True) or ""): | 77 | if "native" in (bb.data.getVar('BBCLASSEXTEND', d, True) or ""): |
102 | pn = bb.data.getVar("PN", d, True) | 78 | pn = bb.data.getVar("PN", d, True) |
103 | depends = bb.data.getVar("DEPENDS_virtclass-native", d, True) | 79 | depends = bb.data.getVar("DEPENDS_virtclass-native", d, True) |