diff options
| author | Dima Zavin <dmitriyz@waymo.com> | 2018-09-12 10:30:25 -0700 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-09-13 17:38:07 +0100 |
| commit | c84266ec35e5e7b577bb4d6a254b31d9078f10ef (patch) | |
| tree | 25fd0ceb21634d2ef89153fc48adbe1e063d69ba /meta | |
| parent | a7e6f334a1e17eb2de7c914a886b71ffe017c157 (diff) | |
| download | poky-c84266ec35e5e7b577bb4d6a254b31d9078f10ef.tar.gz | |
perf: do not pull in any perl dependencies unless scripting is requested
(From OE-Core rev: 79a19811f4039c5d1861094abbbdaea0aedeee04)
Signed-off-by: Dima Zavin <dmitriyz@waymo.com>
Signed-off-by: Andrew Bresticker <abrestic@waymo.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/recipes-kernel/perf/perf-perl.inc | 7 | ||||
| -rw-r--r-- | meta/recipes-kernel/perf/perf.bb | 8 |
2 files changed, 8 insertions, 7 deletions
diff --git a/meta/recipes-kernel/perf/perf-perl.inc b/meta/recipes-kernel/perf/perf-perl.inc new file mode 100644 index 0000000000..ae77319b20 --- /dev/null +++ b/meta/recipes-kernel/perf/perf-perl.inc | |||
| @@ -0,0 +1,7 @@ | |||
| 1 | inherit perlnative cpan-base | ||
| 2 | |||
| 3 | # Env var which tells perl if it should use host (no) or target (yes) settings | ||
| 4 | export PERLCONFIGTARGET = "${@is_target(d)}" | ||
| 5 | export PERL_INC = "${STAGING_LIBDIR}${PERL_OWN_DIR}/perl/${@get_perl_version(d)}/CORE" | ||
| 6 | export PERL_LIB = "${STAGING_LIBDIR}${PERL_OWN_DIR}/perl/${@get_perl_version(d)}" | ||
| 7 | export PERL_ARCHLIB = "${STAGING_LIBDIR}${PERL_OWN_DIR}/perl/${@get_perl_version(d)}" | ||
diff --git a/meta/recipes-kernel/perf/perf.bb b/meta/recipes-kernel/perf/perf.bb index e9db6c66c4..514c87835d 100644 --- a/meta/recipes-kernel/perf/perf.bb +++ b/meta/recipes-kernel/perf/perf.bb | |||
| @@ -52,13 +52,7 @@ export WERROR = "0" | |||
| 52 | do_populate_lic[depends] += "virtual/kernel:do_patch" | 52 | do_populate_lic[depends] += "virtual/kernel:do_patch" |
| 53 | 53 | ||
| 54 | # needed for building the tools/perf Perl binding | 54 | # needed for building the tools/perf Perl binding |
| 55 | inherit ${@bb.utils.contains('PACKAGECONFIG', 'scripting', 'perlnative', '', d)} | 55 | include ${@bb.utils.contains('PACKAGECONFIG', 'scripting', 'perf-perl.inc', '', d)} |
| 56 | inherit cpan-base | ||
| 57 | # Env var which tells perl if it should use host (no) or target (yes) settings | ||
| 58 | export PERLCONFIGTARGET = "${@is_target(d)}" | ||
| 59 | export PERL_INC = "${STAGING_LIBDIR}${PERL_OWN_DIR}/perl/${@get_perl_version(d)}/CORE" | ||
| 60 | export PERL_LIB = "${STAGING_LIBDIR}${PERL_OWN_DIR}/perl/${@get_perl_version(d)}" | ||
| 61 | export PERL_ARCHLIB = "${STAGING_LIBDIR}${PERL_OWN_DIR}/perl/${@get_perl_version(d)}" | ||
| 62 | 56 | ||
| 63 | inherit kernelsrc | 57 | inherit kernelsrc |
| 64 | 58 | ||
