summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2013-01-19 23:49:24 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-01-25 12:42:42 +0000
commit749e67d40a21ccedfc655a1eba2aac8736be6c31 (patch)
treef40b86471b3ae088428946dc84bd5afac035c67f /meta/recipes-devtools
parentad17b18fce8fb794ba69ff60dc4980c3f36ccfc2 (diff)
downloadpoky-749e67d40a21ccedfc655a1eba2aac8736be6c31.tar.gz
perl: Add dyanloader build hack
Patch perl to allow builds to work where a native perl running against target modules attempts to load a dynamic binary module. We assume that a native version of the module exists as it would for the target and perform an appropriate path substitution. (From OE-Core rev: b5ea12fec329fe419bc3672ed1e1d5733ff2a9d3) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools')
-rw-r--r--meta/recipes-devtools/perl/perl-5.14.2/dynaloaderhack.patch23
-rw-r--r--meta/recipes-devtools/perl/perl-native_5.14.2.bb1
-rw-r--r--meta/recipes-devtools/perl/perl_5.14.2.bb1
3 files changed, 25 insertions, 0 deletions
diff --git a/meta/recipes-devtools/perl/perl-5.14.2/dynaloaderhack.patch b/meta/recipes-devtools/perl/perl-5.14.2/dynaloaderhack.patch
new file mode 100644
index 0000000000..3df593346c
--- /dev/null
+++ b/meta/recipes-devtools/perl/perl-5.14.2/dynaloaderhack.patch
@@ -0,0 +1,23 @@
1Hack the dynamic module loader so that we use native modules since we can't load
2the target ones.
3
4Upstream-Status: Inappropriate
5
6RP
72013/01/13
8
9Index: perl-5.14.2/ext/DynaLoader/DynaLoader_pm.PL
10===================================================================
11--- perl-5.14.2.orig/ext/DynaLoader/DynaLoader_pm.PL 2011-09-19 13:18:22.000000000 +0000
12+++ perl-5.14.2/ext/DynaLoader/DynaLoader_pm.PL 2013-01-19 16:09:51.020584945 +0000
13@@ -310,6 +310,10 @@
14 foreach (@INC) {
15 <<$^O-eq-VMS>>chop($_ = VMS::Filespec::unixpath($_));<</$^O-eq-VMS>>
16 my $dir = "$_/auto/$modpname";
17+
18+ if (defined $ENV{PERL_LIB} and defined $ENV{PERLHOSTLIB}) {
19+ $dir =~ s/$ENV{PERL_LIB}/$ENV{PERLHOSTLIB}/g;
20+ }
21
22 next unless -d $dir; # skip over uninteresting directories
23
diff --git a/meta/recipes-devtools/perl/perl-native_5.14.2.bb b/meta/recipes-devtools/perl/perl-native_5.14.2.bb
index 60fcc188da..9a066e2ecf 100644
--- a/meta/recipes-devtools/perl/perl-native_5.14.2.bb
+++ b/meta/recipes-devtools/perl/perl-native_5.14.2.bb
@@ -19,6 +19,7 @@ SRC_URI = "http://www.cpan.org/src/5.0/perl-${PV}.tar.gz \
19 file://native-perlinc.patch \ 19 file://native-perlinc.patch \
20 file://MM_Unix.pm.patch \ 20 file://MM_Unix.pm.patch \
21 file://debian/errno_ver.diff \ 21 file://debian/errno_ver.diff \
22 file://dynaloaderhack.patch \
22 file://perl-build-in-t-dir.patch" 23 file://perl-build-in-t-dir.patch"
23 24
24SRC_URI[md5sum] = "3306fbaf976dcebdcd49b2ac0be00eb9" 25SRC_URI[md5sum] = "3306fbaf976dcebdcd49b2ac0be00eb9"
diff --git a/meta/recipes-devtools/perl/perl_5.14.2.bb b/meta/recipes-devtools/perl/perl_5.14.2.bb
index e875c1f574..df702474d1 100644
--- a/meta/recipes-devtools/perl/perl_5.14.2.bb
+++ b/meta/recipes-devtools/perl/perl_5.14.2.bb
@@ -67,6 +67,7 @@ SRC_URI = "http://www.cpan.org/src/5.0/perl-${PV}.tar.gz \
67 file://fix_bad_rpath.patch \ 67 file://fix_bad_rpath.patch \
68 file://perl-build-in-t-dir.patch \ 68 file://perl-build-in-t-dir.patch \
69 file://perl-archlib-exp.patch \ 69 file://perl-archlib-exp.patch \
70 file://dynaloaderhack.patch \
70 \ 71 \
71 file://config.sh \ 72 file://config.sh \
72 file://config.sh-32 \ 73 file://config.sh-32 \