summaryrefslogtreecommitdiff
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 e1e6f0873..000000000
--- a/meta/recipes-devtools/perl/perl-5.12.3/native-ssp.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Upstream-Status:Inappropriate [embedded specific]
-
-Fix for compiling with ssp enabled gcc:
-See http://bugs.openembedded.net/show_bug.cgi?id=1980
-
-diff -Naur perl-5.8.7.orig/cflags.SH perl-5.8.7/cflags.SH
---- perl-5.8.7.orig/cflags.SH 2002-09-30 10:59:07.000000000 +0000
-+++ perl-5.8.7/cflags.SH 2005-10-02 04:08:39.000000000 +0000
-@@ -165,6 +165,8 @@
- esac
-
- : Can we perhaps use $ansi2knr here
-+ [[ $file == regcomp ]] && export ccflags="${ccflags} -fno-stack-protector"
-+ [[ $file == regexec ]] && export ccflags="${ccflags} -fno-stack-protector"
- echo "$cc -c -DPERL_CORE $ccflags $optimize $warn"
- 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 07b8eacb3..847ee59c3 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 \
file://parallel_build_fix_4.patch \
file://parallel_build_fix_5.patch \
file://parallel_build_fix_6.patch \
- file://Makefile.SH.patch;patch=1 \
- file://installperl.patch;patch=1 \
- file://perl-dynloader.patch;patch=1 \
- file://perl-moreconfig.patch;patch=1 \
- file://letgcc-find-errno.patch;patch=1 \
- file://generate-sh.patch;patch=1 \
- file://09_fix_installperl.patch;patch=1 \
+ file://Makefile.SH.patch \
+ file://installperl.patch \
+ file://perl-dynloader.patch \
+ file://perl-moreconfig.patch \
+ file://letgcc-find-errno.patch \
+ file://generate-sh.patch \
+ file://09_fix_installperl.patch \
file://native-perlinc.patch \
file://perl-enable-gdbm.patch \
file://cross-generate_uudmap.patch \