Patchwork [09/10] gcc: target: fix libiberty removal

login
register
mail settings
Submitter Constantin Musca
Date Feb. 4, 2013, 9:20 a.m.
Message ID <cc1eac48b971d3cad25bceed73f9fdac4674224e.1359967266.git.constantinx.musca@intel.com>
Download mbox | patch
Permalink /patch/43945/
State Accepted
Commit b3643415ad91dc77880cc5b95e9ad8cd9aef5c44
Headers show

Comments

Constantin Musca - Feb. 4, 2013, 9:20 a.m.
- use ${libdir} instead of ${exec_prefix}/lib

Fix the following warning:
WARNING: QA Issue: gcc: Files/directories were installed but not shipped
  /usr/lib64/libiberty.a

Signed-off-by: Constantin Musca <constantinx.musca@intel.com>
---
 meta/recipes-devtools/gcc/gcc-4.7.inc            | 2 +-
 meta/recipes-devtools/gcc/gcc-package-target.inc | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

Patch

diff --git a/meta/recipes-devtools/gcc/gcc-4.7.inc b/meta/recipes-devtools/gcc/gcc-4.7.inc
index d4caf61..2dc81f0 100644
--- a/meta/recipes-devtools/gcc/gcc-4.7.inc
+++ b/meta/recipes-devtools/gcc/gcc-4.7.inc
@@ -1,6 +1,6 @@ 
 require gcc-common.inc
 
-PR = "r15"
+PR = "r16"
 
 # Third digit in PV should be incremented after a minor release
 # happens from this branch on gcc e.g. currently its 4.7.1
diff --git a/meta/recipes-devtools/gcc/gcc-package-target.inc b/meta/recipes-devtools/gcc/gcc-package-target.inc
index c39aaa8..95a92c1 100644
--- a/meta/recipes-devtools/gcc/gcc-package-target.inc
+++ b/meta/recipes-devtools/gcc/gcc-package-target.inc
@@ -115,8 +115,8 @@  do_install () {
 	rm -f *gcc-?.?*
 
 	# We use libiberty from binutils
-	find ${D}${exec_prefix}/lib -name libiberty.a | xargs rm -f
-	find ${D}${exec_prefix}/lib -name libiberty.h | xargs rm -f
+	find ${D}${libdir} -name libiberty.a | xargs rm -f
+	find ${D}${libdir} -name libiberty.h | xargs rm -f
 
 	# Not sure why we end up with these but we don't want them...
 	rm -f ${TARGET_PREFIX}${TARGET_PREFIX}*