Return-Path: Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by mail.openembedded.org (Postfix) with ESMTP id 9A1FD79ADD for ; Thu, 11 Oct 2018 20:48:18 +0000 (UTC) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga002.jf.intel.com ([10.7.209.21]) by fmsmga103.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 11 Oct 2018 13:48:19 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.54,369,1534834800"; d="scan'208";a="99500122" Received: from skyhawk.jf.intel.com ([10.54.51.81]) by orsmga002.jf.intel.com with ESMTP; 11 Oct 2018 13:48:19 -0700 From: James Feist To: openembedded-devel@lists.openembedded.org Date: Thu, 11 Oct 2018 13:47:04 -0700 Message-Id: <20181011204704.17667-1-james.feist@linux.intel.com> X-Mailer: git-send-email 2.17.1 Subject: [meta-oe][PATCH v2] nlohmann-json: Add symlink to json.hpp and update to 3.3.0 X-BeenThere: openembedded-devel@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Using the OpenEmbedded metadata to build Distributions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 11 Oct 2018 20:48:18 -0000 nlohmann-json has examples in their repo that refer to the header as json.hpp directly, as such many packages that require nlohmann-json expect json.hpp and not nlohmann/json.hpp as the cmake file installs. Create symlink so that access is available by either option. Also update to release 3.3.0. Signed-off-by: James Feist --- changes: - fixed srcrev .../nlohmann-json/nlohmann-json_git.bb | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/meta-oe/recipes-devtools/nlohmann-json/nlohmann-json_git.bb b/meta-oe/recipes-devtools/nlohmann-json/nlohmann-json_git.bb index a89b659ae..65e49bc95 100644 --- a/meta-oe/recipes-devtools/nlohmann-json/nlohmann-json_git.bb +++ b/meta-oe/recipes-devtools/nlohmann-json/nlohmann-json_git.bb @@ -6,9 +6,9 @@ LIC_FILES_CHKSUM = "file://LICENSE.MIT;md5=9a8ae1c2d606c432a2aa2e2de15be22a" SRC_URI = "git://github.com/nlohmann/json.git" -PV = "3.2.0+git${SRCPV}" +PV = "3.3.0+git${SRCPV}" -SRCREV = "8c20571136f2d5351b379a06ad6591bd980880fe" +SRCREV = "aafad2be1f3cd259a1e79d2f6fcf267d1ede9ec7" S = "${WORKDIR}/git" @@ -21,3 +21,9 @@ EXTRA_OECMAKE += "-DJSON_BuildTests=OFF" RDEPENDS_${PN}-dev = "" BBCLASSEXTEND = "native nativesdk" + +# other packages commonly reference the file directly as "json.hpp" +# create symlink to allow this usage +do_install_append() { + ln -s nlohmann/json.hpp ${D}${includedir}/json.hpp +} -- 2.17.1