diff options
author | Nisha Parrakat <nishaparrakat@gmail.com> | 2021-05-26 19:59:28 +0000 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2021-05-28 06:55:33 -0700 |
commit | 3c36a8efe2a964c3aa9bfcd836cee3f80a837fcd (patch) | |
tree | f100c9ca155382d253df52beca4cecbc9de535fa /meta-oe/recipes-extended/p7zip/files | |
parent | 4b6175892985a6016df1a38824ccbb5989f00b33 (diff) | |
download | meta-openembedded-3c36a8efe2a964c3aa9bfcd836cee3f80a837fcd.tar.gz |
p7zip: build and package lib7z.so needed for fastboot
a) use option 7z to build the lib7z.so library
This is needed for android-tools for building fastboot
from android-tools
b) Packaged the lib7z.so and codec libraries as a part of this recipe
Fastboot RDepends on it lib7z.so
c) Fixed a C++17 forbidden error when lib7z.so is built
fixes the below error
| ../../../../CPP/7zip/Archive/Wim/WimHandler.cpp: In member function 'virtual LONG NArchive::NWim::CHandler::GetArchiveProperty(PROPID, PROPVARIANT*)':
| ../../../../CPP/7zip/Archive/Wim/WimHandler.cpp:308:11: error: use of an operand of type 'bool' in 'operator++' is forbidden in C++17
| 308 | numMethods++;
| | ^~~~~~~~~~
| ../../../../CPP/7zip/Archive/Wim/WimHandler.cpp:318:9: error: use of an operand of type 'bool' in 'operator++' is forbidden in C++17
| 318 | numMethods++;
Signed-off-by: Nisha Parrakat <Nisha.Parrakat@kpit.com>
Signed-off-by: Nisha Parrakat <nishaparrakat@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-oe/recipes-extended/p7zip/files')
-rw-r--r-- | meta-oe/recipes-extended/p7zip/files/change_numMethods_from_bool_to_unsigned.patch | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/meta-oe/recipes-extended/p7zip/files/change_numMethods_from_bool_to_unsigned.patch b/meta-oe/recipes-extended/p7zip/files/change_numMethods_from_bool_to_unsigned.patch new file mode 100644 index 000000000..edde52593 --- /dev/null +++ b/meta-oe/recipes-extended/p7zip/files/change_numMethods_from_bool_to_unsigned.patch | |||
@@ -0,0 +1,25 @@ | |||
1 | fixes the below error | ||
2 | |||
3 | | ../../../../CPP/7zip/Archive/Wim/WimHandler.cpp: In member function 'virtual LONG NArchive::NWim::CHandler::GetArchiveProperty(PROPID, PROPVARIANT*)': | ||
4 | | ../../../../CPP/7zip/Archive/Wim/WimHandler.cpp:308:11: error: use of an operand of type 'bool' in 'operator++' is forbidden in C++17 | ||
5 | | 308 | numMethods++; | ||
6 | | | ^~~~~~~~~~ | ||
7 | | ../../../../CPP/7zip/Archive/Wim/WimHandler.cpp:318:9: error: use of an operand of type 'bool' in 'operator++' is forbidden in C++17 | ||
8 | | 318 | numMethods++; | ||
9 | |||
10 | |||
11 | use unsigned instead of bool | ||
12 | Signed-off-by: Nisha Parrakat <Nisha.Parrakat@kpit.com> | ||
13 | |||
14 | Upstream-Status: Pending | ||
15 | --- ./CPP/7zip/Archive/Wim/WimHandler.cpp 2021-05-20 10:51:56.997402701 +0000 | ||
16 | +++ ./CPP/7zip/Archive/Wim/WimHandler.cpp 2021-05-20 10:52:16.665604125 +0000 | ||
17 | @@ -298,7 +298,7 @@ | ||
18 | |||
19 | AString res; | ||
20 | |||
21 | - bool numMethods = 0; | ||
22 | + unsigned numMethods = 0; | ||
23 | for (unsigned i = 0; i < ARRAY_SIZE(k_Methods); i++) | ||
24 | { | ||
25 | if (methodMask & ((UInt32)1 << i | ||