[oe-commits] org.oe.dev perl 5.8.8: Patch MakeMaker in perl-native to check for PERL_INC in the

[lenehan commit]

perl 5.8.8: Patch MakeMaker in perl-native to check for PERL_INC in the
environment and use that instead of the configured location of PERL_INC.
Without this PERL_INC for non-native recipes ends up pointing at where the
headers will be located on the target. In theory we could override this in
cpan class when calling build.PL but for some packages, such as
libxml-parser-perl, that only fixes the top-level makefile and is not
propagated to the sub-makefiles. This change results in MakeMaker always
picking up the correct staged location of the include files without
effecting where they expect to be found on the target.

Author: lenehan at openembedded.org
Branch: org.openembedded.dev
Revision: 3fde4b2fc524540decd9245f9aa9a37d991affa4
ViewMTN: http://monotone.openembedded.org/revision.psp?id=3fde4b2fc524540decd9245f9aa9a37d991affa4
Files:
1
packages/perl/perl-5.8.8/native-perlinc.patch
classes/cpan.bbclass
packages/perl/perl-native_5.8.8.bb
Diffs:

#
# mt diff -r4aa7a6a4f950609427a876c60ced55f0fe0c6cc2 -r3fde4b2fc524540decd9245f9aa9a37d991affa4
#
# 
# 
# add_file "packages/perl/perl-5.8.8/native-perlinc.patch"
#  content [8a8247d6dae7c771ee10698f3ae53f7bb83ab5ce]
# 
# patch "classes/cpan.bbclass"
#  from [57c094419f0d1d4d9bcd890119890399b53837f0]
#    to [d83738a5c38c8ff1f884ca6ae9bb6a82d043e554]
# 
# patch "packages/perl/perl-native_5.8.8.bb"
#  from [8c1ad67279089a5e838c743700554b98519f1799]
#    to [fdca05151e89df878406a72ce69bf6cb9b44ea06]
# 
============================================================
--- packages/perl/perl-5.8.8/native-perlinc.patch	8a8247d6dae7c771ee10698f3ae53f7bb83ab5ce
+++ packages/perl/perl-5.8.8/native-perlinc.patch	8a8247d6dae7c771ee10698f3ae53f7bb83ab5ce
@@ -0,0 +1,16 @@
+Index: perl-5.8.8/lib/ExtUtils/MM_Unix.pm
+===================================================================
+--- perl-5.8.8.orig/lib/ExtUtils/MM_Unix.pm	2007-05-30 15:16:47.000000000 +1000
++++ perl-5.8.8/lib/ExtUtils/MM_Unix.pm	2007-05-30 15:18:12.000000000 +1000
+@@ -1597,6 +1597,11 @@
+ 	$self->{PERL_LIB}     ||= $Config{privlibexp};
+ 	$self->{PERL_ARCHLIB} ||= $Config{archlibexp};
+ 	$self->{PERL_INC}     = $self->catdir("$self->{PERL_ARCHLIB}","CORE"); # wild guess for now
++	# Check for environment override so we'll find the headers in the correct place
++        if (defined $ENV{PERL_INC})
++        {
++            $self->{PERL_INC} = $ENV{PERL_INC};
++        }
+ 	my $perl_h;
+ 
+ 	if (not -f ($perl_h = $self->catfile($self->{PERL_INC},"perl.h"))
============================================================
--- classes/cpan.bbclass	57c094419f0d1d4d9bcd890119890399b53837f0
+++ classes/cpan.bbclass	d83738a5c38c8ff1f884ca6ae9bb6a82d043e554
@@ -8,6 +8,9 @@ export PERLCONFIGTARGET = "${@is_target(
 # Env var which tells perl if it should use host (no) or target (yes) settings
 export PERLCONFIGTARGET = "${@is_target(d)}"
 
+# Env var which tells perl where the perl include files are
+export PERL_INC = "${STAGING_DIR}/${BUILD_SYS}/lib/perl/${@get_perl_version(d)}/CORE"
+
 cpan_do_configure () {
 	yes '' | perl Makefile.PL ${EXTRA_CPANFLAGS}
 	if [ "${BUILD_SYS}" != "${HOST_SYS}" ]; then
============================================================
--- packages/perl/perl-native_5.8.8.bb	8c1ad67279089a5e838c743700554b98519f1799
+++ packages/perl/perl-native_5.8.8.bb	fdca05151e89df878406a72ce69bf6cb9b44ea06
@@ -1,9 +1,9 @@ DEPENDS = "virtual/db-native gdbm-native
 DESCRIPTION = "Perl is a popular scripting language."
 HOMEPAGE = "http://www.perl.org/"
 SECTION = "libs"
 LICENSE = "Artistic|GPL"
 DEPENDS = "virtual/db-native gdbm-native"
-PR = "r8"
+PR = "r9"
 
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/perl-${PV}"
 
@@ -12,7 +12,8 @@ SRC_URI = "http://ftp.funet.fi/pub/CPAN/
            file://Configure-multilib.patch;patch=1 \
            file://perl-configpm-switch.patch;patch=1 \
            file://native-nopacklist.patch;patch=1 \
-           file://native-no-gdbminc.patch;patch=1"
+           file://native-no-gdbminc.patch;patch=1 \
+           file://native-perlinc.patch;patch=1"
 
 S = "${WORKDIR}/perl-${PV}"