From a32ad409315ebae13614a409eb4671ac4a2b1cc8 Mon Sep 17 00:00:00 2001
From: Mykyta Dorokhin <mykyta.dorokhin@globallogic.com>
Date: Tue, 2 Mar 2021 21:33:25 +0200
Subject: jsoncpp: rename package to jsoncpp16 so to use jsoncpp version from
 yocto by default

---
 recipes-support/jsoncpp/jsoncpp-1.6.0/Makefile   | 49 ------------------------
 recipes-support/jsoncpp/jsoncpp16-1.6.0/Makefile | 49 ++++++++++++++++++++++++
 recipes-support/jsoncpp/jsoncpp16_1.6.0.bb       | 33 ++++++++++++++++
 recipes-support/jsoncpp/jsoncpp_1.6.0.bb         | 33 ----------------
 recipes-support/multitech/jsparser_0.3.bb        |  4 +-
 recipes-support/multitech/libmts-io_1.0.22.bb    |  2 +-
 recipes-support/multitech/radio-cmd_0.7.bb       |  4 +-
 recipes-support/multitech/radio-query_1.0.bb     |  4 +-
 8 files changed, 89 insertions(+), 89 deletions(-)
 delete mode 100644 recipes-support/jsoncpp/jsoncpp-1.6.0/Makefile
 create mode 100644 recipes-support/jsoncpp/jsoncpp16-1.6.0/Makefile
 create mode 100644 recipes-support/jsoncpp/jsoncpp16_1.6.0.bb
 delete mode 100644 recipes-support/jsoncpp/jsoncpp_1.6.0.bb

(limited to 'recipes-support')

diff --git a/recipes-support/jsoncpp/jsoncpp-1.6.0/Makefile b/recipes-support/jsoncpp/jsoncpp-1.6.0/Makefile
deleted file mode 100644
index 7df3d63..0000000
--- a/recipes-support/jsoncpp/jsoncpp-1.6.0/Makefile
+++ /dev/null
@@ -1,49 +0,0 @@
-includedir ?= /usr/include
-libdir ?= /usr/lib
-
-CPP_SRCS += \
-src/lib_json/json_reader.cpp \
-src/lib_json/json_value.cpp \
-src/lib_json/json_writer.cpp 
-
-OBJS += \
-json_reader.o \
-json_value.o \
-json_writer.o 
-
-CPP_DEPS += \
-json_reader.d \
-json_value.d \
-json_writer.d 
-
-TARGET = libjsoncpp.so
-
-all: $(TARGET)
-
-libjsoncpp.so: $(OBJS)
-	@echo 'Building target: $@'
-	#$(AR) -r  libjsoncpp.a $(OBJS)
-	$(CXX) ${LDFLAGS} -shared -o $@ $^
-	@echo 'Finished building target: $@'
-	@echo ' '
-
-%.o: src/lib_json/%.cpp
-	@echo 'Building file: $<'
-	$(CXX) $(CFLAGS) -Iinclude -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -fPIC -o "$@" "$<"
-	@echo 'Finished building: $<'
-	@echo ' '
-
-install:
-	install -d $(DESTDIR)/usr/include/json
-	install -m 644 include/json/*.h $(DESTDIR)/usr/include/json
-	mkdir -p $(DESTDIR)/usr/lib
-	cp libjsoncpp.so $(DESTDIR)/usr/lib
-
-# Other Targets
-clean:
-	-$(RM) $(OBJS)$(CPP_DEPS) libjsoncpp.so
-	-@echo ' '
-
-.PHONY: all clean dependents
-.SECONDARY:
-
diff --git a/recipes-support/jsoncpp/jsoncpp16-1.6.0/Makefile b/recipes-support/jsoncpp/jsoncpp16-1.6.0/Makefile
new file mode 100644
index 0000000..7df3d63
--- /dev/null
+++ b/recipes-support/jsoncpp/jsoncpp16-1.6.0/Makefile
@@ -0,0 +1,49 @@
+includedir ?= /usr/include
+libdir ?= /usr/lib
+
+CPP_SRCS += \
+src/lib_json/json_reader.cpp \
+src/lib_json/json_value.cpp \
+src/lib_json/json_writer.cpp 
+
+OBJS += \
+json_reader.o \
+json_value.o \
+json_writer.o 
+
+CPP_DEPS += \
+json_reader.d \
+json_value.d \
+json_writer.d 
+
+TARGET = libjsoncpp.so
+
+all: $(TARGET)
+
+libjsoncpp.so: $(OBJS)
+	@echo 'Building target: $@'
+	#$(AR) -r  libjsoncpp.a $(OBJS)
+	$(CXX) ${LDFLAGS} -shared -o $@ $^
+	@echo 'Finished building target: $@'
+	@echo ' '
+
+%.o: src/lib_json/%.cpp
+	@echo 'Building file: $<'
+	$(CXX) $(CFLAGS) -Iinclude -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -fPIC -o "$@" "$<"
+	@echo 'Finished building: $<'
+	@echo ' '
+
+install:
+	install -d $(DESTDIR)/usr/include/json
+	install -m 644 include/json/*.h $(DESTDIR)/usr/include/json
+	mkdir -p $(DESTDIR)/usr/lib
+	cp libjsoncpp.so $(DESTDIR)/usr/lib
+
+# Other Targets
+clean:
+	-$(RM) $(OBJS)$(CPP_DEPS) libjsoncpp.so
+	-@echo ' '
+
+.PHONY: all clean dependents
+.SECONDARY:
+
diff --git a/recipes-support/jsoncpp/jsoncpp16_1.6.0.bb b/recipes-support/jsoncpp/jsoncpp16_1.6.0.bb
new file mode 100644
index 0000000..8c8454d
--- /dev/null
+++ b/recipes-support/jsoncpp/jsoncpp16_1.6.0.bb
@@ -0,0 +1,33 @@
+DESCRIPTION = "Json C++ Library"
+HOMEPAGE = "https://github.com/open-source-parsers/jsoncpp"
+# Public Domain
+LICENSE = "PD"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=c56ee55c03a55f8105b969d8270632ce"
+DEPENDS = ""
+
+#tag 1.6.0
+SRCREV="cbe7e7c9cbd39d864588c5cf2436690634562d3f"
+
+SRC_URI = " git://github.com/open-source-parsers/jsoncpp.git;protocol=git \
+            file://Makefile \
+          "
+
+PR = "r6"
+
+S = "${WORKDIR}/git"
+
+do_compile() {
+	cp ${WORKDIR}/Makefile .
+	oe_runmake
+}
+
+do_install () {
+	install -d ${D}/usr/lib
+	install -m 0755 ${S}/libjsoncpp.so ${D}/usr/lib
+	install -d ${D}${includedir}/jsoncpp/json
+	install -m 0755 ${S}/include/json/*.h ${D}${includedir}/jsoncpp/json
+}
+
+FILES_SOLIBSDEV = ""
+FILES_${PN} += "${libdir}/*.so"
+FILES_{PN}-dev += "${libdir}/*.so"
diff --git a/recipes-support/jsoncpp/jsoncpp_1.6.0.bb b/recipes-support/jsoncpp/jsoncpp_1.6.0.bb
deleted file mode 100644
index 8c8454d..0000000
--- a/recipes-support/jsoncpp/jsoncpp_1.6.0.bb
+++ /dev/null
@@ -1,33 +0,0 @@
-DESCRIPTION = "Json C++ Library"
-HOMEPAGE = "https://github.com/open-source-parsers/jsoncpp"
-# Public Domain
-LICENSE = "PD"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=c56ee55c03a55f8105b969d8270632ce"
-DEPENDS = ""
-
-#tag 1.6.0
-SRCREV="cbe7e7c9cbd39d864588c5cf2436690634562d3f"
-
-SRC_URI = " git://github.com/open-source-parsers/jsoncpp.git;protocol=git \
-            file://Makefile \
-          "
-
-PR = "r6"
-
-S = "${WORKDIR}/git"
-
-do_compile() {
-	cp ${WORKDIR}/Makefile .
-	oe_runmake
-}
-
-do_install () {
-	install -d ${D}/usr/lib
-	install -m 0755 ${S}/libjsoncpp.so ${D}/usr/lib
-	install -d ${D}${includedir}/jsoncpp/json
-	install -m 0755 ${S}/include/json/*.h ${D}${includedir}/jsoncpp/json
-}
-
-FILES_SOLIBSDEV = ""
-FILES_${PN} += "${libdir}/*.so"
-FILES_{PN}-dev += "${libdir}/*.so"
diff --git a/recipes-support/multitech/jsparser_0.3.bb b/recipes-support/multitech/jsparser_0.3.bb
index cd419c6..e7fe029 100644
--- a/recipes-support/multitech/jsparser_0.3.bb
+++ b/recipes-support/multitech/jsparser_0.3.bb
@@ -1,8 +1,8 @@
 DESCRIPTION = "MultiTech Command Line JSON Parser"
 LICENSE = "GPL-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=94d55d512a9ba36caa9b7df079bae19f"
-DEPENDS = "jsoncpp libmts"
-RDEPENDS_${PN} += "bash jsoncpp"
+DEPENDS = "jsoncpp16 libmts"
+RDEPENDS_${PN} += "bash jsoncpp16"
 
 PR = "r0"
 SRCREV="${PV}"
diff --git a/recipes-support/multitech/libmts-io_1.0.22.bb b/recipes-support/multitech/libmts-io_1.0.22.bb
index 34115be..d30d261 100644
--- a/recipes-support/multitech/libmts-io_1.0.22.bb
+++ b/recipes-support/multitech/libmts-io_1.0.22.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "http://www.multitech.net/"
 LICENSE = "LGPL-2.1"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=4fbd65380cdd255951079008b364516c"
 
-DEPENDS = "libmts jsoncpp cmake-native cppunit"
+DEPENDS = "libmts jsoncpp16 cmake-native cppunit"
 BBCLASSEXTEND = "native"
 
 PR = "r0"
diff --git a/recipes-support/multitech/radio-cmd_0.7.bb b/recipes-support/multitech/radio-cmd_0.7.bb
index d81fe83..5339304 100644
--- a/recipes-support/multitech/radio-cmd_0.7.bb
+++ b/recipes-support/multitech/radio-cmd_0.7.bb
@@ -3,8 +3,8 @@ HOMEPAGE = "http://www.multitech.net/"
 LICENSE = "GPL-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=94d55d512a9ba36caa9b7df079bae19f"
 
-DEPENDS = "jsoncpp libmts libmts-io"
-RDEPENDS_${PN} = "jsoncpp libmts libmts-io"
+DEPENDS = "jsoncpp16 libmts libmts-io"
+RDEPENDS_${PN} = "jsoncpp16 libmts libmts-io"
 
 PR = "r1"
 SRCREV = "${PV}"
diff --git a/recipes-support/multitech/radio-query_1.0.bb b/recipes-support/multitech/radio-query_1.0.bb
index 7ce0976..092819d 100644
--- a/recipes-support/multitech/radio-query_1.0.bb
+++ b/recipes-support/multitech/radio-query_1.0.bb
@@ -2,8 +2,8 @@ DESCRIPTION = "MultiTech cellular radio query tool"
 HOMEPAGE = "http://www.multitech.net/"
 LICENSE = "GPL-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=94d55d512a9ba36caa9b7df079bae19f"
-RDEPENDS_${PN} += "jsoncpp"
-DEPENDS = "jsoncpp libmts libmts-io"
+RDEPENDS_${PN} += "jsoncpp16"
+DEPENDS = "jsoncpp16 libmts libmts-io"
 
 PR = "r0"
 SRCREV = "${PV}"
-- 
cgit v1.2.3