Skip to contentSkip to conversation

Check libcc1 directory before disabling hardcoding of RPATHs

PATCH In review Daniel Gomez 3 participants 4 messages Jul 27, 2018 – Aug 10, 2018

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Check libcc1 directory before disabling hardcoding of RPATHs

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

---
 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(-)
meta/recipes-devtools/gcc/gcc_5.4.bb +0 -0
index b0a523c..9da8ece 100644
@@ -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"
meta/recipes-devtools/gcc/gcc_6.4.bb +0 -0
index b0a523c..9da8ece 100644
@@ -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
#1 lore raw

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

== 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 ([email protected]) 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
#2 lore raw
In reply to Daniel Gomez
Quoted 2 lines · Daniel Gomez

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.

Quoted 11 lines
---
 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(-)
meta/recipes-devtools/gcc/gcc_5.4.bb +0 -0
index b0a523c..9da8ece 100644

meta/recipes-devtools/gcc/gcc_5.4.bb ARM_INSTRUCTION_SET_armv4 = "arm" · line 13

Quoted 6 lines
meta/recipes-devtools/gcc/gcc_5.4.bb +2 -1
@@ -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 ?

Quoted 25 lines
meta/recipes-devtools/gcc/gcc_5.4.bb +0 -0
 }
 
 BBCLASSEXTEND = "nativesdk"
meta/recipes-devtools/gcc/gcc_6.4.bb +2 -2
index b0a523c..9da8ece 100644
@@ -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
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core

#3 lore raw
Quoted 9 lines · Andre McCurdy
Quoted 3 lines · Daniel Gomez

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.

Quoted 8 lines
Quoted 8 lines

---
 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(-)
Quoted 12 lines

meta/recipes-devtools/gcc/gcc_5.4.bb ARM_INSTRUCTION_SET_armv4 = "arm" · line 13

Quoted 11 lines
meta/recipes-devtools/gcc/gcc_5.4.bb +2 -1
index b0a523c..9da8ece 100644
@@ -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

Quoted 26 lines
Quoted 26 lines
meta/recipes-devtools/gcc/gcc_5.4.bb +0 -0
  }
 

 BBCLASSEXTEND = "nativesdk"

meta/recipes-devtools/gcc/gcc_6.4.bb +2 -1
index b0a523c..9da8ece 100644
@@ -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
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core