[morty][PATCH] Check libcc1 directory before disabling hardcoding of RPATHs

[morty][PATCH] Check libcc1 directory before disabling hardcoding of RPATHs

[Daniel Gomez]

Check if libcc1 directory exits before disabling hardcode_into_libs
configuration because of broken libtool in gcc recipes.

Signed-off-by: Daniel Gomez <daniel.gomez@silicon-gears.com>
---
 meta/recipes-devtools/gcc/gcc_5.4.bb | 3 ++-
 meta/recipes-devtools/gcc/gcc_6.4.bb | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-devtools/gcc/gcc_5.4.bb b/meta/recipes-devtools/gcc/gcc_5.4.bb
index b0a523c..9da8ece 100644
--- a/meta/recipes-devtools/gcc/gcc_5.4.bb
+++ b/meta/recipes-devtools/gcc/gcc_5.4.bb
@@ -9,7 +9,8 @@ ARM_INSTRUCTION_SET_armv4 = "arm"
 do_configure_prepend() {
 	# Easiest way to stop bad RPATHs getting into the library since we have a
 	# broken libtool here
-	sed -i -e 's/hardcode_into_libs=yes/hardcode_into_libs=no/' ${S}/libcc1/configure
+	if [ -d "${S}/libcc1" ]; then
+		sed -i -e 's/hardcode_into_libs=yes/hardcode_into_libs=no/' ${S}/libcc1/configure
 }
 
 BBCLASSEXTEND = "nativesdk"
diff --git a/meta/recipes-devtools/gcc/gcc_6.4.bb b/meta/recipes-devtools/gcc/gcc_6.4.bb
index b0a523c..9da8ece 100644
--- a/meta/recipes-devtools/gcc/gcc_6.4.bb
+++ b/meta/recipes-devtools/gcc/gcc_6.4.bb
@@ -9,7 +9,8 @@ ARM_INSTRUCTION_SET_armv4 = "arm"
 do_configure_prepend() {
 	# Easiest way to stop bad RPATHs getting into the library since we have a
 	# broken libtool here
-	sed -i -e 's/hardcode_into_libs=yes/hardcode_into_libs=no/' ${S}/libcc1/configure
+	if [ -d "${S}/libcc1" ]; then
+		sed -i -e 's/hardcode_into_libs=yes/hardcode_into_libs=no/' ${S}/libcc1/configure
 }
 
 BBCLASSEXTEND = "nativesdk"
-- 
2.7.4

✗ patchtest: failure for Check libcc1 directory before disabling hardcoding of RPATHs

[Patchwork]

== Series Details ==

Series: Check libcc1 directory before disabling hardcoding of RPATHs
Revision: 1
URL   : https://patchwork.openembedded.org/series/13254/
State : failure

== Summary ==


Thank you for submitting this patch series to OpenEmbedded Core. This is
an automated response. Several tests have been executed on the proposed
series by patchtest resulting in the following failures:



* Issue             Series cannot be parsed correctly due to malformed diff lines [test_mbox_format] 
  Suggested fix    Create the series again using git-format-patch and ensure it can be applied using git am
  Diff line         do_configure_prepend() {


* Issue             Series does not apply on top of target branch [test_series_merge_on_head] 
  Suggested fix    Rebase your series on top of targeted branch
  Targeted branch  morty (currently at 4b32784b8c)

* Patch            [morty] Check libcc1 directory before disabling hardcoding of RPATHs
 Issue             Shortlog does not follow expected format [test_shortlog_format] 
  Suggested fix    Commit shortlog (first line of commit message) should follow the format "<target>: <summary>"



If you believe any of these test results are incorrect, please reply to the
mailing list (openembedded-core@lists.openembedded.org) raising your concerns.
Otherwise we would appreciate you correcting the issues and submitting a new
version of the patchset if applicable. Please ensure you add/increment the
version number when sending the new version (i.e. [PATCH] -> [PATCH v2] ->
[PATCH v3] -> ...).

---
Guidelines:     https://www.openembedded.org/wiki/Commit_Patch_Message_Guidelines
Test framework: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest
Test suite:     http://git.yoctoproject.org/cgit/cgit.cgi/patchtest-oe

Re: [morty][PATCH] Check libcc1 directory before disabling hardcoding of RPATHs

[Andre McCurdy]

On Fri, Jul 27, 2018 at 6:07 AM, Daniel Gomez
<daniel.gomez@silicon-gears.com> wrote:
> Check if libcc1 directory exits before disabling hardcode_into_libs
> configuration because of broken libtool in gcc recipes.

A patch for morty should either be a backport which has already been
merged into all applicable later branches (ie if the same fix is
needed in sumo, rocko or pyro it needs to be merged to those branches
first) or it should explain clearly why it's only applicable to morty.

> Signed-off-by: Daniel Gomez <daniel.gomez@silicon-gears.com>
> ---
>  meta/recipes-devtools/gcc/gcc_5.4.bb | 3 ++-
>  meta/recipes-devtools/gcc/gcc_6.4.bb | 3 ++-
>  2 files changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/meta/recipes-devtools/gcc/gcc_5.4.bb b/meta/recipes-devtools/gcc/gcc_5.4.bb
> index b0a523c..9da8ece 100644
> --- a/meta/recipes-devtools/gcc/gcc_5.4.bb
> +++ b/meta/recipes-devtools/gcc/gcc_5.4.bb
> @@ -9,7 +9,8 @@ ARM_INSTRUCTION_SET_armv4 = "arm"
>  do_configure_prepend() {
>         # Easiest way to stop bad RPATHs getting into the library since we have a
>         # broken libtool here
> -       sed -i -e 's/hardcode_into_libs=yes/hardcode_into_libs=no/' ${S}/libcc1/configure
> +       if [ -d "${S}/libcc1" ]; then
> +               sed -i -e 's/hardcode_into_libs=yes/hardcode_into_libs=no/' ${S}/libcc1/configure

Missing fi ?

>  }
>
>  BBCLASSEXTEND = "nativesdk"
> diff --git a/meta/recipes-devtools/gcc/gcc_6.4.bb b/meta/recipes-devtools/gcc/gcc_6.4.bb
> index b0a523c..9da8ece 100644
> --- a/meta/recipes-devtools/gcc/gcc_6.4.bb
> +++ b/meta/recipes-devtools/gcc/gcc_6.4.bb
> @@ -9,7 +9,8 @@ ARM_INSTRUCTION_SET_armv4 = "arm"
>  do_configure_prepend() {
>         # Easiest way to stop bad RPATHs getting into the library since we have a
>         # broken libtool here
> -       sed -i -e 's/hardcode_into_libs=yes/hardcode_into_libs=no/' ${S}/libcc1/configure
> +       if [ -d "${S}/libcc1" ]; then
> +               sed -i -e 's/hardcode_into_libs=yes/hardcode_into_libs=no/' ${S}/libcc1/configure
>  }
>
>  BBCLASSEXTEND = "nativesdk"
> --
> 2.7.4
>
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core

Re: [morty][PATCH] Check libcc1 directory before disabling hardcoding of RPATHs

[Daniel Gomez]

On vie, 2018-07-27 at 12:59 -0700, Andre McCurdy wrote:
> On Fri, Jul 27, 2018 at 6:07 AM, Daniel Gomez
> <daniel.gomez@silicon-gears.com> wrote:
> > 
> > Check if libcc1 directory exits before disabling hardcode_into_libs
> > configuration because of broken libtool in gcc recipes.
> A patch for morty should either be a backport which has already been
> merged into all applicable later branches (ie if the same fix is
> needed in sumo, rocko or pyro it needs to be merged to those branches
> first) or it should explain clearly why it's only applicable to morty.
Well, I have realized about the real problem and it is only affecting to 
the gcc_4.9.bb recipe in the meta-linaro repo and not in the poky one.
Basically, libcc1 support is included in gcc versions >= 5.x but not in
older versions like 4.9.x and poky does not check the 'hardcode_into_libs'
flags in versions where libcc1 is not included.
> 
> > 
> > Signed-off-by: Daniel Gomez <daniel.gomez@silicon-gears.com>
> > ---
> >  meta/recipes-devtools/gcc/gcc_5.4.bb | 3 ++-
> >  meta/recipes-devtools/gcc/gcc_6.4.bb | 3 ++-
> >  2 files changed, 4 insertions(+), 2 deletions(-)
> > 
> > diff --git a/meta/recipes-devtools/gcc/gcc_5.4.bb b/meta/recipes-devtools/gcc/gcc_5.4.bb
> > index b0a523c..9da8ece 100644
> > --- a/meta/recipes-devtools/gcc/gcc_5.4.bb
> > +++ b/meta/recipes-devtools/gcc/gcc_5.4.bb
> > @@ -9,7 +9,8 @@ ARM_INSTRUCTION_SET_armv4 = "arm"
> >  do_configure_prepend() {
> >         # Easiest way to stop bad RPATHs getting into the library since we have a
> >         # broken libtool here
> > -       sed -i -e 's/hardcode_into_libs=yes/hardcode_into_libs=no/' ${S}/libcc1/configure
> > +       if [ -d "${S}/libcc1" ]; then
> > +               sed -i -e 's/hardcode_into_libs=yes/hardcode_into_libs=no/' ${S}/libcc1/configure
> Missing fi ?
Yes! I forgot to copy it from the original patch:
https://lists.linaro.org/pipermail/openembedded/2018-March/000137.html
> > 
> >  }
> > 
> >  BBCLASSEXTEND = "nativesdk"
> > diff --git a/meta/recipes-devtools/gcc/gcc_6.4.bb b/meta/recipes-devtools/gcc/gcc_6.4.bb
> > index b0a523c..9da8ece 100644
> > --- a/meta/recipes-devtools/gcc/gcc_6.4.bb
> > +++ b/meta/recipes-devtools/gcc/gcc_6.4.bb
> > @@ -9,7 +9,8 @@ ARM_INSTRUCTION_SET_armv4 = "arm"
> >  do_configure_prepend() {
> >         # Easiest way to stop bad RPATHs getting into the library since we have a
> >         # broken libtool here
> > -       sed -i -e 's/hardcode_into_libs=yes/hardcode_into_libs=no/' ${S}/libcc1/configure
> > +       if [ -d "${S}/libcc1" ]; then
> > +               sed -i -e 's/hardcode_into_libs=yes/hardcode_into_libs=no/' ${S}/libcc1/configure
> >  }
> > 
> >  BBCLASSEXTEND = "nativesdk"
> > --
> > 2.7.4
> > 
> > --
> > _______________________________________________
> > Openembedded-core mailing list
> > Openembedded-core@lists.openembedded.org
> > http://lists.openembedded.org/mailman/listinfo/openembedded-core