From b22026cd3785700052aefa90e709b92d8e7f74fc Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sat, 19 Apr 2025 19:45:27 -0700 Subject: [PATCH] python3-lief: Upgrade to 0.16.5 + tip of trunk Drop upstreamed patch. Pydantic-core is now available for riscv32 Signed-off-by: Khem Raj --- .../0001-Add-cstdio-include.patch | 134 ------------------ ...equirements.txt-Allow-newer-versions.patch | 21 ++- ...-lief_0.16.4.bb => python3-lief_0.16.5.bb} | 6 +- 3 files changed, 9 insertions(+), 152 deletions(-) delete mode 100644 meta-python/recipes-devtools/python/python3-lief/0001-Add-cstdio-include.patch rename meta-python/recipes-devtools/python/{python3-lief_0.16.4.bb => python3-lief_0.16.5.bb} (86%) diff --git a/meta-python/recipes-devtools/python/python3-lief/0001-Add-cstdio-include.patch b/meta-python/recipes-devtools/python/python3-lief/0001-Add-cstdio-include.patch deleted file mode 100644 index 396e935ddd..0000000000 --- a/meta-python/recipes-devtools/python/python3-lief/0001-Add-cstdio-include.patch +++ /dev/null @@ -1,134 +0,0 @@ -From a9b7a9f5c5572fc839d05457da073dc817722ace Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Tue, 1 Apr 2025 17:27:46 -0700 -Subject: [PATCH] Add cstdio include - -This is needed for uintXX_t types, GCC-15 is defauling to C23 and will error -about it. - -e.g. - -include/LIEF/PE/LoadConfigurations/VolatileMetadata.hpp:145:3: note: 'uint32_t' is defined in header ''; this is probably fixable by adding '#include ' - -Upstream-Status: Submitted [https://github.com/lief-project/LIEF/pull/1184] -Signed-off-by: Khem Raj ---- - include/LIEF/DWARF/Scope.hpp | 1 + - include/LIEF/ObjC/Method.hpp | 1 + - include/LIEF/PDB/PublicSymbol.hpp | 1 + - include/LIEF/PDB/types/Attribute.hpp | 1 + - include/LIEF/PE/LoadConfigurations/VolatileMetadata.hpp | 1 + - include/LIEF/PE/Relocation.hpp | 1 + - include/LIEF/PE/signature/attributes/PKCS9AtSequenceNumber.hpp | 1 + - include/LIEF/PE/signature/attributes/SpcRelaxedPeMarkerCheck.hpp | 1 + - src/MachO/TrieNode.hpp | 1 + - 9 files changed, 9 insertions(+) - -diff --git a/include/LIEF/DWARF/Scope.hpp b/include/LIEF/DWARF/Scope.hpp -index 78752847..61977c21 100644 ---- a/include/LIEF/DWARF/Scope.hpp -+++ b/include/LIEF/DWARF/Scope.hpp -@@ -15,6 +15,7 @@ - #ifndef LIEF_DWARF_SCOPE_H - #define LIEF_DWARF_SCOPE_H - -+#include - #include - #include - -diff --git a/include/LIEF/ObjC/Method.hpp b/include/LIEF/ObjC/Method.hpp -index b4e82c6e..b9f37288 100644 ---- a/include/LIEF/ObjC/Method.hpp -+++ b/include/LIEF/ObjC/Method.hpp -@@ -16,6 +16,7 @@ - #define LIEF_OBJC_METHOD_H - #include - -+#include - #include - #include - -diff --git a/include/LIEF/PDB/PublicSymbol.hpp b/include/LIEF/PDB/PublicSymbol.hpp -index b8904a5b..0e105435 100644 ---- a/include/LIEF/PDB/PublicSymbol.hpp -+++ b/include/LIEF/PDB/PublicSymbol.hpp -@@ -14,6 +14,7 @@ - */ - #ifndef LIEF_PDB_PUBLIC_SYMBOL_H - #define LIEF_PDB_PUBLIC_SYMBOL_H -+#include - #include - #include - #include -diff --git a/include/LIEF/PDB/types/Attribute.hpp b/include/LIEF/PDB/types/Attribute.hpp -index a41270c0..fc961be5 100644 ---- a/include/LIEF/PDB/types/Attribute.hpp -+++ b/include/LIEF/PDB/types/Attribute.hpp -@@ -17,6 +17,7 @@ - - #include "LIEF/visibility.h" - -+#include - #include - #include - -diff --git a/include/LIEF/PE/LoadConfigurations/VolatileMetadata.hpp b/include/LIEF/PE/LoadConfigurations/VolatileMetadata.hpp -index 41b9e36b..073ccabc 100644 ---- a/include/LIEF/PE/LoadConfigurations/VolatileMetadata.hpp -+++ b/include/LIEF/PE/LoadConfigurations/VolatileMetadata.hpp -@@ -15,6 +15,7 @@ - */ - #ifndef LIEF_PE_LOAD_CONFIGURATION_VOLATILE_METADATA_H - #define LIEF_PE_LOAD_CONFIGURATION_VOLATILE_METADATA_H -+#include - #include - #include - #include -diff --git a/include/LIEF/PE/Relocation.hpp b/include/LIEF/PE/Relocation.hpp -index a4cd2e96..cd81bf68 100644 ---- a/include/LIEF/PE/Relocation.hpp -+++ b/include/LIEF/PE/Relocation.hpp -@@ -15,6 +15,7 @@ - */ - #ifndef LIEF_PE_RELOCATION_H - #define LIEF_PE_RELOCATION_H -+#include - #include - #include - #include -diff --git a/include/LIEF/PE/signature/attributes/PKCS9AtSequenceNumber.hpp b/include/LIEF/PE/signature/attributes/PKCS9AtSequenceNumber.hpp -index a89901fa..32db1470 100644 ---- a/include/LIEF/PE/signature/attributes/PKCS9AtSequenceNumber.hpp -+++ b/include/LIEF/PE/signature/attributes/PKCS9AtSequenceNumber.hpp -@@ -15,6 +15,7 @@ - */ - #ifndef LIEF_PE_ATTRIBUTES_PKCS9_AT_SEQUENCE_NUMBER_H - #define LIEF_PE_ATTRIBUTES_PKCS9_AT_SEQUENCE_NUMBER_H -+#include - - #include "LIEF/visibility.h" - #include "LIEF/PE/signature/Attribute.hpp" -diff --git a/include/LIEF/PE/signature/attributes/SpcRelaxedPeMarkerCheck.hpp b/include/LIEF/PE/signature/attributes/SpcRelaxedPeMarkerCheck.hpp -index f84fbcbf..5cce98b4 100644 ---- a/include/LIEF/PE/signature/attributes/SpcRelaxedPeMarkerCheck.hpp -+++ b/include/LIEF/PE/signature/attributes/SpcRelaxedPeMarkerCheck.hpp -@@ -15,6 +15,7 @@ - */ - #ifndef LIEF_PE_ATTRIBUTES_SPC_RELAXED_PE_MARKER_CHECK_H - #define LIEF_PE_ATTRIBUTES_SPC_RELAXED_PE_MARKER_CHECK_H -+#include - - #include "LIEF/visibility.h" - #include "LIEF/PE/signature/Attribute.hpp" -diff --git a/src/MachO/TrieNode.hpp b/src/MachO/TrieNode.hpp -index f6c411b8..6bdde9ec 100644 ---- a/src/MachO/TrieNode.hpp -+++ b/src/MachO/TrieNode.hpp -@@ -15,6 +15,7 @@ - */ - #ifndef LIEF_MACHO_TRIE_NODE_H_ - #define LIEF_MACHO_TRIE_NODE_H_ -+#include - #include - #include - #include diff --git a/meta-python/recipes-devtools/python/python3-lief/0001-build-requirements.txt-Allow-newer-versions.patch b/meta-python/recipes-devtools/python/python3-lief/0001-build-requirements.txt-Allow-newer-versions.patch index e2d041dac7..9c61f0bdee 100644 --- a/meta-python/recipes-devtools/python/python3-lief/0001-build-requirements.txt-Allow-newer-versions.patch +++ b/meta-python/recipes-devtools/python/python3-lief/0001-build-requirements.txt-Allow-newer-versions.patch @@ -12,28 +12,23 @@ Signed-off-by: Leon Anavi api/python/build-requirements.txt | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) -diff --git a/api/python/build-requirements.txt b/api/python/build-requirements.txt -index 4c9004ca..fe0d1055 100644 --- a/api/python/build-requirements.txt +++ b/api/python/build-requirements.txt @@ -1,10 +1,10 @@ --tomli==2.0.1 --scikit-build-core==0.9.8 -+tomli>=2.0.1 -+scikit-build-core>=0.9.8 +-tomli==2.2.1 +-scikit-build-core==0.11.1 ++tomli>=2.2.1 ++scikit-build-core>=0.11.1 # For Ninja: msvc.msvc14_get_vc_env -setuptools==70.2.0 +setuptools>=70.2.0 # For the "env" feature --pydantic==2.8.2 -+pydantic>=2.8.2 +-pydantic==2.11.3 ++pydantic>=2.11.3 # Implicit from scikit-build-core -pathspec==0.12.1 -build==1.2.1 --wheel==0.43.0 +-wheel==0.45.1 +pathspec>=0.12.1 +build>=1.2.1 -+wheel>=0.43.0 --- -2.39.5 - ++wheel>=0.45.1 diff --git a/meta-python/recipes-devtools/python/python3-lief_0.16.4.bb b/meta-python/recipes-devtools/python/python3-lief_0.16.5.bb similarity index 86% rename from meta-python/recipes-devtools/python/python3-lief_0.16.4.bb rename to meta-python/recipes-devtools/python/python3-lief_0.16.5.bb index 67bbcbf7b1..2166e3257f 100644 --- a/meta-python/recipes-devtools/python/python3-lief_0.16.4.bb +++ b/meta-python/recipes-devtools/python/python3-lief_0.16.5.bb @@ -9,10 +9,8 @@ SRC_URI = " \ git://github.com/lief-project/LIEF.git;protocol=https;branch=main \ file://0001-build-requirements.txt-Allow-newer-versions.patch \ file://0002-api-python-config-default.toml-Debug.patch \ - file://0001-Add-cstdio-include.patch \ " -SRCREV = "1e9b12bd14cbe087d52355b8b9af578f1b04d8ca" - +SRCREV = "abcf929efb748c7846dd59007cbb807e108db311" PV .= "+git" S = "${WORKDIR}/git" @@ -33,7 +31,5 @@ DEPENDS += "\ " # https://github.com/lief-project/LIEF/commit/3def579f75965aa19c021d840a759bce2afc0a31#r152197203 COMPATIBLE_HOST:x86 = "null" -# Needs pydantic and pydantic-core -COMPATIBLE_HOST:riscv32 = "null" BBCLASSEXTEND = "native nativesdk"