Patchwork Fail in perl-native_5.14.2.bb

login
register
mail settings
Submitter Steven Munk Østergaard
Date Sept. 27, 2012, 2:36 p.m.
Message ID <50646480.40108@rosetechnology.dk>
Download mbox | patch
Permalink /patch/37367/
State New
Headers show

Comments

Steven Munk Østergaard - Sept. 27, 2012, 2:36 p.m.
Hello, peace be with thee... :)

I found a mistake in the "do_configure()" function of: 
"perl-native_5.14.2.bb"

I am not experienced enough with mailing list to produce patches, but i 
will try...

Explanation:
sed is in " -e "s%/perl5%/perl%g" \ " replacing parts of @DESTDIR@ which 
makes its patch way to long and doubles up parts of it's folders...
This patch works for me...


      case "${TARGET_ARCH}" in
Richard Purdie - Sept. 28, 2012, 1:18 p.m.
On Thu, 2012-09-27 at 16:36 +0200, Steven Munk Østergaard wrote:
> Hello, peace be with thee... :)
> 
> I found a mistake in the "do_configure()" function of: 
> "perl-native_5.14.2.bb"
> 
> I am not experienced enough with mailing list to produce patches, but i 
> will try...
> 
> Explanation:
> sed is in " -e "s%/perl5%/perl%g" \ " replacing parts of @DESTDIR@ which 
> makes its patch way to long and doubles up parts of it's folders...
> This patch works for me...
> 
> 
> Index: perl/perl_5.14.2.bb
> ===================================================================
> --- perl.orig/perl_5.14.2.bb
> +++ perl/perl_5.14.2.bb
> @@ -146,14 +146,14 @@ do_configure() {
>       ${@base_contains('DISTRO_FEATURES', 'largefile', '', 
> 'do_nolargefile', d)}
> 
>           # Update some paths in the configuration
> -        sed -i -e 's,@DESTDIR@,${prefix},g' \
> -               -e 's,@ARCH@-thread-multi,,g' \
> +        sed -i -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%/perl5%/perl%g" \
> +           -e 's,@DESTDIR@,${prefix},g' \
>               config.sh-${TARGET_ARCH}-${TARGET_OS}
> 
>       case "${TARGET_ARCH}" in

Thanks, there are a number of problems in this area. Please see the
patch I just posted which hopefully addresses all this once and for all.

Cheers,

Richard

Patch

Index: perl/perl_5.14.2.bb
===================================================================
--- perl.orig/perl_5.14.2.bb
+++ perl/perl_5.14.2.bb
@@ -146,14 +146,14 @@  do_configure() {
      ${@base_contains('DISTRO_FEATURES', 'largefile', '', 
'do_nolargefile', d)}

          # Update some paths in the configuration
-        sed -i -e 's,@DESTDIR@,${prefix},g' \
-               -e 's,@ARCH@-thread-multi,,g' \
+        sed -i -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%/perl5%/perl%g" \
+           -e 's,@DESTDIR@,${prefix},g' \
              config.sh-${TARGET_ARCH}-${TARGET_OS}