diff options
-rw-r--r-- | meta/recipes-devtools/perl/files/Configure-multilib.patch | 10 | ||||
-rw-r--r-- | meta/recipes-devtools/perl/perl-native_5.12.2.bb | 4 |
2 files changed, 10 insertions, 4 deletions
diff --git a/meta/recipes-devtools/perl/files/Configure-multilib.patch b/meta/recipes-devtools/perl/files/Configure-multilib.patch index d3948a92c0..b561b6ab6f 100644 --- a/meta/recipes-devtools/perl/files/Configure-multilib.patch +++ b/meta/recipes-devtools/perl/files/Configure-multilib.patch | |||
@@ -1,11 +1,15 @@ | |||
1 | --- perl-5.8.7/Configure.orig 2006-01-30 10:50:04.000000000 +0000 | 1 | Index: perl-5.12.2/Configure |
2 | +++ perl-5.8.7/Configure 2006-01-30 10:51:18.000000000 +0000 | 2 | =================================================================== |
3 | @@ -1240,7 +1240,7 @@ | 3 | --- perl-5.12.2.orig/Configure |
4 | +++ perl-5.12.2/Configure | ||
5 | @@ -1316,8 +1316,9 @@ loclibpth="/usr/local/lib /opt/local/lib | ||
4 | loclibpth="$loclibpth /opt/gnu/lib /usr/GNU/lib /opt/GNU/lib" | 6 | loclibpth="$loclibpth /opt/gnu/lib /usr/GNU/lib /opt/GNU/lib" |
5 | 7 | ||
6 | : general looking path for locating libraries | 8 | : general looking path for locating libraries |
7 | -glibpth="/lib /usr/lib $xlibpth" | 9 | -glibpth="/lib /usr/lib $xlibpth" |
8 | +glibpth="/lib /usr/lib /lib64 /usr/lib64 $xlibpth" | 10 | +glibpth="/lib /usr/lib /lib64 /usr/lib64 $xlibpth" |
9 | glibpth="$glibpth /usr/ccs/lib /usr/ucblib /usr/local/lib" | 11 | glibpth="$glibpth /usr/ccs/lib /usr/ucblib /usr/local/lib" |
12 | +test -f /usr/lib/`uname -m`-linux-gnu/libc.so && glibpth="/usr/lib/`uname -m`-linux-gnu $glibpth" | ||
10 | test -f /usr/shlib/libc.so && glibpth="/usr/shlib $glibpth" | 13 | test -f /usr/shlib/libc.so && glibpth="/usr/shlib $glibpth" |
11 | test -f /shlib/libc.so && glibpth="/shlib $glibpth" | 14 | test -f /shlib/libc.so && glibpth="/shlib $glibpth" |
15 | test -d /usr/lib64 && glibpth="$glibpth /lib64 /usr/lib64 /usr/local/lib64" | ||
diff --git a/meta/recipes-devtools/perl/perl-native_5.12.2.bb b/meta/recipes-devtools/perl/perl-native_5.12.2.bb index 9af7b06e08..c9882a9101 100644 --- a/meta/recipes-devtools/perl/perl-native_5.12.2.bb +++ b/meta/recipes-devtools/perl/perl-native_5.12.2.bb | |||
@@ -4,7 +4,7 @@ SECTION = "libs" | |||
4 | LICENSE = "Artistic|GPL" | 4 | LICENSE = "Artistic|GPL" |
5 | LIC_FILES_CHKSUM = "file://Copying;md5=2b4c6ffbcfcbdee469f02565f253d81a \ | 5 | LIC_FILES_CHKSUM = "file://Copying;md5=2b4c6ffbcfcbdee469f02565f253d81a \ |
6 | file://Artistic;md5=f921793d03cc6d63ec4b15e9be8fd3f8" | 6 | file://Artistic;md5=f921793d03cc6d63ec4b15e9be8fd3f8" |
7 | PR = "r7" | 7 | PR = "r8" |
8 | 8 | ||
9 | LIC_FILES_CHKSUM = "file://Copying;md5=2b4c6ffbcfcbdee469f02565f253d81a \ | 9 | LIC_FILES_CHKSUM = "file://Copying;md5=2b4c6ffbcfcbdee469f02565f253d81a \ |
10 | file://Artistic;md5=f921793d03cc6d63ec4b15e9be8fd3f8" | 10 | file://Artistic;md5=f921793d03cc6d63ec4b15e9be8fd3f8" |
@@ -28,6 +28,8 @@ S = "${WORKDIR}/perl-${PV}" | |||
28 | 28 | ||
29 | inherit native | 29 | inherit native |
30 | 30 | ||
31 | export LD="${CCLD}" | ||
32 | |||
31 | do_configure () { | 33 | do_configure () { |
32 | ./Configure \ | 34 | ./Configure \ |
33 | -Dcc="${CC}" \ | 35 | -Dcc="${CC}" \ |