diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2014-06-25 16:00:54 +0200 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2014-06-25 16:04:42 +0200 |
| commit | 56997c6e61679e87696a9afe4f7adb365bb2313c (patch) | |
| tree | a257e29f9cc24a9e7f73336b9008271c31e31dc8 /patches/json-dbus-bridge-1.0.0 | |
| parent | 6e7abee162b2a808249fafc1e8933764800ef702 (diff) | |
| download | ptxdist-56997c6e61679e87696a9afe4f7adb365bb2313c.tar.gz ptxdist-56997c6e61679e87696a9afe4f7adb365bb2313c.tar.xz | |
json-dbus-bridge: fix building with latest json-c
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'patches/json-dbus-bridge-1.0.0')
3 files changed, 32 insertions, 0 deletions
diff --git a/patches/json-dbus-bridge-1.0.0/0001-configure.ac-fix-building-with-latest-json-c.patch b/patches/json-dbus-bridge-1.0.0/0001-configure.ac-fix-building-with-latest-json-c.patch new file mode 100644 index 000000000..5d2c3774c --- /dev/null +++ b/patches/json-dbus-bridge-1.0.0/0001-configure.ac-fix-building-with-latest-json-c.patch @@ -0,0 +1,27 @@ +From: Michael Olbrich <m.olbrich@pengutronix.de> +Date: Tue, 24 Jun 2014 18:07:43 +0200 +Subject: [PATCH] configure.ac: fix building with latest json-c + +Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de> +--- + configure.ac | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index acf05b2..1639c64 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -45,9 +45,11 @@ PKG_CHECK_MODULES(dbus, $REQUIRES_DBUS,) + ## + # json + ## +-REQUIRES_JSON="json >= 0.8" + AC_SUBST(REQUIRES_JSON) +-PKG_CHECK_MODULES(json, $REQUIRES_JSON) ++REQUIRES_JSON="json-c" ++PKG_CHECK_MODULES(json, $REQUIRES_JSON,[], ++ [REQUIRES_JSON="json >= 0.8" ++ PKG_CHECK_MODULES(json, $REQUIRES_JSON)]) + + # + # libevent2 diff --git a/patches/json-dbus-bridge-1.0.0/autogen.sh b/patches/json-dbus-bridge-1.0.0/autogen.sh new file mode 120000 index 000000000..9f8a4cb7d --- /dev/null +++ b/patches/json-dbus-bridge-1.0.0/autogen.sh @@ -0,0 +1 @@ +../autogen.sh
\ No newline at end of file diff --git a/patches/json-dbus-bridge-1.0.0/series b/patches/json-dbus-bridge-1.0.0/series new file mode 100644 index 000000000..ea1effa69 --- /dev/null +++ b/patches/json-dbus-bridge-1.0.0/series @@ -0,0 +1,4 @@ +# generated by git-ptx-patches +#tag:base --start-number 1 +0001-configure.ac-fix-building-with-latest-json-c.patch +# dac98e792a07bf3af863ecdbeef0289e - git-ptx-patches magic |