From ab16ab3d0de4dc9d130ae3db366c38888f1ada5a Mon Sep 17 00:00:00 2001
From: "Jason M. Bills" <jason.m.bills@linux.intel.com>
Date: Mon, 19 Apr 2021 12:13:22 -0700
Subject: Update to internal 0.45

Signed-off-by: Jason M. Bills <jason.m.bills@linux.intel.com>
---
 ...01-enable-cross-compilation-and-pkgconfig.patch | 71 ++++++++++++++++++++++
 .../recipes-support/avro/avro-c++_git.bb           | 22 +++++++
 .../recipes-support/boost/boost_%.bbappend         |  2 +-
 3 files changed, 94 insertions(+), 1 deletion(-)
 create mode 100644 meta-openbmc-mods/meta-common/recipes-support/avro/avro-c++/0001-enable-cross-compilation-and-pkgconfig.patch
 create mode 100644 meta-openbmc-mods/meta-common/recipes-support/avro/avro-c++_git.bb

(limited to 'meta-openbmc-mods/meta-common/recipes-support')

diff --git a/meta-openbmc-mods/meta-common/recipes-support/avro/avro-c++/0001-enable-cross-compilation-and-pkgconfig.patch b/meta-openbmc-mods/meta-common/recipes-support/avro/avro-c++/0001-enable-cross-compilation-and-pkgconfig.patch
new file mode 100644
index 000000000..7355ad5f1
--- /dev/null
+++ b/meta-openbmc-mods/meta-common/recipes-support/avro/avro-c++/0001-enable-cross-compilation-and-pkgconfig.patch
@@ -0,0 +1,71 @@
+diff --git a/lang/c++/CMakeLists.txt b/lang/c++/CMakeLists.txt
+index 28a272b15..06ec38382 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -25,6 +25,7 @@ if (NOT DEFINED CMAKE_CXX_STANDARD)
+ endif()
+ 
+ set(CMAKE_CXX_STANDARD_REQUIRED ON)
++set(PKGCONFIG_SUPPORT ON)
+ 
+ cmake_policy (SET CMP0042 NEW)
+ 
+@@ -107,6 +108,12 @@ set (AVRO_SOURCE_FILES
+         impl/Resolver.cc impl/Validator.cc
+         )
+ 
++if (PKGCONFIG_SUPPORT)
++    install(FILES "avrocpp.pc"
++        DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig")
++      message("${CMAKE_INSTALL_LIBDIR}/pkgconfig")
++endif()
++
+ add_library (avrocpp SHARED ${AVRO_SOURCE_FILES})
+ 
+ set_property (TARGET avrocpp
+@@ -141,6 +148,7 @@ macro (gen file ns)
+     add_custom_target (${file}_hh DEPENDS ${file}.hh)
+ endmacro (gen)
+ 
++if (NOT DEFINED YOCTO_BUILD)
+ gen (empty_record empty)
+ gen (bigrecord testgen)
+ gen (bigrecord_r testgen_r)
+@@ -196,13 +204,16 @@ include (InstallRequiredSystemLibraries)
+ set (CPACK_PACKAGE_FILE_NAME "avrocpp-${AVRO_VERSION_MAJOR}")
+ 
+ include (CPack)
++endif ()
+ 
+ install (TARGETS avrocpp avrocpp_s
+     LIBRARY DESTINATION lib
+     ARCHIVE DESTINATION lib
+     RUNTIME DESTINATION lib)
+ 
++if (NOT DEFINED YOCTO_BUILD)
+ install (TARGETS avrogencpp RUNTIME DESTINATION bin)
++endif ()
+ 
+ install (DIRECTORY api/ DESTINATION include/avro
+     FILES_MATCHING PATTERN *.hh)
+@@ -212,3 +223,4 @@ if (NOT CMAKE_BUILD_TYPE)
+       "Choose the type of build, options are: None Debug Release RelWithDebInfo MinSizeRel."
+       FORCE)
+ endif (NOT CMAKE_BUILD_TYPE)
++
+diff --git a/lang/c++/avrocpp.pc b/lang/c++/avrocpp.pc
+new file mode 100644
+index 000000000..471f1863c
+--- /dev/null
++++ b/avrocpp.pc
+@@ -0,0 +1,10 @@
++prefix=/usr
++libdir=${prefix}/lib
++includedir=${prefix}/include/avro
++
++Name: avrocpp
++Description: C++ bindings for Apache avro
++Version: 1.0.0
++Libs: -L${libdir} -lavrocpp
++Cflags: -I${includedir}
++
diff --git a/meta-openbmc-mods/meta-common/recipes-support/avro/avro-c++_git.bb b/meta-openbmc-mods/meta-common/recipes-support/avro/avro-c++_git.bb
new file mode 100644
index 000000000..af8aad522
--- /dev/null
+++ b/meta-openbmc-mods/meta-common/recipes-support/avro/avro-c++_git.bb
@@ -0,0 +1,22 @@
+SUMMARY = "Apache Avro data serialization system (C++ bindings)"
+HOMEPAGE = "http://apr.apache.org/"
+SECTION = "libs"
+
+LICENSE = "Apache-2.0"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=43abf34d8b9908494f83c55d213a7f89"
+
+DEPENDS = "boost"
+
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+
+BRANCH = "master"
+SRCREV = "f4e2ebaadaf6e6d99b59882233f8024243adb55d"
+SRC_URI = "git://github.com/apache/avro;branch=${BRANCH} \
+	   file://0001-enable-cross-compilation-and-pkgconfig.patch \ 
+          "
+
+S = "${WORKDIR}/git/lang/c++"
+
+EXTRA_OECMAKE = "-DSNAPPY_INCLUDE_DIR='' -DYOCTO_BUILD=ON -DCMAKE_BUILD_TYPE=MinSizeRel"
+inherit cmake
+
diff --git a/meta-openbmc-mods/meta-common/recipes-support/boost/boost_%.bbappend b/meta-openbmc-mods/meta-common/recipes-support/boost/boost_%.bbappend
index 780a12e24..c24249bcf 100644
--- a/meta-openbmc-mods/meta-common/recipes-support/boost/boost_%.bbappend
+++ b/meta-openbmc-mods/meta-common/recipes-support/boost/boost_%.bbappend
@@ -2,6 +2,6 @@ FILES_${PN} += "/usr/lib/libboost_chrono.so* \
                /usr/lib/libboost_context.so* \
                /usr/lib/libboost_thread.so*"
 
-BOOST_LIBS_intel += "iostreams coroutine"
+BOOST_LIBS_intel += "iostreams coroutine filesystem program_options regex system"
 
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-- 
cgit v1.2.3