summaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended/libzypp/libzypp/libzypp-compatargs.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-extended/libzypp/libzypp/libzypp-compatargs.patch')
-rw-r--r--meta/recipes-extended/libzypp/libzypp/libzypp-compatargs.patch54
1 files changed, 0 insertions, 54 deletions
diff --git a/meta/recipes-extended/libzypp/libzypp/libzypp-compatargs.patch b/meta/recipes-extended/libzypp/libzypp/libzypp-compatargs.patch
deleted file mode 100644
index 8d24ab007c..0000000000
--- a/meta/recipes-extended/libzypp/libzypp/libzypp-compatargs.patch
+++ /dev/null
@@ -1,54 +0,0 @@
1zypp/Arch.cc: Add room for additional architecture compatibilities
2
3Upstream-Status: Pending
4
5Increase the size of the compatibility table from 9 to 30. There are already
6existing checks within libzypp to ensure that we don't overflow the 64-bit
7architecture field, so nothing further was required.
8
9Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
10
11diff -ur git.orig/zypp/Arch.cc git/zypp/Arch.cc
12--- git.orig/zypp/Arch.cc 2011-08-02 16:40:37.696662889 -0500
13+++ git/zypp/Arch.cc 2011-08-04 11:24:18.051745246 -0500
14@@ -280,13 +280,39 @@
15 IdString arch6_r = IdString(),
16 IdString arch7_r = IdString(),
17 IdString arch8_r = IdString(),
18- IdString arch9_r = IdString() )
19+ IdString arch9_r = IdString(),
20+ IdString arch10_r = IdString(),
21+ IdString arch11_r = IdString(),
22+ IdString arch12_r = IdString(),
23+ IdString arch13_r = IdString(),
24+ IdString arch14_r = IdString(),
25+ IdString arch15_r = IdString(),
26+ IdString arch16_r = IdString(),
27+ IdString arch17_r = IdString(),
28+ IdString arch18_r = IdString(),
29+ IdString arch19_r = IdString(),
30+ IdString arch20_r = IdString(),
31+ IdString arch21_r = IdString(),
32+ IdString arch22_r = IdString(),
33+ IdString arch23_r = IdString(),
34+ IdString arch24_r = IdString(),
35+ IdString arch25_r = IdString(),
36+ IdString arch26_r = IdString(),
37+ IdString arch27_r = IdString(),
38+ IdString arch28_r = IdString(),
39+ IdString arch29_r = IdString(),
40+ IdString arch30_r = IdString() )
41 {
42 const CompatEntry & target( assertCompatSetEntry( targetArch_r ) );
43 target.addCompatBit( assertCompatSetEntry( arch0_r )._idBit );
44 #define _SETARG(N) if ( arch##N##_r.empty() ) return; target.addCompatBit( assertCompatSetEntry( arch##N##_r )._idBit )
45 _SETARG(1); _SETARG(2); _SETARG(3); _SETARG(4);
46 _SETARG(5); _SETARG(6); _SETARG(7); _SETARG(8); _SETARG(9);
47+ _SETARG(10); _SETARG(11); _SETARG(12); _SETARG(13); _SETARG(14);
48+ _SETARG(15); _SETARG(16); _SETARG(17); _SETARG(18); _SETARG(19);
49+ _SETARG(20); _SETARG(21); _SETARG(22); _SETARG(23); _SETARG(24);
50+ _SETARG(25); _SETARG(26); _SETARG(27); _SETARG(28); _SETARG(29);
51+ _SETARG(30);
52 #undef _SETARG
53 }
54