summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJamie Lenehan <lenehan@twibble.org>2007-06-14 01:58:22 +0000
committerJamie Lenehan <lenehan@twibble.org>2007-06-14 01:58:22 +0000
commit8864f65ffecd14e4c6b404594ea484ed7ab9525d (patch)
tree769263f80c9aa8e394fe7e5c01dd90344e6f04dc
parent1d4ca5c243ec65cf27ec1d4d908163da029e6fcc (diff)
perl 5.8.8: Fix the regexp for removing /usr/local paths - it was eating the
seperating space in some cases. Report as part of #2483.
-rw-r--r--packages/perl/perl-5.8.8/generate-sh.patch2
-rw-r--r--packages/perl/perl_5.8.8.bb2
2 files changed, 2 insertions, 2 deletions
diff --git a/packages/perl/perl-5.8.8/generate-sh.patch b/packages/perl/perl-5.8.8/generate-sh.patch
index 50ce00b42f..ceb74196d6 100644
--- a/packages/perl/perl-5.8.8/generate-sh.patch
+++ b/packages/perl/perl-5.8.8/generate-sh.patch
@@ -35,7 +35,7 @@ Index: perl-5.8.8/Cross/generate_config_sh
+ $value =~ s/^\'//;
+ $value =~ s/\'$//;
+ # Remove -I/usr/local/... from the value
-+ $value =~ s#\W-I/usr/local/\w+\W##g;
++ $value =~ s#\W-I/usr/local/\w+\W# #g;
+ # Prepend env var (OE setting) to value
+ print("$key=\'$ENV{$envvar} $value\'\n");
+ }
diff --git a/packages/perl/perl_5.8.8.bb b/packages/perl/perl_5.8.8.bb
index edd0618a86..603280b423 100644
--- a/packages/perl/perl_5.8.8.bb
+++ b/packages/perl/perl_5.8.8.bb
@@ -5,7 +5,7 @@ LICENSE = "Artistic|GPL"
PRIORITY = "optional"
# We need gnugrep (for -I)
DEPENDS = "virtual/db perl-native grep-native"
-PR = "r20"
+PR = "r21"
# Major part of version
PVM = "5.8"