Message ID | 20220618220236.2968-1-f_l_k@t-online.de |
---|---|
State | New |
Headers | show |
Series | [meta-oe] flatbuffers: update to 2.0.6 | expand |
Yes, you're right. Python3 is used to call 'scripts/generate_code.py' and is currently using hosts python for that. I guess the correct fix would be to inherit python3native ? Markus Am 20.06.22 um 05:47 schrieb akuster808: > Can you double check this change. I see python3 package being > included. > > -armin > > On 6/18/22 15:02, Markus Volk wrote: >> - fix flatc not found issue >> - build the python3 module as a separate package to allow proper install >> - remove fpic CXXFLAG as it seems to be unneeded >> >> Signed-off-by: Markus Volk <f_l_k@t-online.de> >> --- >> ...tbuffers_2.0.0.bb => flatbuffers_2.0.6.bb} | 20 +++++-------------- >> .../flatbuffers/python3-flatbuffers_2.0.6.bb | 15 ++++++++++++++ >> 2 files changed, 20 insertions(+), 15 deletions(-) >> rename meta-oe/recipes-devtools/flatbuffers/{flatbuffers_2.0.0.bb >> => flatbuffers_2.0.6.bb} (62%) >> create mode 100644 >> meta-oe/recipes-devtools/flatbuffers/python3-flatbuffers_2.0.6.bb >> >> diff --git >> a/meta-oe/recipes-devtools/flatbuffers/flatbuffers_2.0.0.bb >> b/meta-oe/recipes-devtools/flatbuffers/flatbuffers_2.0.6.bb >> similarity index 62% >> rename from meta-oe/recipes-devtools/flatbuffers/flatbuffers_2.0.0.bb >> rename to meta-oe/recipes-devtools/flatbuffers/flatbuffers_2.0.6.bb >> index bf74f1229..76127000d 100644 >> --- a/meta-oe/recipes-devtools/flatbuffers/flatbuffers_2.0.0.bb >> +++ b/meta-oe/recipes-devtools/flatbuffers/flatbuffers_2.0.6.bb >> @@ -3,41 +3,31 @@ 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}" >> RDEPENDS:${PN}-dev += "${PN}-compiler" >> LIC_FILES_CHKSUM = >> "file://LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57" >> -SRCREV = "a9a295fecf3fbd5a4f571f53b01f63202a3e2113" >> +SRCREV = "615616cb5549a34bdf288c04bc1b94bd7a65c396" >> SRC_URI = >> "git://github.com/google/flatbuffers.git;branch=master;protocol=https" >> S = "${WORKDIR}/git" >> CVE_CHECK_IGNORE += "CVE-2020-35864" >> -CXXFLAGS += "-fPIC" >> -BUILD_CXXFLAGS += "-fPIC" >> - >> # BUILD_TYPE=Release is required, otherwise flatc is not installed >> -EXTRA_OECMAKE += "\ >> +EXTRA_OECMAKE += " \ >> -DCMAKE_BUILD_TYPE=Release \ >> -DFLATBUFFERS_BUILD_TESTS=OFF \ >> -DFLATBUFFERS_BUILD_SHAREDLIB=ON \ >> " >> +EXTRA_OECMAKE:class-target += >> "-DFLATBUFFERS_FLATC_EXECUTABLE=${STAGING_BINDIR_NATIVE}/flatc" >> inherit cmake >> -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-oe/recipes-devtools/flatbuffers/python3-flatbuffers_2.0.6.bb >> b/meta-oe/recipes-devtools/flatbuffers/python3-flatbuffers_2.0.6.bb >> new file mode 100644 >> index 000000000..cc453da35 >> --- /dev/null >> +++ b/meta-oe/recipes-devtools/flatbuffers/python3-flatbuffers_2.0.6.bb >> @@ -0,0 +1,15 @@ >> +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 >> + >> >> -=-=-=-=-=-=-=-=-=-=-=- >> Links: You receive all messages sent to this group. >> View/Reply Online (#97540): >> https://lists.openembedded.org/g/openembedded-devel/message/97540 >> Mute This Topic: https://lists.openembedded.org/mt/91848724/3616698 >> Group Owner: openembedded-devel+owner@lists.openembedded.org >> Unsubscribe: >> https://lists.openembedded.org/g/openembedded-devel/unsub >> [akuster808@gmail.com] >> -=-=-=-=-=-=-=-=-=-=-=- >> >
diff --git a/meta-oe/recipes-devtools/flatbuffers/flatbuffers_2.0.0.bb b/meta-oe/recipes-devtools/flatbuffers/flatbuffers_2.0.6.bb similarity index 62% rename from meta-oe/recipes-devtools/flatbuffers/flatbuffers_2.0.0.bb rename to meta-oe/recipes-devtools/flatbuffers/flatbuffers_2.0.6.bb index bf74f1229..76127000d 100644 --- a/meta-oe/recipes-devtools/flatbuffers/flatbuffers_2.0.0.bb +++ b/meta-oe/recipes-devtools/flatbuffers/flatbuffers_2.0.6.bb @@ -3,41 +3,31 @@ 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}" RDEPENDS:${PN}-dev += "${PN}-compiler" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57" -SRCREV = "a9a295fecf3fbd5a4f571f53b01f63202a3e2113" +SRCREV = "615616cb5549a34bdf288c04bc1b94bd7a65c396" SRC_URI = "git://github.com/google/flatbuffers.git;branch=master;protocol=https" S = "${WORKDIR}/git" CVE_CHECK_IGNORE += "CVE-2020-35864" -CXXFLAGS += "-fPIC" -BUILD_CXXFLAGS += "-fPIC" - # BUILD_TYPE=Release is required, otherwise flatc is not installed -EXTRA_OECMAKE += "\ +EXTRA_OECMAKE += " \ -DCMAKE_BUILD_TYPE=Release \ -DFLATBUFFERS_BUILD_TESTS=OFF \ -DFLATBUFFERS_BUILD_SHAREDLIB=ON \ " +EXTRA_OECMAKE:class-target += "-DFLATBUFFERS_FLATC_EXECUTABLE=${STAGING_BINDIR_NATIVE}/flatc" inherit cmake -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-oe/recipes-devtools/flatbuffers/python3-flatbuffers_2.0.6.bb b/meta-oe/recipes-devtools/flatbuffers/python3-flatbuffers_2.0.6.bb new file mode 100644 index 000000000..cc453da35 --- /dev/null +++ b/meta-oe/recipes-devtools/flatbuffers/python3-flatbuffers_2.0.6.bb @@ -0,0 +1,15 @@ +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 +
- fix flatc not found issue - build the python3 module as a separate package to allow proper install - remove fpic CXXFLAG as it seems to be unneeded Signed-off-by: Markus Volk <f_l_k@t-online.de> --- ...tbuffers_2.0.0.bb => flatbuffers_2.0.6.bb} | 20 +++++-------------- .../flatbuffers/python3-flatbuffers_2.0.6.bb | 15 ++++++++++++++ 2 files changed, 20 insertions(+), 15 deletions(-) rename meta-oe/recipes-devtools/flatbuffers/{flatbuffers_2.0.0.bb => flatbuffers_2.0.6.bb} (62%) create mode 100644 meta-oe/recipes-devtools/flatbuffers/python3-flatbuffers_2.0.6.bb