From a24e858ce4b96c41e69798b81ff398bee5fc19a9 Mon Sep 17 00:00:00 2001
From: Adam Lanicek <adam@lanicektransport.cz>
Date: Wed, 19 Oct 2022 21:24:23 +0200
Subject: [PATCH] flatbuffers: recipe fix

flatbuffers library v2.0.6 requires recipe refactoring (as discussed in https://github.com/openembedded/meta-openembedded/commit/0b32f0000ce6b93306db7f0d2d72c36b5270e2ab)

Signed-off-by: Adam Lanicek adam.lanicek@nxp.com
---
 .../flatbuffers/flatbuffers_2.0.6.bb            | 17 +++--------------
 .../flatbuffers/python3-flatbuffers_2.0.6.bb    | 14 ++++++++++++++
 2 files changed, 17 insertions(+), 14 deletions(-)
 create mode 100644 meta-ml/recipes-devtools/flatbuffers/python3-flatbuffers_2.0.6.bb

diff --git a/meta-ml/recipes-devtools/flatbuffers/flatbuffers_2.0.6.bb b/meta-ml/recipes-devtools/flatbuffers/flatbuffers_2.0.6.bb
index d3359fa422..32c7de1df5 100644
--- a/meta-ml/recipes-devtools/flatbuffers/flatbuffers_2.0.6.bb
+++ b/meta-ml/recipes-devtools/flatbuffers/flatbuffers_2.0.6.bb
@@ -3,9 +3,9 @@ HOMEPAGE = "https://github.com/google/flatbuffers"
 SECTION = "console/tools"
 LICENSE = "Apache-2.0"
 
-inherit python3-dir
+PACKAGE_BEFORE_PN = "${PN}-compiler"
 
-PACKAGE_BEFORE_PN = "${PN}-compiler ${PN}-${PYTHON_PN}"
+DEPENDS = "flatbuffers-native"
 
 RDEPENDS:${PN}-compiler = "${PN}"
 RDEPENDS:${PN}-${PYTHON_PN} = "${PN}"
@@ -19,27 +19,16 @@ SRC_URI = "git://github.com/google/flatbuffers.git;branch=master;protocol=https"
 
 CVE_CHECK_IGNORE += "CVE-2020-35864"
 
-CXXFLAGS += "-fPIC"
-BUILD_CXXFLAGS += "-fPIC"
-
 # BUILD_TYPE=Release is required, otherwise flatc is not installed
 EXTRA_OECMAKE += "\
-    -DCMAKE_BUILD_TYPE=Release \
     -DFLATBUFFERS_BUILD_TESTS=OFF \    
     -DFLATBUFFERS_BUILD_SHAREDLIB=ON \
 "
 
-inherit cmake
+inherit cmake python3native
 
 S = "${WORKDIR}/git"
 
-do_install:append() {
-    install -d ${D}${PYTHON_SITEPACKAGES_DIR}
-    cp -rf ${S}/python/flatbuffers ${D}${PYTHON_SITEPACKAGES_DIR}
-}
-
 FILES:${PN}-compiler = "${bindir}"
 
-FILES:${PN}-${PYTHON_PN} = "${PYTHON_SITEPACKAGES_DIR}"
-
 BBCLASSEXTEND = "native nativesdk"
diff --git a/meta-ml/recipes-devtools/flatbuffers/python3-flatbuffers_2.0.6.bb b/meta-ml/recipes-devtools/flatbuffers/python3-flatbuffers_2.0.6.bb
new file mode 100644
index 0000000000..3f3527d3aa
--- /dev/null
+++ b/meta-ml/recipes-devtools/flatbuffers/python3-flatbuffers_2.0.6.bb
@@ -0,0 +1,14 @@
+SUMMARY = "Memory Efficient Serialization Library - Python3 Modules"
+HOMEPAGE = "https://github.com/google/flatbuffers"
+SECTION = "console/tools"
+LICENSE = "Apache-2.0"
+
+LIC_FILES_CHKSUM = "file://../LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57"
+
+SRCREV = "615616cb5549a34bdf288c04bc1b94bd7a65c396"
+SRC_URI = "git://github.com/google/flatbuffers.git;branch=master;protocol=https"
+S = "${WORKDIR}/git/python"
+
+RDEPENDS:${PN} = "flatbuffers"
+
+inherit setuptools3
\ No newline at end of file