diff options
| author | Marcin Juszkiewicz <hrw@openembedded.org> | 2007-06-07 08:36:20 +0000 |
|---|---|---|
| committer | Marcin Juszkiewicz <hrw@openembedded.org> | 2007-06-07 08:36:20 +0000 |
| commit | 72547c27eabe47d2acfd6c8212bc301e6cf9b4fd (patch) | |
| tree | 82c478bd4cbae44a66f6388a98223dd9f2e75ccd | |
| parent | c53e2a7cc1ffbd279bed3a128accc4f3375d9e50 (diff) | |
| parent | a5f0bf16d2273f5541bfeb0ccabf4a564fe0602f (diff) | |
merge of '2418db31e5eea055a273730099614b6244381544'
and '7c5741a3a4f2a7ad883bd3230a46e4c9ebac2106'
| -rw-r--r-- | packages/perl/perl-5.8.8/native-ssp.patch | 14 | ||||
| -rw-r--r-- | packages/perl/perl-native_5.8.8.bb | 5 |
2 files changed, 17 insertions, 2 deletions
diff --git a/packages/perl/perl-5.8.8/native-ssp.patch b/packages/perl/perl-5.8.8/native-ssp.patch new file mode 100644 index 0000000000..f815aad452 --- /dev/null +++ b/packages/perl/perl-5.8.8/native-ssp.patch @@ -0,0 +1,14 @@ +Fix for compiling with ssp enabled gcc: +See http://bugs.openembedded.org/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/packages/perl/perl-native_5.8.8.bb b/packages/perl/perl-native_5.8.8.bb index d4896daa12..dd9a581614 100644 --- a/packages/perl/perl-native_5.8.8.bb +++ b/packages/perl/perl-native_5.8.8.bb @@ -3,7 +3,7 @@ HOMEPAGE = "http://www.perl.org/" SECTION = "libs" LICENSE = "Artistic|GPL" DEPENDS = "virtual/db-native gdbm-native" -PR = "r10" +PR = "r11" FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/perl-${PV}" @@ -14,7 +14,8 @@ SRC_URI = "http://ftp.funet.fi/pub/CPAN/src/perl-${PV}.tar.gz \ file://native-nopacklist.patch;patch=1 \ file://native-no-gdbminc.patch;patch=1 \ file://native-perlinc.patch;patch=1 \ - file://native-makedepend-dash.patch;patch=1" + file://native-makedepend-dash.patch;patch=1 \ + file://native-ssp.patch;patch=1" S = "${WORKDIR}/perl-${PV}" |