[oe-commits] Richard Purdie : gcc: Fix removal of libiberty.a
git version control
git at git.openembedded.org
Tue Jul 5 10:25:16 UTC 2011
Module: openembedded-core.git
Branch: master
Commit: b8d72e3af93ff9e2808fef4fe7b9d00b68bf9715
URL: http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=b8d72e3af93ff9e2808fef4fe7b9d00b68bf9715
Author: Richard Purdie <richard.purdie at linuxfoundation.org>
Date: Mon Jul 4 15:37:18 2011 +0100
gcc: Fix removal of libiberty.a
The changes in commit 553a92c442bc3a35d1520a22e640a3a0e377b8f7 were not applying correctly
due to the error: "find: paths must precede expression"
This patch corrects the find syntax.
[YOCTO #1199]
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
meta/recipes-devtools/gcc/gcc-4.6.inc | 2 +-
.../gcc/gcc-cross-intermediate.inc | 4 ++--
meta/recipes-devtools/gcc/gcc-package-cross.inc | 4 ++--
meta/recipes-devtools/gcc/gcc-package-target.inc | 4 ++--
meta/recipes-devtools/gcc/gcc_4.5.1.bb | 2 +-
5 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/meta/recipes-devtools/gcc/gcc-4.6.inc b/meta/recipes-devtools/gcc/gcc-4.6.inc
index a012049..6844995 100644
--- a/meta/recipes-devtools/gcc/gcc-4.6.inc
+++ b/meta/recipes-devtools/gcc/gcc-4.6.inc
@@ -1,6 +1,6 @@
require gcc-common.inc
-PR = "r4"
+PR = "r5"
# Third digit in PV should be incremented after a minor release
# happens from this branch on gcc e.g. currently its 4.6.0
diff --git a/meta/recipes-devtools/gcc/gcc-cross-intermediate.inc b/meta/recipes-devtools/gcc/gcc-cross-intermediate.inc
index 05b5dbc..df5958a 100644
--- a/meta/recipes-devtools/gcc/gcc-cross-intermediate.inc
+++ b/meta/recipes-devtools/gcc/gcc-cross-intermediate.inc
@@ -40,8 +40,8 @@ do_install () {
rm -rf ${D}${datadir}/
# We use libiberty from binutils
- find -name libiberty.a ${D}${exec_prefix}/lib | xargs rm -f
- find -name libiberty.h ${D}${exec_prefix}/lib | xargs rm -f
+ find ${D}${exec_prefix}/lib -name libiberty.a | xargs rm -f
+ find ${D}${exec_prefix}/lib -name libiberty.h | xargs rm -f
# Insert symlinks into libexec so when tools without a prefix are searched for, the correct ones are
# found. These need to be relative paths so they work in different locations.
diff --git a/meta/recipes-devtools/gcc/gcc-package-cross.inc b/meta/recipes-devtools/gcc/gcc-package-cross.inc
index b51336b..3d27788 100644
--- a/meta/recipes-devtools/gcc/gcc-package-cross.inc
+++ b/meta/recipes-devtools/gcc/gcc-package-cross.inc
@@ -29,8 +29,8 @@ do_install () {
done
# We use libiberty from binutils
- find -name libiberty.a ${D}${exec_prefix}/lib | xargs rm -f
- find -name libiberty.h ${D}${exec_prefix}/lib | xargs rm -f
+ find ${D}${exec_prefix}/lib -name libiberty.a | xargs rm -f
+ find ${D}${exec_prefix}/lib -name libiberty.h | xargs rm -f
# gcc-runtime installs libgcc into a special location in staging since it breaks doing a standalone build
if [ "${PN}" == "gcc-cross" -o "${PN}" == "gcc-crosssdk" ]; then
diff --git a/meta/recipes-devtools/gcc/gcc-package-target.inc b/meta/recipes-devtools/gcc/gcc-package-target.inc
index 43e2bd5..6cc308c 100644
--- a/meta/recipes-devtools/gcc/gcc-package-target.inc
+++ b/meta/recipes-devtools/gcc/gcc-package-target.inc
@@ -88,8 +88,8 @@ do_install () {
rm -f *gcc-?.?*
# We use libiberty from binutils
- find -name libiberty.a ${D}${exec_prefix}/lib | xargs rm -f
- find -name libiberty.h ${D}${exec_prefix}/lib | xargs rm -f
+ find ${D}${exec_prefix}/lib -name libiberty.a | xargs rm -f
+ find ${D}${exec_prefix}/lib -name libiberty.h | xargs rm -f
# Symlinks so we can use these trivially on the target
ln -sf ${TARGET_PREFIX}g77 g77 || true
diff --git a/meta/recipes-devtools/gcc/gcc_4.5.1.bb b/meta/recipes-devtools/gcc/gcc_4.5.1.bb
index e04f443..785d719 100644
--- a/meta/recipes-devtools/gcc/gcc_4.5.1.bb
+++ b/meta/recipes-devtools/gcc/gcc_4.5.1.bb
@@ -1,4 +1,4 @@
-PR = "r5"
+PR = "r6"
require gcc-${PV}.inc
require gcc-configure-target.inc
require gcc-package-target.inc
More information about the Openembedded-commits
mailing list