summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Huber <johu@gentoo.org>2015-08-10 21:57:53 +0200
committerJohannes Huber <johu@gentoo.org>2015-08-10 21:58:35 +0200
commit6a293f55fcc2a1d9fb75d0bbd33f2d26105c58d8 (patch)
treed77d980379a94a35a91dc8f088d81aa21ad5e193 /dev-libs
parentdev-go/go-spew: converted to use the go eclasses (diff)
downloadgentoo-6a293f55fcc2a1d9fb75d0bbd33f2d26105c58d8.tar.gz
gentoo-6a293f55fcc2a1d9fb75d0bbd33f2d26105c58d8.tar.bz2
gentoo-6a293f55fcc2a1d9fb75d0bbd33f2d26105c58d8.zip
dev-libs/jsoncpp: Fix build on arm, bug #552572
Adds upstream patch commit: 96412d2964775fd6fb9bf359936743dd508af8ba Gentoo-bug: 552572 Acked-by: Markus Meier <maekke@gentoo.org> Acked-by: Michał Górny <mgorny@gentoo.org> Package-Manager: portage-2.2.20
Diffstat (limited to 'dev-libs')
-rw-r--r--dev-libs/jsoncpp/files/jsoncpp-0.10.2-arm.patch25
-rw-r--r--dev-libs/jsoncpp/jsoncpp-0.10.2-r1.ebuild1
2 files changed, 26 insertions, 0 deletions
diff --git a/dev-libs/jsoncpp/files/jsoncpp-0.10.2-arm.patch b/dev-libs/jsoncpp/files/jsoncpp-0.10.2-arm.patch
new file mode 100644
index 00000000000..838ef848794
--- /dev/null
+++ b/dev-libs/jsoncpp/files/jsoncpp-0.10.2-arm.patch
@@ -0,0 +1,25 @@
+From 96412d2964775fd6fb9bf359936743dd508af8ba Mon Sep 17 00:00:00 2001
+From: Christopher Dunn <cdunn2001@gmail.com>
+Date: Wed, 10 Jun 2015 21:22:24 -0500
+Subject: [PATCH] fix #290
+
+(cherry picked from commit 2760c7902a5cc7173aabe4e1f31dcf93e79377d5)
+---
+ src/test_lib_json/main.cpp | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/src/test_lib_json/main.cpp b/src/test_lib_json/main.cpp
+index 85110ad..080ba6e 100644
+--- a/src/test_lib_json/main.cpp
++++ b/src/test_lib_json/main.cpp
+@@ -296,7 +296,10 @@ JSONTEST_FIXTURE(ValueTest, null) {
+ JSONTEST_ASSERT_EQUAL(0.0, null_.asFloat());
+ JSONTEST_ASSERT_STRING_EQUAL("", null_.asString());
+
++#if !defined(__ARMEL__)
++ // See line #165 of include/json/value.h
+ JSONTEST_ASSERT_EQUAL(Json::Value::null, null_);
++#endif
+ }
+
+ JSONTEST_FIXTURE(ValueTest, strings) {
diff --git a/dev-libs/jsoncpp/jsoncpp-0.10.2-r1.ebuild b/dev-libs/jsoncpp/jsoncpp-0.10.2-r1.ebuild
index 08d77345b80..e6c618b40d0 100644
--- a/dev-libs/jsoncpp/jsoncpp-0.10.2-r1.ebuild
+++ b/dev-libs/jsoncpp/jsoncpp-0.10.2-r1.ebuild
@@ -29,6 +29,7 @@ RDEPEND=""
PATCHES=(
# fix broken path subst in .pc file
"${FILESDIR}"/jsoncpp-1.6.2-fix-pkgconfig.patch
+ "${FILESDIR}/${P}-arm.patch"
)
pkg_setup() {