diff options
author | Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> | 2011-09-21 22:39:48 +0400 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-09-22 05:12:28 +0100 |
commit | 3d6918169286861dffcbbcffb9092d47a89f2c98 (patch) | |
tree | 591183061ad68e4008c4ca1e35de3e27736ef084 /meta/recipes-devtools | |
parent | 3ac49c3a521555b390266ec1aead3b140edde0bf (diff) | |
download | poky-3d6918169286861dffcbbcffb9092d47a89f2c98.tar.gz |
icecc-create-env: rename to -native
icecc-create-env(-native) is a native package. But if it doesn't have
the -native suffix, some dependency tracking stuff in oe-core (in
nativesdk.bbclass) get's crazy about it, trying to generate dependencies
to icecc-create-env-native packages. To fix that simply add -native
suffix to this package.
(From OE-Core rev: 83f9ebe9afb8bec4531899f8001a585c974e1db4)
Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools')
-rw-r--r-- | meta/recipes-devtools/icecc-create-env/icecc-create-env-native/icecc-lto-update.patch (renamed from meta/recipes-devtools/icecc-create-env/icecc-create-env/icecc-lto-update.patch) | 20 | ||||
-rw-r--r-- | meta/recipes-devtools/icecc-create-env/icecc-create-env-native_0.1.bb (renamed from meta/recipes-devtools/icecc-create-env/icecc-create-env_0.1.bb) | 0 |
2 files changed, 10 insertions, 10 deletions
diff --git a/meta/recipes-devtools/icecc-create-env/icecc-create-env/icecc-lto-update.patch b/meta/recipes-devtools/icecc-create-env/icecc-create-env-native/icecc-lto-update.patch index b396261d69..a7af2e3a98 100644 --- a/meta/recipes-devtools/icecc-create-env/icecc-create-env/icecc-lto-update.patch +++ b/meta/recipes-devtools/icecc-create-env/icecc-create-env-native/icecc-lto-update.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | --- a/icecc-create-env 2006-12-14 09:50:46.000000000 +0300 | 1 | --- a/icecc-create-env 2006-12-14 09:50:46.000000000 +0300 |
2 | +++ b/icecc-create-env 2011-08-31 17:52:45.000000000 +0400 | 2 | +++ b/icecc-create-env 2011-08-31 17:52:45.000000000 +0400 |
3 | @@ -27,9 +27,6 @@ | 3 | @@ -27,9 +27,6 @@ |
4 | # readlink is not portable enough. | 4 | # readlink is not portable enough. |
5 | path=`ls -H $path` | 5 | path=`ls -H $path` |
6 | toadd="$name=$path" | 6 | toadd="$name=$path" |
7 | - if test "$name" = "$path"; then | 7 | - if test "$name" = "$path"; then |
@@ -13,7 +13,7 @@ | |||
13 | @@ -117,6 +114,14 @@ | 13 | @@ -117,6 +114,14 @@ |
14 | add_file "$specfile" | 14 | add_file "$specfile" |
15 | fi | 15 | fi |
16 | 16 | ||
17 | +ltofile=`$added_gcc -print-prog-name=lto1` | 17 | +ltofile=`$added_gcc -print-prog-name=lto1` |
18 | +pluginfile="${ltofile%lto1}liblto_plugin.so" | 18 | +pluginfile="${ltofile%lto1}liblto_plugin.so" |
19 | +if test -r "$pluginfile" | 19 | +if test -r "$pluginfile" |
@@ -24,14 +24,14 @@ | |||
24 | + | 24 | + |
25 | tempdir=`mktemp -d /tmp/iceccenvXXXXXX` | 25 | tempdir=`mktemp -d /tmp/iceccenvXXXXXX` |
26 | new_target_files= | 26 | new_target_files= |
27 | for i in $target_files; do | 27 | for i in $target_files; do |
28 | @@ -140,49 +147,44 @@ | 28 | @@ -140,49 +147,44 @@ |
29 | done | 29 | done |
30 | 30 | ||
31 | #sort the files | 31 | #sort the files |
32 | - target_files=`for i in $new_target_files; do echo $i; done | sort` | 32 | - target_files=`for i in $new_target_files; do echo $i; done | sort` |
33 | +target_files=`for i in $new_target_files; do echo $i; done | sort` | 33 | +target_files=`for i in $new_target_files; do echo $i; done | sort` |
34 | 34 | ||
35 | #test if an archive name was supplied | 35 | #test if an archive name was supplied |
36 | #if not use the md5 of all files as the archive name | 36 | #if not use the md5 of all files as the archive name |
37 | if test -z "$archive_name"; then | 37 | if test -z "$archive_name"; then |
@@ -49,7 +49,7 @@ | |||
49 | + break | 49 | + break |
50 | + fi | 50 | + fi |
51 | + done | 51 | + done |
52 | 52 | ||
53 | -#calculate md5 and use it as the archive name | 53 | -#calculate md5 and use it as the archive name |
54 | -archive_name=`for i in $target_files; do $md5sum $tempdir/$i; done | sed -e 's/ .*$//' | $md5sum | sed -e 's/ .*$//'` || { | 54 | -archive_name=`for i in $target_files; do $md5sum $tempdir/$i; done | sed -e 's/ .*$//' | $md5sum | sed -e 's/ .*$//'` || { |
55 | - if test -z "$silent"; then | 55 | - if test -z "$silent"; then |
@@ -64,7 +64,7 @@ | |||
64 | + mydir=`pwd` | 64 | + mydir=`pwd` |
65 | +else | 65 | +else |
66 | + mydir="`dirname "$archive_name"`" | 66 | + mydir="`dirname "$archive_name"`" |
67 | + | 67 | + |
68 | + #check if we have a full path or only a filename | 68 | + #check if we have a full path or only a filename |
69 | + if test "$mydir" = "." ; then | 69 | + if test "$mydir" = "." ; then |
70 | + mydir=`pwd` | 70 | + mydir=`pwd` |
@@ -75,18 +75,18 @@ | |||
75 | -} | 75 | -} |
76 | - | 76 | - |
77 | fi | 77 | fi |
78 | 78 | ||
79 | if test -z "$silent"; then | 79 | if test -z "$silent"; then |
80 | -echo "creating $archive_name.tar.gz" | 80 | -echo "creating $archive_name.tar.gz" |
81 | +echo "creating $archive_name" | 81 | +echo "creating $archive_name" |
82 | fi | 82 | fi |
83 | 83 | ||
84 | -if test -z "$archive_name"; then | 84 | -if test -z "$archive_name"; then |
85 | - mydir=`pwd` | 85 | - mydir=`pwd` |
86 | -else | 86 | -else |
87 | -# mydir=dirname ${archive_name} | 87 | -# mydir=dirname ${archive_name} |
88 | - mydir=${archive_name%/*} | 88 | - mydir=${archive_name%/*} |
89 | - | 89 | - |
90 | -#check if we have a full path or only a filename | 90 | -#check if we have a full path or only a filename |
91 | - if test -z "$mydir"; then | 91 | - if test -z "$mydir"; then |
92 | - mydir=`pwd` | 92 | - mydir=`pwd` |
diff --git a/meta/recipes-devtools/icecc-create-env/icecc-create-env_0.1.bb b/meta/recipes-devtools/icecc-create-env/icecc-create-env-native_0.1.bb index 9a440baccf..9a440baccf 100644 --- a/meta/recipes-devtools/icecc-create-env/icecc-create-env_0.1.bb +++ b/meta/recipes-devtools/icecc-create-env/icecc-create-env-native_0.1.bb | |||