From 5b2ff14255aeac01893c83754c6000ba12d717d0 Mon Sep 17 00:00:00 2001 From: Hongxu Jia Date: Mon, 11 Mar 2013 14:44:19 +0800 Subject: 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 Signed-off-by: Richard Purdie --- meta/recipes-devtools/perl/perl-5.14.2/generate-sh.patch | 16 ++++++++++++---- 1 file 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] Use the ld flags from the supplied configuration file. For sh we need the flags that specify to build PIC code so that the shared libraries work. -Index: perl-5.8.8/Cross/generate_config_sh +Index: perl-5.14.2/Cross/generate_config_sh =================================================================== ---- perl-5.8.8.orig/Cross/generate_config_sh 2003-09-05 18:31:08.000000000 +1000 -+++ perl-5.8.8/Cross/generate_config_sh 2007-05-30 09:12:50.000000000 +1000 +--- perl-5.14.2.orig/Cross/generate_config_sh 2010-12-30 04:07:14.000000000 +0200 ++++ perl-5.14.2/Cross/generate_config_sh 2012-11-22 15:58:49.852852805 +0200 @@ -19,10 +19,10 @@ $callbacks->{'ar'} = [\&simple_process, ["AR", "arm-linux-ar"]]; $callbacks->{'archname'} = [\&simple_process, ["SYS", "armv4l-linux"]]; @@ -22,7 +22,15 @@ Index: perl-5.8.8/Cross/generate_config_sh $callbacks->{'ccname'} = [\&simple_process, ["CC", "arm-linux-gcc"]]; $callbacks->{'cpp'} = [\&simple_process, ["CCP", "arm-linux-cpp"]]; $callbacks->{'cppflags'} = [\&simple_process, ["CCPFLAGS", "-fno-strict-aliasing"]]; -@@ -105,6 +105,23 @@ +@@ -30,6 +30,7 @@ + $callbacks->{'cppstdin'} = [\&simple_process_append, ["CC", "arm-linux-gcc -E", "-E"]]; + $callbacks->{'full_ar'} = [\&backtick, ["AR", "which $ENV{AR}", "/usr/local/arm/2.95.3/bin/arm-linux-ar"]]; + $callbacks->{'ld'} = [\&simple_process, ["LD", "arm-linux-ld"]]; ++$callbacks->{'lddlflags'} = [\&simple_process, ["LDDLFLAGS", ""]]; + $callbacks->{'ldflags'} = [\&simple_process, ["LDFLAGS", ""]]; + $callbacks->{'ldflags_uselargefiles'} = [\&simple_process, ["LDFLAGS", ""]]; + $callbacks->{'myarchname'} = [\&simple_process, ["SYS", "armv4l-linux"]]; +@@ -105,6 +106,23 @@ } -- cgit v1.2.3-54-g00ecf