[meta-oe][PATCH] nlohmann-json: Add symlink to json.hpp and update to 3.3.0

[meta-oe][PATCH] nlohmann-json: Add symlink to json.hpp and update to 3.3.0

[James Feist]

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 <james.feist@linux.intel.com>
---
 .../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..c1e108b38 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 = "f1768a540a7b7c5cc30cdcd6be9e9ef91083719b"
 
 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

Re: [meta-oe][PATCH] nlohmann-json: Add symlink to json.hpp and update to 3.3.0

[Khem Raj]

Hi James

It seems this srcrev does not exist on master branch but on develop
branch probably
we need to add branch=develop to SRC_URI as well.

see

http://errors.yoctoproject.org/Errors/Build/69670/
On Thu, Oct 11, 2018 at 10:15 AM James Feist
<james.feist@linux.intel.com> wrote:
>
> 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 <james.feist@linux.intel.com>
> ---
>  .../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..c1e108b38 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 = "f1768a540a7b7c5cc30cdcd6be9e9ef91083719b"
>
>  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
>

Re: [meta-oe][PATCH] nlohmann-json: Add symlink to json.hpp and update to 3.3.0

[Feist, James]

On 10/11/2018 1:33 PM, Khem Raj wrote:
> Hi James
> 
> It seems this srcrev does not exist on master branch but on develop
> branch probably
> we need to add branch=develop to SRC_URI as well.
> 
> see
> 
> http://errors.yoctoproject.org/Errors/Build/69670/

My mistake, clicking the tag in github jumped my branch, I'll fix
the revision and resubmit.

Thanks,

James
> On Thu, Oct 11, 2018 at 10:15 AM James Feist
> <james.feist@linux.intel.com> wrote:
>>
>> 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 <james.feist@linux.intel.com>
>> ---
>>   .../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..c1e108b38 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 = "f1768a540a7b7c5cc30cdcd6be9e9ef91083719b"
>>
>>   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
>>