@@ -790,6 +790,9 @@ F: package/pangomm/
F: package/rpm/
F: package/yad/
+N: Jan Heylen <jan.heylen@nokia.com>
+F: package/opentracing-cpp/
+
N: Jan Kraval <jan.kraval@gmail.com>
F: board/orangepi/orangepi-lite
F: configs/orangepi_lite_defconfig
@@ -1288,6 +1288,7 @@ menu "Logging"
source "package/log4cplus/Config.in"
source "package/log4cpp/Config.in"
source "package/log4cxx/Config.in"
+ source "package/opentracing-cpp/Config.in"
source "package/zlog/Config.in"
endmenu
new file mode 100644
@@ -0,0 +1,74 @@
+From 9462847f23a25524fdc2112cbc8de3f2c02a1669 Mon Sep 17 00:00:00 2001
+From: Jan Heylen <jan.heylen@nokia.com>
+Date: Fri, 22 Dec 2017 22:04:29 +0100
+Subject: [PATCH] CMake: make shared/static target a configurable option
+
+Signed-off-by: Jan Heylen <jan.heylen@nokia.com>
+---
+ CMakeLists.txt | 40 ++++++++++++++++++++++++++++------------
+ 1 file changed, 28 insertions(+), 12 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index aadf2f9..d03bd00 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -70,18 +70,36 @@ endif()
+ include_directories(include)
+ include_directories(SYSTEM 3rd_party/include)
+
++option(BUILD_SHARED_LIBS "Build as a shared library" ON)
++option(BUILD_STATIC_LIBS "Build as a static library" ON)
++
++if (NOT BUILD_SHARED_LIBS AND NOT BUILD_STATIC_LIBS)
++ message(FATAL_ERROR "One or both of BUILD_SHARED_LIBS or BUILD_STATIC_LIBS must be set to ON to build")
++endif()
++
+ set(SRCS src/propagation.cpp src/noop.cpp src/tracer.cpp)
+-add_library(opentracing SHARED ${SRCS})
+-target_include_directories(opentracing INTERFACE "$<INSTALL_INTERFACE:include/>")
+-set_target_properties(opentracing PROPERTIES VERSION ${OPENTRACING_VERSION_STRING}
++
++if (BUILD_SHARED_LIBS)
++ add_library(opentracing SHARED ${SRCS})
++ target_include_directories(opentracing INTERFACE "$<INSTALL_INTERFACE:include/>")
++ set_target_properties(opentracing PROPERTIES VERSION ${OPENTRACING_VERSION_STRING}
+ SOVERSION ${OPENTRACING_VERSION_MAJOR})
+-add_library(opentracing-static STATIC ${SRCS})
+-set_target_properties(opentracing-static PROPERTIES OUTPUT_NAME opentracing)
+-target_include_directories(opentracing-static INTERFACE "$<INSTALL_INTERFACE:include/>")
+-if (CLANG_TIDY_EXE)
+- set_target_properties(opentracing PROPERTIES
++ install(TARGETS opentracing EXPORT OpenTracingTargets
++ LIBRARY DESTINATION lib
++ ARCHIVE DESTINATION lib)
++ if (CLANG_TIDY_EXE)
++ set_target_properties(opentracing PROPERTIES
+ CXX_CLANG_TIDY "${DO_CLANG_TIDY}")
+-endif()
++ endif()
++endif(BUILD_SHARED_LIBS)
++
++if (BUILD_STATIC_LIBS)
++ add_library(opentracing-static STATIC ${SRCS})
++ set_target_properties(opentracing-static PROPERTIES OUTPUT_NAME opentracing)
++ target_include_directories(opentracing-static INTERFACE "$<INSTALL_INTERFACE:include/>")
++ install(TARGETS opentracing-static EXPORT OpenTracingTargets
++ ARCHIVE DESTINATION lib)
++endif(BUILD_STATIC_LIBS)
+
+
+ install(DIRECTORY 3rd_party/include/opentracing DESTINATION include
+@@ -89,9 +107,7 @@ install(DIRECTORY 3rd_party/include/opentracing DESTINATION include
+ PATTERN "*.h")
+ install(DIRECTORY include/opentracing DESTINATION include
+ FILES_MATCHING PATTERN "*.h")
+-install(TARGETS opentracing opentracing-static EXPORT OpenTracingTargets
+- LIBRARY DESTINATION lib
+- ARCHIVE DESTINATION lib)
++
+
+ # ==============================================================================
+ # Package configuration setup
+--
+2.7.4
+
new file mode 100644
@@ -0,0 +1,16 @@
+config BR2_PACKAGE_OPENTRACING_CPP
+ bool "opentracing-cpp"
+ depends on BR2_INSTALL_LIBSTDCPP
+ depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # C++11
+ depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # exception_ptr
+ depends on !BR2_m68k_cf # exception_ptr
+ help
+ OpenTracing API for C++
+
+ http://opentracing.io
+
+comment "opentracing-cpp needs a toolchain w/ C++11"
+ depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8
+
+comment "opentracing-cpp needs exception_ptr"
+ depends on BR2_TOOLCHAIN_HAS_GCC_BUG_64735 || BR2_m68k_cf
new file mode 100644
@@ -0,0 +1,3 @@
+# Locally calculated
+sha256 c77041cb2f147ac81b2b0702abfced5565a9cebc318d045c060a4c3e074009ee opentracing-cpp-v1.2.0.tar.gz
+sha256 b80bffcfee825a69645f7ca97ddba48714031ea5c845198d184714d5490798b6 COPYING
new file mode 100644
@@ -0,0 +1,14 @@
+################################################################################
+#
+# opentracing-cpp
+#
+################################################################################
+
+OPENTRACING_CPP_VERSION = v1.2.0
+OPENTRACING_CPP_SITE = $(call github,opentracing,opentracing-cpp,$(OPENTRACING_CPP_VERSION))
+OPENTRACING_CPP_LICENSE = MIT
+OPENTRACING_CPP_LICENSE_FILES = COPYING
+
+OPENTRACING_CPP_INSTALL_STAGING = YES
+
+$(eval $(cmake-package))