From patchwork Tue Jun 21 14:52:11 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Markus Volk X-Patchwork-Id: 9414 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0E47EC433EF for ; Tue, 21 Jun 2022 14:52:45 +0000 (UTC) Received: from mailout06.t-online.de (mailout06.t-online.de [194.25.134.19]) by mx.groups.io with SMTP id smtpd.web11.33999.1655823156436948331 for ; Tue, 21 Jun 2022 07:52:37 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=none, err=SPF record not found (domain: t-online.de, ip: 194.25.134.19, mailfrom: f_l_k@t-online.de) Received: from fwd70.dcpf.telekom.de (fwd70.aul.t-online.de [10.223.144.96]) by mailout06.t-online.de (Postfix) with SMTP id B1F9F45BC for ; Tue, 21 Jun 2022 16:52:34 +0200 (CEST) Received: from flk-MS-7C91.fritz.box ([84.163.45.237]) by fwd70.t-online.de with (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384 encrypted) esmtp id 1o3fF4-2cGVKD0; Tue, 21 Jun 2022 16:52:34 +0200 From: Markus Volk To: openembedded-devel@lists.openembedded.org Cc: Markus Volk Subject: [meta-oe][PATCHv3] flatbuffers: update to 2.0.6 Date: Tue, 21 Jun 2022 16:52:11 +0200 Message-Id: <20220621145211.30258-1-f_l_k@t-online.de> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-TOI-EXPURGATEID: 150726::1655823154-0143FF0B-9A9BB899/0/0 CLEAN NORMAL X-TOI-MSGID: a8e89bd3-6594-4877-850d-9539d7a851db List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 21 Jun 2022 14:52:45 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/97555 - 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 - use python3-native - remove -DCMAKE_BUILD_TYPE=Release option and its outdated comment. After a long discussion the default behavior was changed: https://github.com/google/flatbuffers/pull/5180 Signed-off-by: Markus Volk --- ...tbuffers_2.0.0.bb => flatbuffers_2.0.6.bb} | 24 +++++-------------- .../flatbuffers/python3-flatbuffers_2.0.6.bb | 15 ++++++++++++ 2 files changed, 21 insertions(+), 18 deletions(-) rename meta-oe/recipes-devtools/flatbuffers/{flatbuffers_2.0.0.bb => flatbuffers_2.0.6.bb} (52%) 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 52% 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..3ca477210 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,29 @@ 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 += "\ - -DCMAKE_BUILD_TYPE=Release \ +EXTRA_OECMAKE += " \ -DFLATBUFFERS_BUILD_TESTS=OFF \ -DFLATBUFFERS_BUILD_SHAREDLIB=ON \ " +EXTRA_OECMAKE:append: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} -} +inherit cmake python3native 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 +