diff options
author | Mark Hatle <mark.hatle@windriver.com> | 2011-08-04 11:33:23 -0500 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-08-05 17:16:02 +0100 |
commit | d6bbdcc030fc6c7720e12d96943031f6b119e69b (patch) | |
tree | bf648281fb8d669a99198938a88738a32c19b611 /meta/recipes-extended/libzypp/libzypp/arm-workaround-global-constructor.patch | |
parent | be030d3bf5e8bd8be2faf43684f2aafd94545630 (diff) | |
download | poky-d6bbdcc030fc6c7720e12d96943031f6b119e69b.tar.gz |
libzypp: Increase the size of the arch compat table
Fix [YOCTO #1313]
Increase the size of the arch compat table to 30 entries.
Also cleanup a few things related to Poky -> OE name changing.
(From OE-Core rev: 8899c51127fc9df3a054bd38b0b33082fa372fa2)
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
Fixed up arm patch
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended/libzypp/libzypp/arm-workaround-global-constructor.patch')
-rw-r--r-- | meta/recipes-extended/libzypp/libzypp/arm-workaround-global-constructor.patch | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/meta/recipes-extended/libzypp/libzypp/arm-workaround-global-constructor.patch b/meta/recipes-extended/libzypp/libzypp/arm-workaround-global-constructor.patch index 86458d7e75..bfdb29b593 100644 --- a/meta/recipes-extended/libzypp/libzypp/arm-workaround-global-constructor.patch +++ b/meta/recipes-extended/libzypp/libzypp/arm-workaround-global-constructor.patch | |||
@@ -8,14 +8,15 @@ before the usage of _foo during the initialization of the compatibility | |||
8 | table. | 8 | table. |
9 | 9 | ||
10 | The patch, along with a similar change to the recipe generation of the | 10 | The patch, along with a similar change to the recipe generation of the |
11 | poky-arch.h file, remove the DEF_BUILTIN globals and replace them with | 11 | oe-arch.h file, remove the DEF_BUILTIN globals and replace them with |
12 | immediate strings wherever they are used. | 12 | immediate strings wherever they are used. |
13 | 13 | ||
14 | Signed-off-by: Mark Hatle <mark.hatle@windriver.com> | 14 | Signed-off-by: Mark Hatle <mark.hatle@windriver.com> |
15 | 15 | ||
16 | diff -ur git.orig/zypp/Arch.cc git/zypp/Arch.cc | 16 | Index: git/zypp/Arch.cc |
17 | --- git.orig/zypp/Arch.cc 2011-03-29 14:15:32.695079271 -0500 | 17 | =================================================================== |
18 | +++ git/zypp/Arch.cc 2011-03-29 14:17:22.680910025 -0500 | 18 | --- git.orig/zypp/Arch.cc 2011-08-04 21:03:31.000000000 -0700 |
19 | +++ git/zypp/Arch.cc 2011-08-04 21:04:16.635480895 -0700 | ||
19 | @@ -152,13 +152,10 @@ | 20 | @@ -152,13 +152,10 @@ |
20 | // NOTE: Thake care CompatBits::IntT is able to provide one | 21 | // NOTE: Thake care CompatBits::IntT is able to provide one |
21 | // bit for each architecture. | 22 | // bit for each architecture. |
@@ -24,13 +25,13 @@ diff -ur git.orig/zypp/Arch.cc git/zypp/Arch.cc | |||
24 | - DEF_BUILTIN( all ); | 25 | - DEF_BUILTIN( all ); |
25 | - DEF_BUILTIN( any ); | 26 | - DEF_BUILTIN( any ); |
26 | - DEF_BUILTIN( noarch ); | 27 | - DEF_BUILTIN( noarch ); |
27 | |||
28 | -#include "poky-arch.h" | ||
29 | -#undef DEF_BUILTIN | ||
30 | +/* Global constructors are not working properly on ARM, avoid the | 28 | +/* Global constructors are not working properly on ARM, avoid the |
31 | + * known bad case and merge constructors in with the usages | 29 | + * known bad case and merge constructors in with the usages |
32 | + */ | 30 | + */ |
33 | 31 | ||
32 | -#include "oe-arch.h" | ||
33 | -#undef DEF_BUILTIN | ||
34 | |||
34 | /////////////////////////////////////////////////////////////////// | 35 | /////////////////////////////////////////////////////////////////// |
35 | // | 36 | // |
36 | @@ -227,9 +224,9 @@ | 37 | @@ -227,9 +224,9 @@ |
@@ -46,7 +47,7 @@ diff -ur git.orig/zypp/Arch.cc git/zypp/Arch.cc | |||
46 | /////////////////////////////////////////////////////////////////// | 47 | /////////////////////////////////////////////////////////////////// |
47 | // Define the CompatibleWith relation: | 48 | // Define the CompatibleWith relation: |
48 | // | 49 | // |
49 | @@ -305,9 +302,9 @@ | 50 | @@ -331,9 +328,9 @@ |
50 | /////////////////////////////////////////////////////////////////// | 51 | /////////////////////////////////////////////////////////////////// |
51 | 52 | ||
52 | const Arch Arch_empty ( IdString::Empty ); | 53 | const Arch Arch_empty ( IdString::Empty ); |
@@ -57,9 +58,9 @@ diff -ur git.orig/zypp/Arch.cc git/zypp/Arch.cc | |||
57 | + const Arch Arch_any( IdString ( "any" ) ); | 58 | + const Arch Arch_any( IdString ( "any" ) ); |
58 | + const Arch Arch_noarch( IdString ( "noarch" ) ); | 59 | + const Arch Arch_noarch( IdString ( "noarch" ) ); |
59 | 60 | ||
60 | #define POKY_PROTO 1 | 61 | #define OE_PROTO 1 |
61 | #include "poky-arch.h" | 62 | #include "oe-arch.h" |
62 | @@ -316,7 +316,7 @@ | 63 | @@ -345,7 +342,7 @@ |
63 | // METHOD TYPE : Ctor | 64 | // METHOD TYPE : Ctor |
64 | // | 65 | // |
65 | Arch::Arch() | 66 | Arch::Arch() |