diff options
author | Laurentiu Palcu <laurentiu.palcu@intel.com> | 2012-11-22 17:22:10 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-11-24 15:12:32 +0000 |
commit | df1a1dcb6d95a4aa558019530445373537c4efdd (patch) | |
tree | e19ca46d5fffaad6e11dcb2da3043925b7685b78 /meta/recipes-devtools | |
parent | 3ac623802b30d6a33a1bf0afeca664ed6fec4d28 (diff) | |
download | poky-df1a1dcb6d95a4aa558019530445373537c4efdd.tar.gz |
perl: use the exported LDDLFLAGS in generate_config_sh script
The perl shared libraries did not have RPATHs set and that made
autoreconf fail when using the SDK. The LDDLFLAGS environment variable
was already exported in the recipe but was not used when generating the
config.sh.
[YOCTO #3338]
(From OE-Core rev: f6f5bdace473d0dd1dd5b8bdc7ebbb24fc6ee90d)
Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com>
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/generate-sh.patch | 16 | ||||
-rw-r--r-- | meta/recipes-devtools/perl/perl_5.14.2.bb | 2 |
2 files changed, 13 insertions, 5 deletions
diff --git a/meta/recipes-devtools/perl/perl-5.14.2/generate-sh.patch b/meta/recipes-devtools/perl/perl-5.14.2/generate-sh.patch index 47f91c56d3..27f6e691c0 100644 --- a/meta/recipes-devtools/perl/perl-5.14.2/generate-sh.patch +++ b/meta/recipes-devtools/perl/perl-5.14.2/generate-sh.patch | |||
@@ -3,10 +3,10 @@ Upstream-Status:Inappropriate [embedded specific] | |||
3 | Use the ld flags from the supplied configuration file. For sh we need the | 3 | Use the ld flags from the supplied configuration file. For sh we need the |
4 | flags that specify to build PIC code so that the shared libraries work. | 4 | flags that specify to build PIC code so that the shared libraries work. |
5 | 5 | ||
6 | Index: perl-5.8.8/Cross/generate_config_sh | 6 | Index: perl-5.14.2/Cross/generate_config_sh |
7 | =================================================================== | 7 | =================================================================== |
8 | --- perl-5.8.8.orig/Cross/generate_config_sh 2003-09-05 18:31:08.000000000 +1000 | 8 | --- perl-5.14.2.orig/Cross/generate_config_sh 2010-12-30 04:07:14.000000000 +0200 |
9 | +++ perl-5.8.8/Cross/generate_config_sh 2007-05-30 09:12:50.000000000 +1000 | 9 | +++ perl-5.14.2/Cross/generate_config_sh 2012-11-22 15:58:49.852852805 +0200 |
10 | @@ -19,10 +19,10 @@ | 10 | @@ -19,10 +19,10 @@ |
11 | $callbacks->{'ar'} = [\&simple_process, ["AR", "arm-linux-ar"]]; | 11 | $callbacks->{'ar'} = [\&simple_process, ["AR", "arm-linux-ar"]]; |
12 | $callbacks->{'archname'} = [\&simple_process, ["SYS", "armv4l-linux"]]; | 12 | $callbacks->{'archname'} = [\&simple_process, ["SYS", "armv4l-linux"]]; |
@@ -22,7 +22,15 @@ Index: perl-5.8.8/Cross/generate_config_sh | |||
22 | $callbacks->{'ccname'} = [\&simple_process, ["CC", "arm-linux-gcc"]]; | 22 | $callbacks->{'ccname'} = [\&simple_process, ["CC", "arm-linux-gcc"]]; |
23 | $callbacks->{'cpp'} = [\&simple_process, ["CCP", "arm-linux-cpp"]]; | 23 | $callbacks->{'cpp'} = [\&simple_process, ["CCP", "arm-linux-cpp"]]; |
24 | $callbacks->{'cppflags'} = [\&simple_process, ["CCPFLAGS", "-fno-strict-aliasing"]]; | 24 | $callbacks->{'cppflags'} = [\&simple_process, ["CCPFLAGS", "-fno-strict-aliasing"]]; |
25 | @@ -105,6 +105,23 @@ | 25 | @@ -30,6 +30,7 @@ |
26 | $callbacks->{'cppstdin'} = [\&simple_process_append, ["CC", "arm-linux-gcc -E", "-E"]]; | ||
27 | $callbacks->{'full_ar'} = [\&backtick, ["AR", "which $ENV{AR}", "/usr/local/arm/2.95.3/bin/arm-linux-ar"]]; | ||
28 | $callbacks->{'ld'} = [\&simple_process, ["LD", "arm-linux-ld"]]; | ||
29 | +$callbacks->{'lddlflags'} = [\&simple_process, ["LDDLFLAGS", ""]]; | ||
30 | $callbacks->{'ldflags'} = [\&simple_process, ["LDFLAGS", ""]]; | ||
31 | $callbacks->{'ldflags_uselargefiles'} = [\&simple_process, ["LDFLAGS", ""]]; | ||
32 | $callbacks->{'myarchname'} = [\&simple_process, ["SYS", "armv4l-linux"]]; | ||
33 | @@ -105,6 +106,23 @@ | ||
26 | 34 | ||
27 | } | 35 | } |
28 | 36 | ||
diff --git a/meta/recipes-devtools/perl/perl_5.14.2.bb b/meta/recipes-devtools/perl/perl_5.14.2.bb index bfc34d5caf..4dac5ceb86 100644 --- a/meta/recipes-devtools/perl/perl_5.14.2.bb +++ b/meta/recipes-devtools/perl/perl_5.14.2.bb | |||
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://Copying;md5=2b4c6ffbcfcbdee469f02565f253d81a \ | |||
7 | # We need gnugrep (for -I) | 7 | # We need gnugrep (for -I) |
8 | DEPENDS = "virtual/db grep-native" | 8 | DEPENDS = "virtual/db grep-native" |
9 | DEPENDS += "gdbm zlib" | 9 | DEPENDS += "gdbm zlib" |
10 | PR = "r14" | 10 | PR = "r15" |
11 | 11 | ||
12 | # 5.10.1 has Module::Build built-in | 12 | # 5.10.1 has Module::Build built-in |
13 | PROVIDES += "libmodule-build-perl" | 13 | PROVIDES += "libmodule-build-perl" |