summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHongxu Jia <hongxu.jia@windriver.com>2013-03-11 14:44:19 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-04-23 13:00:52 +0100
commit5b2ff14255aeac01893c83754c6000ba12d717d0 (patch)
treea5bccbaece6655e236a1ea3df4754e9ff73b2553
parent04b34a50eb5e3d2561e5107d746b7f22b8e44e70 (diff)
downloadpoky-5b2ff14255aeac01893c83754c6000ba12d717d0.tar.gz
generate-sh.patch:fix autoreconf run failed on gmae-toolchain
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. Cherry-pick commit df1a1dcb6d95a4aa558019530445373537c4efdd [YOCTO #3338] (From OE-Core rev: ff83f3685ce79712733822cf298d20538757b54d) Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/perl/perl-5.14.2/generate-sh.patch16
1 files changed, 12 insertions, 4 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]
3Use the ld flags from the supplied configuration file. For sh we need the 3Use the ld flags from the supplied configuration file. For sh we need the
4flags that specify to build PIC code so that the shared libraries work. 4flags that specify to build PIC code so that the shared libraries work.
5 5
6Index: perl-5.8.8/Cross/generate_config_sh 6Index: 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