diff mbox

[2/2] jsoncpp: patch to include stdint.h, necessary for int64_t and uint64_t

Message ID 1474886662-46914-2-git-send-email-Vincent.Riera@imgtec.com
State Superseded
Headers show

Commit Message

Vicente Olivert Riera Sept. 26, 2016, 10:44 a.m. UTC
Otherwise failures like these one can happen during the configure phase
of other applications that use jsoncpp, like upmpdcli for instance:

checking jsoncpp/json/json.h usability... yes
checking jsoncpp/json/json.h presence... yes
checking for jsoncpp/json/json.h... yes
configure: error: libjsoncpp not found.

And this is the actual problem that you can see in config.log:

configure:5233: checking for jsoncpp/json/json.h
configure:5233: result: yes
configure:5259: /usr/bin/mipsel-linux-g++ -o conftest conftest.cpp
-lmicrohttpd -lmpdclient -lpthread -ljsoncpp >&5
In file included from /usr/include/jsoncpp/json/autolink.h:9:0,
from /usr/include/jsoncpp/json/json.h:9,
from conftest.cpp:26:
/usr/include/jsoncpp/json/config.h:155:9: error: 'int64_t' does not name
a type
typedef int64_t Int64;
^
/usr/include/jsoncpp/json/config.h:156:9: error: 'uint64_t' does not
name a type
typedef uint64_t UInt64;
^

Upstream status: pull request sent
https://github.com/open-source-parsers/jsoncpp/pull/536

Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
---
 ...dint.h-necessary-for-int64_t-and-uint64_t.patch | 51 ++++++++++++++++++++++
 1 file changed, 51 insertions(+)
 create mode 100644 package/jsoncpp/0001-Include-stdint.h-necessary-for-int64_t-and-uint64_t.patch

Comments

Vicente Olivert Riera Sept. 28, 2016, 9:54 a.m. UTC | #1
Dear maintainer,

On 26/09/16 11:44, Vicente Olivert Riera wrote:
> Otherwise failures like these one can happen during the configure phase
> of other applications that use jsoncpp, like upmpdcli for instance:
> 
> checking jsoncpp/json/json.h usability... yes
> checking jsoncpp/json/json.h presence... yes
> checking for jsoncpp/json/json.h... yes
> configure: error: libjsoncpp not found.
> 
> And this is the actual problem that you can see in config.log:
> 
> configure:5233: checking for jsoncpp/json/json.h
> configure:5233: result: yes
> configure:5259: /usr/bin/mipsel-linux-g++ -o conftest conftest.cpp
> -lmicrohttpd -lmpdclient -lpthread -ljsoncpp >&5
> In file included from /usr/include/jsoncpp/json/autolink.h:9:0,
> from /usr/include/jsoncpp/json/json.h:9,
> from conftest.cpp:26:
> /usr/include/jsoncpp/json/config.h:155:9: error: 'int64_t' does not name
> a type
> typedef int64_t Int64;
> ^
> /usr/include/jsoncpp/json/config.h:156:9: error: 'uint64_t' does not
> name a type
> typedef uint64_t UInt64;
> ^
> 
> Upstream status: pull request sent
> https://github.com/open-source-parsers/jsoncpp/pull/536

whenever you apply this patch (if you decide to do it), could you please
amend the commit log and change the "Upstream status" to "merged"?

The upstream commit URL is here if you prefer to have it rather than the
PR URL:

https://github.com/open-source-parsers/jsoncpp/commit/ab0f1e234aa40147e39cdfd0b97bf6527b8ea5e8

We can also bump the version to ToT so we don't have to backport the
patch. If you prefer that solution, please let me know so I can send a v2.

Vincent

> 
> Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
> ---
>  ...dint.h-necessary-for-int64_t-and-uint64_t.patch | 51 ++++++++++++++++++++++
>  1 file changed, 51 insertions(+)
>  create mode 100644 package/jsoncpp/0001-Include-stdint.h-necessary-for-int64_t-and-uint64_t.patch
> 
> diff --git a/package/jsoncpp/0001-Include-stdint.h-necessary-for-int64_t-and-uint64_t.patch b/package/jsoncpp/0001-Include-stdint.h-necessary-for-int64_t-and-uint64_t.patch
> new file mode 100644
> index 0000000..26a11ff
> --- /dev/null
> +++ b/package/jsoncpp/0001-Include-stdint.h-necessary-for-int64_t-and-uint64_t.patch
> @@ -0,0 +1,51 @@
> +From ab0f1e234aa40147e39cdfd0b97bf6527b8ea5e8 Mon Sep 17 00:00:00 2001
> +From: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
> +Date: Mon, 26 Sep 2016 11:16:38 +0100
> +Subject: [PATCH] Include stdint.h necessary for int64_t and uint64_t
> +
> +Otherwise failures like these one can happen during the configure phase
> +of other applications that use jsoncpp, like upmpdcli for instance:
> +
> +checking jsoncpp/json/json.h usability... yes
> +checking jsoncpp/json/json.h presence... yes
> +checking for jsoncpp/json/json.h... yes
> +configure: error: libjsoncpp not found.
> +
> +And this is the actual problem that you can see in config.log:
> +
> +configure:5233: checking for jsoncpp/json/json.h
> +configure:5233: result: yes
> +configure:5259: /usr/bin/mipsel-linux-g++ -o conftest conftest.cpp
> +-lmicrohttpd -lmpdclient -lpthread  -ljsoncpp >&5
> +In file included from /usr/include/jsoncpp/json/autolink.h:9:0,
> +                 from /usr/include/jsoncpp/json/json.h:9,
> +                 from conftest.cpp:26:
> +/usr/include/jsoncpp/json/config.h:155:9: error: 'int64_t' does not name
> +a type
> + typedef int64_t Int64;
> +         ^
> +/usr/include/jsoncpp/json/config.h:156:9: error: 'uint64_t' does not
> +name a type
> + typedef uint64_t UInt64;
> +         ^
> +
> +Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
> +---
> + include/json/config.h | 1 +
> + 1 file changed, 1 insertion(+)
> +
> +diff --git a/include/json/config.h b/include/json/config.h
> +index 6519101..71278c3 100644
> +--- a/include/json/config.h
> ++++ b/include/json/config.h
> +@@ -7,6 +7,7 @@
> + #define JSON_CONFIG_H_INCLUDED
> + #include <stddef.h>
> + #include <string> //typdef String
> ++#include <stdint.h> //typedef int64_t, uint64_t
> + 
> + /// If defined, indicates that json library is embedded in CppTL library.
> + //# define JSON_IN_CPPTL 1
> +-- 
> +2.7.3
> +
>
Peter Korsgaard Oct. 14, 2016, 12:57 p.m. UTC | #2
>>>>> "Vicente" == Vicente Olivert Riera <Vincent.Riera@imgtec.com> writes:

 > Otherwise failures like these one can happen during the configure phase
 > of other applications that use jsoncpp, like upmpdcli for instance:

 > checking jsoncpp/json/json.h usability... yes
 > checking jsoncpp/json/json.h presence... yes
 > checking for jsoncpp/json/json.h... yes
 > configure: error: libjsoncpp not found.

 > And this is the actual problem that you can see in config.log:

Thanks, but jsoncpp has already been bumped, and the new version
contains this fix:

commit e8d04791ff37be807995f6b7d242179756581343
Author: Jörg Krause <joerg.krause@embedded.rocks>
Date:   Tue Oct 11 21:09:30 2016 +0200

    package/jsoncpp: bump to version 1.7.7

    Signed-off-by: Jörg Krause <joerg.krause@embedded.rocks>
    Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
diff mbox

Patch

diff --git a/package/jsoncpp/0001-Include-stdint.h-necessary-for-int64_t-and-uint64_t.patch b/package/jsoncpp/0001-Include-stdint.h-necessary-for-int64_t-and-uint64_t.patch
new file mode 100644
index 0000000..26a11ff
--- /dev/null
+++ b/package/jsoncpp/0001-Include-stdint.h-necessary-for-int64_t-and-uint64_t.patch
@@ -0,0 +1,51 @@ 
+From ab0f1e234aa40147e39cdfd0b97bf6527b8ea5e8 Mon Sep 17 00:00:00 2001
+From: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
+Date: Mon, 26 Sep 2016 11:16:38 +0100
+Subject: [PATCH] Include stdint.h necessary for int64_t and uint64_t
+
+Otherwise failures like these one can happen during the configure phase
+of other applications that use jsoncpp, like upmpdcli for instance:
+
+checking jsoncpp/json/json.h usability... yes
+checking jsoncpp/json/json.h presence... yes
+checking for jsoncpp/json/json.h... yes
+configure: error: libjsoncpp not found.
+
+And this is the actual problem that you can see in config.log:
+
+configure:5233: checking for jsoncpp/json/json.h
+configure:5233: result: yes
+configure:5259: /usr/bin/mipsel-linux-g++ -o conftest conftest.cpp
+-lmicrohttpd -lmpdclient -lpthread  -ljsoncpp >&5
+In file included from /usr/include/jsoncpp/json/autolink.h:9:0,
+                 from /usr/include/jsoncpp/json/json.h:9,
+                 from conftest.cpp:26:
+/usr/include/jsoncpp/json/config.h:155:9: error: 'int64_t' does not name
+a type
+ typedef int64_t Int64;
+         ^
+/usr/include/jsoncpp/json/config.h:156:9: error: 'uint64_t' does not
+name a type
+ typedef uint64_t UInt64;
+         ^
+
+Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
+---
+ include/json/config.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/include/json/config.h b/include/json/config.h
+index 6519101..71278c3 100644
+--- a/include/json/config.h
++++ b/include/json/config.h
+@@ -7,6 +7,7 @@
+ #define JSON_CONFIG_H_INCLUDED
+ #include <stddef.h>
+ #include <string> //typdef String
++#include <stdint.h> //typedef int64_t, uint64_t
+ 
+ /// If defined, indicates that json library is embedded in CppTL library.
+ //# define JSON_IN_CPPTL 1
+-- 
+2.7.3
+