summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-devtools/perl/perl-5.12.3/native-ssp.patch16
-rw-r--r--meta/recipes-devtools/perl/perl_5.12.3.bb14
2 files changed, 7 insertions, 23 deletions
diff --git a/meta/recipes-devtools/perl/perl-5.12.3/native-ssp.patch b/meta/recipes-devtools/perl/perl-5.12.3/native-ssp.patch
deleted file mode 100644
index e1e6f08735..0000000000
--- a/meta/recipes-devtools/perl/perl-5.12.3/native-ssp.patch
+++ /dev/null
@@ -1,16 +0,0 @@
1Upstream-Status:Inappropriate [embedded specific]
2
3Fix for compiling with ssp enabled gcc:
4See http://bugs.openembedded.net/show_bug.cgi?id=1980
5
6diff -Naur perl-5.8.7.orig/cflags.SH perl-5.8.7/cflags.SH
7--- perl-5.8.7.orig/cflags.SH 2002-09-30 10:59:07.000000000 +0000
8+++ perl-5.8.7/cflags.SH 2005-10-02 04:08:39.000000000 +0000
9@@ -165,6 +165,8 @@
10 esac
11
12 : Can we perhaps use $ansi2knr here
13+ [[ $file == regcomp ]] && export ccflags="${ccflags} -fno-stack-protector"
14+ [[ $file == regexec ]] && export ccflags="${ccflags} -fno-stack-protector"
15 echo "$cc -c -DPERL_CORE $ccflags $optimize $warn"
16 eval "$also "'"$cc -DPERL_CORE -c $ccflags $optimize $warn"'
diff --git a/meta/recipes-devtools/perl/perl_5.12.3.bb b/meta/recipes-devtools/perl/perl_5.12.3.bb
index 07b8eacb3f..847ee59c30 100644
--- a/meta/recipes-devtools/perl/perl_5.12.3.bb
+++ b/meta/recipes-devtools/perl/perl_5.12.3.bb
@@ -58,13 +58,13 @@ SRC_URI = "http://www.cpan.org/src/5.0/perl-${PV}.tar.gz \
58 file://parallel_build_fix_4.patch \ 58 file://parallel_build_fix_4.patch \
59 file://parallel_build_fix_5.patch \ 59 file://parallel_build_fix_5.patch \
60 file://parallel_build_fix_6.patch \ 60 file://parallel_build_fix_6.patch \
61 file://Makefile.SH.patch;patch=1 \ 61 file://Makefile.SH.patch \
62 file://installperl.patch;patch=1 \ 62 file://installperl.patch \
63 file://perl-dynloader.patch;patch=1 \ 63 file://perl-dynloader.patch \
64 file://perl-moreconfig.patch;patch=1 \ 64 file://perl-moreconfig.patch \
65 file://letgcc-find-errno.patch;patch=1 \ 65 file://letgcc-find-errno.patch \
66 file://generate-sh.patch;patch=1 \ 66 file://generate-sh.patch \
67 file://09_fix_installperl.patch;patch=1 \ 67 file://09_fix_installperl.patch \
68 file://native-perlinc.patch \ 68 file://native-perlinc.patch \
69 file://perl-enable-gdbm.patch \ 69 file://perl-enable-gdbm.patch \
70 file://cross-generate_uudmap.patch \ 70 file://cross-generate_uudmap.patch \