diff options
author | Jens Rehsack <sno@netbsd.org> | 2018-08-27 15:20:15 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-08-28 10:30:28 +0100 |
commit | 97885b29733e540b62aaa6416bb473a24fc23e5f (patch) | |
tree | 803cd4254f8922eed5a2983f93fdb19904e9cec7 | |
parent | 1c048479af7cc98e30f9a33d1f3bef03711544aa (diff) | |
download | poky-97885b29733e540b62aaa6416bb473a24fc23e5f.tar.gz |
cpan.bbclass: make RPATH fix more general
Extract a general version of RPATH fix for libxml-parser-perl_2.44.bb
from
292471701 libxml-parser-perl: fix "...contains bad RPATH"
into cpan.bbclass to catch most errors reported by Khem Raj via
http://errors.yoctoproject.org/Errors/Build/66538/
Genrally, Perl 5 toolchain deals with cross-compile sysroots
as if a dependency is installed at an exostic place on a server.
This issue needs to be addressed wider into the community.
(From OE-Core rev: a5439ff9627d309f6980947f5ee573d85e672228)
Signed-off-by: Jens Rehsack <sno@netbsd.org>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/classes/cpan.bbclass | 10 | ||||
-rw-r--r-- | meta/recipes-devtools/perl/libxml-parser-perl_2.44.bb | 7 |
2 files changed, 10 insertions, 7 deletions
diff --git a/meta/classes/cpan.bbclass b/meta/classes/cpan.bbclass index 926c6358a6..a5bc301898 100644 --- a/meta/classes/cpan.bbclass +++ b/meta/classes/cpan.bbclass | |||
@@ -40,6 +40,16 @@ cpan_do_configure () { | |||
40 | fi | 40 | fi |
41 | } | 41 | } |
42 | 42 | ||
43 | do_configure_append_class-target() { | ||
44 | find . -name Makefile | xargs sed -E -i \ | ||
45 | -e 's:LD_RUN_PATH ?= ?"?[^"]*"?::g' | ||
46 | } | ||
47 | |||
48 | do_configure_append_class-nativesdk() { | ||
49 | find . -name Makefile | xargs sed -E -i \ | ||
50 | -e 's:LD_RUN_PATH ?= ?"?[^"]*"?::g' | ||
51 | } | ||
52 | |||
43 | cpan_do_compile () { | 53 | cpan_do_compile () { |
44 | oe_runmake PASTHRU_INC="${CFLAGS}" LD="${CCLD}" | 54 | oe_runmake PASTHRU_INC="${CFLAGS}" LD="${CCLD}" |
45 | } | 55 | } |
diff --git a/meta/recipes-devtools/perl/libxml-parser-perl_2.44.bb b/meta/recipes-devtools/perl/libxml-parser-perl_2.44.bb index 194ed6ac48..95af4d1de6 100644 --- a/meta/recipes-devtools/perl/libxml-parser-perl_2.44.bb +++ b/meta/recipes-devtools/perl/libxml-parser-perl_2.44.bb | |||
@@ -21,13 +21,6 @@ inherit cpan ptest-perl | |||
21 | do_configure_append_class-target() { | 21 | do_configure_append_class-target() { |
22 | sed -E \ | 22 | sed -E \ |
23 | -e 's:-L${STAGING_LIBDIR}::g' -e 's:-I${STAGING_INCDIR}::g' \ | 23 | -e 's:-L${STAGING_LIBDIR}::g' -e 's:-I${STAGING_INCDIR}::g' \ |
24 | -e 's:LD_RUN_PATH ?= ?"?[^"]*"?::g' \ | ||
25 | -i Makefile Expat/Makefile | ||
26 | } | ||
27 | |||
28 | do_configure_append_class-nativesdk() { | ||
29 | sed -E \ | ||
30 | -e 's:LD_RUN_PATH ?= ?"?[^"]*"?::g' \ | ||
31 | -i Makefile Expat/Makefile | 24 | -i Makefile Expat/Makefile |
32 | } | 25 | } |
33 | 26 | ||