diff options
author | Christian Glindkamp <christian.glindkamp@taskit.de> | 2012-09-27 14:20:57 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-09-27 16:21:52 +0100 |
commit | 876ec81c039132d07a5f3d99bae40d6154351d41 (patch) | |
tree | 92fd3ebc3423c6af4b47e5ef7a594e2125cb954b /meta/recipes-devtools/perl | |
parent | 30b0c3c6f4b17109377205bfd90de9231ca83be1 (diff) | |
download | poky-876ec81c039132d07a5f3d99bae40d6154351d41.tar.gz |
perl: Fix nativesdk install path
Commit 38234f2e276356b1d77a87ceabc486107e336d19 tried to fix the sed
expressions by anchoring the left side of the search regexp to prevent
$prefix$prefix type expression in the perl config. For nativesdk this is
not enough. Adding anchors on both side fixes this.
(From OE-Core rev: bf84ec0fb9a4d01ea75447c2efe8e534ce975b53)
Signed-off-by: Christian Glindkamp <christian.glindkamp@taskit.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/perl')
-rw-r--r-- | meta/recipes-devtools/perl/perl_5.14.2.bb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/meta/recipes-devtools/perl/perl_5.14.2.bb b/meta/recipes-devtools/perl/perl_5.14.2.bb index 3c1360f9a3..00098553dd 100644 --- a/meta/recipes-devtools/perl/perl_5.14.2.bb +++ b/meta/recipes-devtools/perl/perl_5.14.2.bb | |||
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://Copying;md5=2b4c6ffbcfcbdee469f02565f253d81a \ | |||
7 | # We need gnugrep (for -I) | 7 | # We need gnugrep (for -I) |
8 | DEPENDS = "virtual/db grep-native" | 8 | DEPENDS = "virtual/db grep-native" |
9 | DEPENDS += "gdbm zlib" | 9 | DEPENDS += "gdbm zlib" |
10 | PR = "r9" | 10 | PR = "r10" |
11 | 11 | ||
12 | # 5.10.1 has Module::Build built-in | 12 | # 5.10.1 has Module::Build built-in |
13 | PROVIDES += "libmodule-build-perl" | 13 | PROVIDES += "libmodule-build-perl" |
@@ -150,9 +150,9 @@ do_configure() { | |||
150 | -e 's,@ARCH@-thread-multi,,g' \ | 150 | -e 's,@ARCH@-thread-multi,,g' \ |
151 | -e 's,@ARCH@,${TARGET_ARCH}-${TARGET_OS},g' \ | 151 | -e 's,@ARCH@,${TARGET_ARCH}-${TARGET_OS},g' \ |
152 | -e 's,@STAGINGDIR@,${STAGING_DIR_HOST},g' \ | 152 | -e 's,@STAGINGDIR@,${STAGING_DIR_HOST},g' \ |
153 | -e "s%\([ \"^\',=]\+\)/usr/include%\1${STAGING_INCDIR}%g" \ | 153 | -e "s%\([ \"^\',=]\+\)/usr/include\([ \"^\',=]\+\)%\1${STAGING_INCDIR}\2%g" \ |
154 | -e "s%\([ \"^\',=]\+\)/usr/lib/%\1${libdir}/%g" \ | 154 | -e "s%\([ \"^\',=]\+\)/usr/lib/\([ \"^\',=]\+\)%\1${libdir}/\2%g" \ |
155 | -e "s%\([ \"^\',=]\+\)/usr/%\1${exec_prefix}/%g" \ | 155 | -e "s%\([ \"^\',=]\+\)/usr/\([ \"^\',=]\+\)%\1${exec_prefix}/\2%g" \ |
156 | -e "s%/perl5%/perl%g" \ | 156 | -e "s%/perl5%/perl%g" \ |
157 | config.sh-${TARGET_ARCH}-${TARGET_OS} | 157 | config.sh-${TARGET_ARCH}-${TARGET_OS} |
158 | 158 | ||