diff options
-rw-r--r-- | packages/perl/files/Configure-multilib.patch | 11 | ||||
-rw-r--r-- | packages/perl/perl-native_5.8.7.bb | 3 | ||||
-rw-r--r-- | packages/perl/perl.inc | 1 |
3 files changed, 14 insertions, 1 deletions
diff --git a/packages/perl/files/Configure-multilib.patch b/packages/perl/files/Configure-multilib.patch new file mode 100644 index 0000000000..d3948a92c0 --- /dev/null +++ b/packages/perl/files/Configure-multilib.patch @@ -0,0 +1,11 @@ +--- perl-5.8.7/Configure.orig 2006-01-30 10:50:04.000000000 +0000 ++++ perl-5.8.7/Configure 2006-01-30 10:51:18.000000000 +0000 +@@ -1240,7 +1240,7 @@ + loclibpth="$loclibpth /opt/gnu/lib /usr/GNU/lib /opt/GNU/lib" + + : general looking path for locating libraries +-glibpth="/lib /usr/lib $xlibpth" ++glibpth="/lib /usr/lib /lib64 /usr/lib64 $xlibpth" + glibpth="$glibpth /usr/ccs/lib /usr/ucblib /usr/local/lib" + test -f /usr/shlib/libc.so && glibpth="/usr/shlib $glibpth" + test -f /shlib/libc.so && glibpth="/shlib $glibpth" diff --git a/packages/perl/perl-native_5.8.7.bb b/packages/perl/perl-native_5.8.7.bb index 4a28478b94..170a0ebf8d 100644 --- a/packages/perl/perl-native_5.8.7.bb +++ b/packages/perl/perl-native_5.8.7.bb @@ -9,7 +9,8 @@ inherit native DEPENDS = "virtual/db-native gdbm-native" -SRC_URI = "http://ftp.funet.fi/pub/CPAN/src/perl-${PV}.tar.gz" +SRC_URI = "http://ftp.funet.fi/pub/CPAN/src/perl-${PV}.tar.gz \ + file://Configure-multilib.patch;patch=1" S = "${WORKDIR}/perl-${PV}" #perl is not parallel_make safe diff --git a/packages/perl/perl.inc b/packages/perl/perl.inc index 09a2ce7082..52418903a2 100644 --- a/packages/perl/perl.inc +++ b/packages/perl/perl.inc @@ -39,6 +39,7 @@ do_configure() { } do_compile() { + sed -i -e 's|/usr/include|${STAGING_INCDIR}|g' ext/Errno/Errno_pm.PL cd Cross oe_runmake perl } |