summaryrefslogtreecommitdiff
path: root/recipes-support
diff options
context:
space:
mode:
authorJesse Gilles <jgilles@multitech.com>2015-01-28 09:08:39 -0600
committerJesse Gilles <jgilles@multitech.com>2015-01-28 09:08:39 -0600
commit1ac17eee9e0b459af2be69e4389cd8510ce8edbb (patch)
tree11cbdf449d5d19f4c4c9009280c3c45bc6dff4e6 /recipes-support
parenta4ee88ac653fed5963e30b440b2d13d7556282f7 (diff)
downloadmeta-mlinux-1ac17eee9e0b459af2be69e4389cd8510ce8edbb.tar.gz
meta-mlinux-1ac17eee9e0b459af2be69e4389cd8510ce8edbb.tar.bz2
meta-mlinux-1ac17eee9e0b459af2be69e4389cd8510ce8edbb.zip
jsoncpp-0.5.0: update SRC_URI, fix LICENSE and include install path
/usr/include/json conflicts with json-c package
Diffstat (limited to 'recipes-support')
-rw-r--r--recipes-support/jsoncpp/jsoncpp-0.5.0/Makefile4
-rw-r--r--recipes-support/jsoncpp/jsoncpp_0.5.0.bb21
2 files changed, 11 insertions, 14 deletions
diff --git a/recipes-support/jsoncpp/jsoncpp-0.5.0/Makefile b/recipes-support/jsoncpp/jsoncpp-0.5.0/Makefile
index bee6876..3be3743 100644
--- a/recipes-support/jsoncpp/jsoncpp-0.5.0/Makefile
+++ b/recipes-support/jsoncpp/jsoncpp-0.5.0/Makefile
@@ -32,9 +32,9 @@ libjsoncpp.a: $(OBJS)
install:
mkdir -p $(DESTDIR)$(libdir)
- mkdir -p $(DESTDIR)$(includedir)/json
+ mkdir -p $(DESTDIR)$(includedir)/jsoncpp/json
cp libjsoncpp.a $(DESTDIR)$(libdir)/
- cp include/json/* $(DESTDIR)$(includedir)/json/
+ cp include/json/* $(DESTDIR)$(includedir)/jsoncpp/json/
# Other Targets
clean:
diff --git a/recipes-support/jsoncpp/jsoncpp_0.5.0.bb b/recipes-support/jsoncpp/jsoncpp_0.5.0.bb
index 18f1c86..aa4880a 100644
--- a/recipes-support/jsoncpp/jsoncpp_0.5.0.bb
+++ b/recipes-support/jsoncpp/jsoncpp_0.5.0.bb
@@ -1,27 +1,25 @@
DESCRIPTION = "Json C++ Library"
-HOMEPAGE = "http://jsoncpp.sourceforge.net/"
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302"
+HOMEPAGE = "https://github.com/open-source-parsers/jsoncpp"
+# Public Domain
+LICENSE = "PD"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=f7c191d0ae6a652f63b2d2bc1ea8bdab"
DEPENDS = ""
BBCLASSEXTEND = "native"
-NATIVE_INSTALL_WORKS = "1"
+
+SRCREV = "svn-release-0.5.0"
SRC_URI = " \
- http://sw.multitech.prv/openembedded/sources/jsoncpp-src-0.5.0.tar.gz \
+ git://github.com/open-source-parsers/jsoncpp.git;nobranch=1 \
file://jsoncpp-0.5.0-p1.patch \
file://Makefile \
"
PR = "r2"
-# For tarball packages (as opposed to git / svn which include the commit in the URI)
-SRC_URI[md5sum] = "24482b67c1cb17aac1ed1814288a3a8f"
-SRC_URI[sha256sum] = "22b14ecd0de8cdad2b6b6839f6d0804d3b84e91f42861ebd843832a26a927433"
-
-S = "${WORKDIR}/jsoncpp-src-${PV}"
+S = "${WORKDIR}/git"
do_compile() {
- cp ../Makefile .
+ cp ${WORKDIR}/Makefile .
oe_runmake
}
@@ -29,4 +27,3 @@ do_install() {
oe_runmake install DESTDIR=${D}
}
-