* [PATCH] perl: Fix nativesdk install path
@ 2012-09-27 12:20 Christian Glindkamp
2012-09-27 15:32 ` Saul Wold
0 siblings, 1 reply; 4+ messages in thread
From: Christian Glindkamp @ 2012-09-27 12:20 UTC (permalink / raw)
To: openembedded-core
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.
Signed-off-by: Christian Glindkamp <christian.glindkamp@taskit.de>
---
This is currently only build tested, but buildhistory for perl did not change.
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 3c1360f..0009855 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 \
# We need gnugrep (for -I)
DEPENDS = "virtual/db grep-native"
DEPENDS += "gdbm zlib"
-PR = "r9"
+PR = "r10"
# 5.10.1 has Module::Build built-in
PROVIDES += "libmodule-build-perl"
@@ -150,9 +150,9 @@ do_configure() {
-e 's,@ARCH@-thread-multi,,g' \
-e 's,@ARCH@,${TARGET_ARCH}-${TARGET_OS},g' \
-e 's,@STAGINGDIR@,${STAGING_DIR_HOST},g' \
- -e "s%\([ \"^\',=]\+\)/usr/include%\1${STAGING_INCDIR}%g" \
- -e "s%\([ \"^\',=]\+\)/usr/lib/%\1${libdir}/%g" \
- -e "s%\([ \"^\',=]\+\)/usr/%\1${exec_prefix}/%g" \
+ -e "s%\([ \"^\',=]\+\)/usr/include\([ \"^\',=]\+\)%\1${STAGING_INCDIR}\2%g" \
+ -e "s%\([ \"^\',=]\+\)/usr/lib/\([ \"^\',=]\+\)%\1${libdir}/\2%g" \
+ -e "s%\([ \"^\',=]\+\)/usr/\([ \"^\',=]\+\)%\1${exec_prefix}/\2%g" \
-e "s%/perl5%/perl%g" \
config.sh-${TARGET_ARCH}-${TARGET_OS}
--
1.7.2.5
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH] perl: Fix nativesdk install path
2012-09-27 12:20 [PATCH] perl: Fix nativesdk install path Christian Glindkamp
@ 2012-09-27 15:32 ` Saul Wold
2012-09-27 20:10 ` Mark Hatle
0 siblings, 1 reply; 4+ messages in thread
From: Saul Wold @ 2012-09-27 15:32 UTC (permalink / raw)
To: Christian Glindkamp; +Cc: openembedded-core
On 09/27/2012 05:20 AM, Christian Glindkamp wrote:
> 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.
>
> Signed-off-by: Christian Glindkamp <christian.glindkamp@taskit.de>
> ---
>
> This is currently only build tested, but buildhistory for perl did not change.
>
> 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 3c1360f..0009855 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 \
> # We need gnugrep (for -I)
> DEPENDS = "virtual/db grep-native"
> DEPENDS += "gdbm zlib"
> -PR = "r9"
> +PR = "r10"
>
> # 5.10.1 has Module::Build built-in
> PROVIDES += "libmodule-build-perl"
> @@ -150,9 +150,9 @@ do_configure() {
> -e 's,@ARCH@-thread-multi,,g' \
> -e 's,@ARCH@,${TARGET_ARCH}-${TARGET_OS},g' \
> -e 's,@STAGINGDIR@,${STAGING_DIR_HOST},g' \
> - -e "s%\([ \"^\',=]\+\)/usr/include%\1${STAGING_INCDIR}%g" \
> - -e "s%\([ \"^\',=]\+\)/usr/lib/%\1${libdir}/%g" \
> - -e "s%\([ \"^\',=]\+\)/usr/%\1${exec_prefix}/%g" \
> + -e "s%\([ \"^\',=]\+\)/usr/include\([ \"^\',=]\+\)%\1${STAGING_INCDIR}\2%g" \
> + -e "s%\([ \"^\',=]\+\)/usr/lib/\([ \"^\',=]\+\)%\1${libdir}/\2%g" \
> + -e "s%\([ \"^\',=]\+\)/usr/\([ \"^\',=]\+\)%\1${exec_prefix}/\2%g" \
> -e "s%/perl5%/perl%g" \
> config.sh-${TARGET_ARCH}-${TARGET_OS}
>
>
Merged into OE-Core
Thanks
Sau!
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] perl: Fix nativesdk install path
2012-09-27 15:32 ` Saul Wold
@ 2012-09-27 20:10 ` Mark Hatle
2012-09-28 13:17 ` Richard Purdie
0 siblings, 1 reply; 4+ messages in thread
From: Mark Hatle @ 2012-09-27 20:10 UTC (permalink / raw)
To: openembedded-core
I had to revert this patch. With it enabled, if I enable multilibs and build
for x86_64 (so my libdir == /usr/lib64), perl no longer finishes do_install().
When I revert it fixes that issue, but of course then the nativesdk is broken again.
--Mark
On 9/27/12 10:32 AM, Saul Wold wrote:
> On 09/27/2012 05:20 AM, Christian Glindkamp wrote:
>> 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.
>>
>> Signed-off-by: Christian Glindkamp <christian.glindkamp@taskit.de>
>> ---
>>
>> This is currently only build tested, but buildhistory for perl did not change.
>>
>> 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 3c1360f..0009855 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 \
>> # We need gnugrep (for -I)
>> DEPENDS = "virtual/db grep-native"
>> DEPENDS += "gdbm zlib"
>> -PR = "r9"
>> +PR = "r10"
>>
>> # 5.10.1 has Module::Build built-in
>> PROVIDES += "libmodule-build-perl"
>> @@ -150,9 +150,9 @@ do_configure() {
>> -e 's,@ARCH@-thread-multi,,g' \
>> -e 's,@ARCH@,${TARGET_ARCH}-${TARGET_OS},g' \
>> -e 's,@STAGINGDIR@,${STAGING_DIR_HOST},g' \
>> - -e "s%\([ \"^\',=]\+\)/usr/include%\1${STAGING_INCDIR}%g" \
>> - -e "s%\([ \"^\',=]\+\)/usr/lib/%\1${libdir}/%g" \
>> - -e "s%\([ \"^\',=]\+\)/usr/%\1${exec_prefix}/%g" \
>> + -e "s%\([ \"^\',=]\+\)/usr/include\([ \"^\',=]\+\)%\1${STAGING_INCDIR}\2%g" \
>> + -e "s%\([ \"^\',=]\+\)/usr/lib/\([ \"^\',=]\+\)%\1${libdir}/\2%g" \
>> + -e "s%\([ \"^\',=]\+\)/usr/\([ \"^\',=]\+\)%\1${exec_prefix}/\2%g" \
>> -e "s%/perl5%/perl%g" \
>> config.sh-${TARGET_ARCH}-${TARGET_OS}
>>
>>
>
> Merged into OE-Core
>
> Thanks
> Sau!
>
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
>
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] perl: Fix nativesdk install path
2012-09-27 20:10 ` Mark Hatle
@ 2012-09-28 13:17 ` Richard Purdie
0 siblings, 0 replies; 4+ messages in thread
From: Richard Purdie @ 2012-09-28 13:17 UTC (permalink / raw)
To: Mark Hatle; +Cc: openembedded-core
On Thu, 2012-09-27 at 15:10 -0500, Mark Hatle wrote:
> I had to revert this patch. With it enabled, if I enable multilibs and build
> for x86_64 (so my libdir == /usr/lib64), perl no longer finishes do_install().
>
> When I revert it fixes that issue, but of course then the nativesdk is broken again.
Please try with the patch I've just sent which should fix it.
Cheers,
Richard
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2012-09-28 13:30 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-09-27 12:20 [PATCH] perl: Fix nativesdk install path Christian Glindkamp
2012-09-27 15:32 ` Saul Wold
2012-09-27 20:10 ` Mark Hatle
2012-09-28 13:17 ` Richard Purdie
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox