diff options
author | Scott Ellis <scott@jumpnowtek.com> | 2011-04-18 04:22:46 -0400 |
---|---|---|
committer | Tom Rini <tom_rini@mentor.com> | 2011-06-02 12:02:52 -0700 |
commit | dd8ac3a064c2a317360335b866a76b0fa6ebfc69 (patch) | |
tree | 4744aec0cd1259ee5f62ee61acb5343c87b577d9 /recipes/perl | |
parent | 03f4178154570623708f6e33b39aa863305a59d0 (diff) | |
download | openembedded-dd8ac3a064c2a317360335b866a76b0fa6ebfc69.tar.gz |
perl-native multilib patch for ubuntu 11.04
Original patch from Scott Ellis
Modified by US replacing `uname -m` by '*' to support non x86_64 targets
(based on recommendations on the mailing list)
(2011.03-maintenance cherry-pick:
Tested-by: george huntington <george.huntingtoniii@gmail.com>)
Signed-off-by: Scott Ellis <scott@jumpnowtek.com>
Signed-off-by: Ulf Samuelsson <ulf.samuelsson@atmel.com>
Diffstat (limited to 'recipes/perl')
-rw-r--r-- | recipes/perl/files/ubuntu-11.04-multiarch.patch | 12 | ||||
-rw-r--r-- | recipes/perl/perl-native_5.10.1.bb | 3 |
2 files changed, 15 insertions, 0 deletions
diff --git a/recipes/perl/files/ubuntu-11.04-multiarch.patch b/recipes/perl/files/ubuntu-11.04-multiarch.patch new file mode 100644 index 0000000000..4f51eb3a4e --- /dev/null +++ b/recipes/perl/files/ubuntu-11.04-multiarch.patch @@ -0,0 +1,12 @@ +diff --git perl-5.10.1/Configure-orig perl-5.10.1/Configure +index 5508fd2..8ee7dae 100755 +--- perl-5.10.1/Configure-orig ++++ perl-5.10.1/Configure +@@ -1311,6 +1311,7 @@ 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" ++test -f /usr/lib/*-linux-gnu/libc.so && glibpth="/usr/lib/*-linux-gnu $glibpth" + test -d /usr/lib64 && glibpth="$glibpth /lib64 /usr/lib64 /usr/local/lib64" + + : Private path used by Configure to find libraries. Its value diff --git a/recipes/perl/perl-native_5.10.1.bb b/recipes/perl/perl-native_5.10.1.bb index 5aa0c7b123..3dafc10a17 100644 --- a/recipes/perl/perl-native_5.10.1.bb +++ b/recipes/perl/perl-native_5.10.1.bb @@ -20,6 +20,7 @@ SRC_URI = "http://ftp.funet.fi/pub/CPAN/src/perl-${PV}.tar.gz;name=perl-${PV} \ file://native-nopacklist.patch \ file://native-perlinc.patch \ file://perl-fix-cross-library-check.patch \ + file://ubuntu-11.04-multiarch.patch \ " SRC_URI[perl-5.10.1.md5sum] = "b9b2fdb957f50ada62d73f43ee75d044" @@ -29,6 +30,8 @@ S = "${WORKDIR}/perl-${PV}" inherit native +export LD="${CC}" + do_configure () { ./Configure \ -Dcc="${CC}" \ |