summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2011-07-04 15:37:18 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-07-05 11:39:08 +0100
commit21effd66408423b02845186f1007b1a58f3fba31 (patch)
tree440634c3b3784e8694751e97030b9651d11d59c5
parentc2cb8d68c417f8093632897dc07441d54574ab6e (diff)
downloadpoky-21effd66408423b02845186f1007b1a58f3fba31.tar.gz
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] (From OE-Core rev: b8d72e3af93ff9e2808fef4fe7b9d00b68bf9715) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/gcc/gcc-4.6.inc2
-rw-r--r--meta/recipes-devtools/gcc/gcc-cross-intermediate.inc4
-rw-r--r--meta/recipes-devtools/gcc/gcc-package-cross.inc4
-rw-r--r--meta/recipes-devtools/gcc/gcc-package-target.inc4
-rw-r--r--meta/recipes-devtools/gcc/gcc_4.5.1.bb2
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 a0120492ae..68449954af 100644
--- a/meta/recipes-devtools/gcc/gcc-4.6.inc
+++ b/meta/recipes-devtools/gcc/gcc-4.6.inc
@@ -1,6 +1,6 @@
1require gcc-common.inc 1require gcc-common.inc
2 2
3PR = "r4" 3PR = "r5"
4 4
5# Third digit in PV should be incremented after a minor release 5# Third digit in PV should be incremented after a minor release
6# happens from this branch on gcc e.g. currently its 4.6.0 6# 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 05b5dbc089..df5958ac77 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 () {
40 rm -rf ${D}${datadir}/ 40 rm -rf ${D}${datadir}/
41 41
42 # We use libiberty from binutils 42 # We use libiberty from binutils
43 find -name libiberty.a ${D}${exec_prefix}/lib | xargs rm -f 43 find ${D}${exec_prefix}/lib -name libiberty.a | xargs rm -f
44 find -name libiberty.h ${D}${exec_prefix}/lib | xargs rm -f 44 find ${D}${exec_prefix}/lib -name libiberty.h | xargs rm -f
45 45
46 # Insert symlinks into libexec so when tools without a prefix are searched for, the correct ones are 46 # Insert symlinks into libexec so when tools without a prefix are searched for, the correct ones are
47 # found. These need to be relative paths so they work in different locations. 47 # 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 b51336bf2d..3d27788c56 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 () {
29 done 29 done
30 30
31 # We use libiberty from binutils 31 # We use libiberty from binutils
32 find -name libiberty.a ${D}${exec_prefix}/lib | xargs rm -f 32 find ${D}${exec_prefix}/lib -name libiberty.a | xargs rm -f
33 find -name libiberty.h ${D}${exec_prefix}/lib | xargs rm -f 33 find ${D}${exec_prefix}/lib -name libiberty.h | xargs rm -f
34 34
35 # gcc-runtime installs libgcc into a special location in staging since it breaks doing a standalone build 35 # gcc-runtime installs libgcc into a special location in staging since it breaks doing a standalone build
36 if [ "${PN}" == "gcc-cross" -o "${PN}" == "gcc-crosssdk" ]; then 36 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 43e2bd5dba..6cc308c6dc 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 () {
88 rm -f *gcc-?.?* 88 rm -f *gcc-?.?*
89 89
90 # We use libiberty from binutils 90 # We use libiberty from binutils
91 find -name libiberty.a ${D}${exec_prefix}/lib | xargs rm -f 91 find ${D}${exec_prefix}/lib -name libiberty.a | xargs rm -f
92 find -name libiberty.h ${D}${exec_prefix}/lib | xargs rm -f 92 find ${D}${exec_prefix}/lib -name libiberty.h | xargs rm -f
93 93
94 # Symlinks so we can use these trivially on the target 94 # Symlinks so we can use these trivially on the target
95 ln -sf ${TARGET_PREFIX}g77 g77 || true 95 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 e04f443b4d..785d719ac8 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 @@
1PR = "r5" 1PR = "r6"
2require gcc-${PV}.inc 2require gcc-${PV}.inc
3require gcc-configure-target.inc 3require gcc-configure-target.inc
4require gcc-package-target.inc 4require gcc-package-target.inc