glm: Upgrade to 0.9.9.6
PATCH v2 1/5 glm: Upgrade to 0.9.9.6
License-Update: Use copying.txt for checksum, no change in licenses as such
Fix type conversion warnings
Upstream conveniently deleted cmake install/uninstall pieces, therefore apply the bandaids as needed see [1]
[1] https://github.com/g-truc/glm/issues/947
---
v2: Fix the cmake install/uninstall removal
...t-float-conversion-warnings-with-cla.patch | 158 ++++++++++++++++++ meta-oe/recipes-graphics/glm/glm/glm.pc.in | 7 + .../glm/glm/glmConfig.cmake.in | 20 +++ .../glm/glm/glmConfigVersion.cmake.in | 31 ++++ .../recipes-graphics/glm/glm/glmTargets.cmake | 107 ++++++++++++ meta-oe/recipes-graphics/glm/glm_0.9.9.5.bb | 23 --- meta-oe/recipes-graphics/glm/glm_0.9.9.6.bb | 39 +++++ 7 files changed, 362 insertions(+), 23 deletions(-) create mode 100644 meta-oe/recipes-graphics/glm/glm/0001-Fix-Wimplicit-int-float-conversion-warnings-with-cla.patch create mode 100644 meta-oe/recipes-graphics/glm/glm/glm.pc.in create mode 100644 meta-oe/recipes-graphics/glm/glm/glmConfig.cmake.in create mode 100644 meta-oe/recipes-graphics/glm/glm/glmConfigVersion.cmake.in create mode 100644 meta-oe/recipes-graphics/glm/glm/glmTargets.cmake delete mode 100644 meta-oe/recipes-graphics/glm/glm_0.9.9.5.bb create mode 100644 meta-oe/recipes-graphics/glm/glm_0.9.9.6.bb
meta-oe/recipes-graphics/glm/glm/0001-Fix-Wimplicit-int-float-conversion-warnings-with-cla.patch new file +158 -0
@@ -0,0 +1,158 @@ +From 461861cd2e34294830b121db834c05ff39424f6f Mon Sep 17 00:00:00 2001 +From: Khem Raj <[email protected]> +Date: Fri, 27 Dec 2019 18:42:51 -0800 +Subject: [PATCH] Fix Wimplicit-int-float-conversion warnings with clang 10+ + +This is a new warning in clang which will be available in clang 10 +onwards + +Fixes +error: implicit conversion from 'const int' to 'float' may lose precision [-Werror,-Wimplicit-int-float-conversion] + +Upstream-Status: Submitted [https://github.com/g-truc/glm/pull/986] +Signed-off-by: Khem Raj <[email protected]> +--- + glm/gtx/scalar_multiplication.hpp | 2 +- + test/gtx/gtx_fast_trigonometry.cpp | 32 +++++++++++++++--------------- + 2 files changed, 17 insertions(+), 17 deletions(-) + +diff --git a/glm/gtx/scalar_multiplication.hpp b/glm/gtx/scalar_multiplication.hpp +index f391f8de..496ba193 100644 +--- a/glm/gtx/scalar_multiplication.hpp ++++ b/glm/gtx/scalar_multiplication.hpp +@@ -54,7 +54,7 @@ namespace glm + template<typename T> \ + return_type_scalar_multiplication<T, Vec> \ + operator/(Vec lh, T const& s){ \ +- return lh *= 1.0f / s; \ ++ return lh *= 1.0f / static_cast<float>(s); \ + } + + GLM_IMPLEMENT_SCAL_MULT(vec2) +diff --git a/test/gtx/gtx_fast_trigonometry.cpp b/test/gtx/gtx_fast_trigonometry.cpp +index f3bf17bf..f3c4e957 100644 +--- a/test/gtx/gtx_fast_trigonometry.cpp ++++ b/test/gtx/gtx_fast_trigonometry.cpp +@@ -239,12 +239,12 @@ namespace taylorCos + std::vector<glm::vec4> Results; + Results.resize(Samples); + +- float Steps = (End - Begin) / Samples; ++ float Steps = (End - Begin) / float(Samples); + + std::clock_t const TimeStampBegin = std::clock(); + + for(std::size_t i = 0; i < Samples; ++i) +- Results[i] = fastCosNew(AngleShift + glm::vec4(Begin + Steps * i)); ++ Results[i] = fastCosNew(AngleShift + glm::vec4(Begin + Steps * float(i))); + + std::clock_t const TimeStampEnd = std::clock(); + +@@ -280,12 +280,12 @@ namespace taylorCos + std::vector<glm::vec4> Results; + Results.resize(Samples); + +- float Steps = (End - Begin) / Samples; ++ float Steps = (End - Begin) / float(Samples); + + std::clock_t const TimeStampBegin = std::clock(); + + for(std::size_t i = 0; i < Samples; ++i) +- Results[i] = taylorCos::fastCosDeterminisctic(AngleShift + glm::vec4(Begin + Steps * i)); ++ Results[i] = taylorCos::fastCosDeterminisctic(AngleShift + glm::vec4(Begin + Steps * float(i))); + + std::clock_t const TimeStampEnd = std::clock(); + +@@ -327,12 +327,12 @@ namespace taylorCos + std::vector<glm::vec4> Results; + Results.resize(Samples); + +- float Steps = (End - Begin) / Samples; ++ float Steps = (End - Begin) / float(Samples); + + std::clock_t const TimeStampBegin = std::clock(); + + for(std::size_t i = 0; i < Samples; ++i) +- Results[i] = taylorCos::fastRefCos(AngleShift + glm::vec4(Begin + Steps * i)); ++ Results[i] = taylorCos::fastRefCos(AngleShift + glm::vec4(Begin + Steps * float(i))); + + std::clock_t const TimeStampEnd = std::clock(); + +@@ -349,12 +349,12 @@ namespace taylorCos + std::vector<glm::vec4> Results; + Results.resize(Samples); + +- float Steps = (End - Begin) / Samples; ++ float Steps = (End - Begin) / float(Samples); + + std::clock_t const TimeStampBegin = std::clock(); + + for(std::size_t i = 0; i < Samples; ++i) +- Results[i] = glm::fastCos(AngleShift + glm::vec4(Begin + Steps * i)); ++ Results[i] = glm::fastCos(AngleShift + glm::vec4(Begin + Steps * float(i))); + + std::clock_t const TimeStampEnd = std::clock(); + +@@ -371,12 +371,12 @@ namespace taylorCos + std::vector<glm::vec4> Results; + Results.resize(Samples); + +- float Steps = (End - Begin) / Samples; ++ float Steps = (End - Begin) / float(Samples); + + std::clock_t const TimeStampBegin = std::clock(); + + for(std::size_t i = 0; i < Samples; ++i) +- Results[i] = glm::cos(AngleShift + glm::vec4(Begin + Steps * i)); ++ Results[i] = glm::cos(AngleShift + glm::vec4(Begin + Steps * float(i))); + + std::clock_t const TimeStampEnd = std::clock(); + +@@ -466,12 +466,12 @@ namespace taylor2 + std::vector<float> Results; + Results.resize(Samples); + +- float Steps = (End - Begin) / Samples; ++ float Steps = (End - Begin) / float(Samples); + + std::clock_t const TimeStampBegin = std::clock(); + + for(std::size_t i = 0; i < Samples; ++i) +- Results[i] = taylorCosA(AngleShift.x + Begin + Steps * i); ++ Results[i] = taylorCosA(AngleShift.x + Begin + Steps * float(i)); + + std::clock_t const TimeStampEnd = std::clock(); + +@@ -488,12 +488,12 @@ namespace taylor2 + std::vector<float> Results; + Results.resize(Samples); + +- float Steps = (End - Begin) / Samples; ++ float Steps = (End - Begin) / float(Samples); + + std::clock_t const TimeStampBegin = std::clock(); + + for(std::size_t i = 0; i < Samples; ++i) +- Results[i] = taylorCosB(AngleShift.x + Begin + Steps * i); ++ Results[i] = taylorCosB(AngleShift.x + Begin + Steps * float(i)); + + std::clock_t const TimeStampEnd = std::clock(); + +@@ -510,12 +510,12 @@ namespace taylor2 + std::vector<float> Results; + Results.resize(Samples); + +- float Steps = (End - Begin) / Samples; ++ float Steps = (End - Begin) / float(Samples); + + std::clock_t const TimeStampBegin = std::clock(); + + for(std::size_t i = 0; i < Samples; ++i) +- Results[i] = taylorCosC(AngleShift.x + Begin + Steps * i); ++ Results[i] = taylorCosC(AngleShift.x + Begin + Steps * float(i)); + + std::clock_t const TimeStampEnd = std::clock(); + +-- +2.24.1 +
meta-oe/recipes-graphics/glm/glm/glm.pc.in new file +7 -0
@@ -0,0 +1,7 @@ +prefix=/usr +includedir=${prefix}/include + +Name: GLM +Description: OpenGL Mathematics +Version: @VERSION@ +Cflags: -I${includedir}
meta-oe/recipes-graphics/glm/glm/glmConfig.cmake.in new file +20 -0
@@ -0,0 +1,20 @@ +set(GLM_VERSION "@VERSION@") + + +####### Expanded from @PACKAGE_INIT@ by configure_package_config_file() ####### +get_filename_component(PACKAGE_PREFIX_DIR "${CMAKE_CURRENT_LIST_DIR}/../../../" ABSOLUTE) + +macro(set_and_check _var _file) + set(${_var} "${_file}") + if(NOT EXISTS "${_file}") + message(FATAL_ERROR "File or directory ${_file} referenced by variable ${_var} does not exist !") + endif() +endmacro() + +#################################################################################### + +set_and_check(GLM_INCLUDE_DIRS "${PACKAGE_PREFIX_DIR}/include") + +if (NOT CMAKE_VERSION VERSION_LESS "3.0") + include("${CMAKE_CURRENT_LIST_DIR}/glmTargets.cmake") +endif()
meta-oe/recipes-graphics/glm/glm/glmConfigVersion.cmake.in new file +31 -0
@@ -0,0 +1,31 @@ +# This is a basic version file for the Config-mode of find_package(). +# It is used by write_basic_package_version_file() as input file for configure_file() +# to create a version-file which can be installed along a config.cmake file. +# +# The created file sets PACKAGE_VERSION_EXACT if the current version string and +# the requested version string are exactly the same and it sets +# PACKAGE_VERSION_COMPATIBLE if the current version is >= requested version. +# The variable CVF_VERSION must be set before calling configure_file(). + +set(PACKAGE_VERSION "@VERSION@") + +if(PACKAGE_VERSION VERSION_LESS PACKAGE_FIND_VERSION) + set(PACKAGE_VERSION_COMPATIBLE FALSE) +else() + set(PACKAGE_VERSION_COMPATIBLE TRUE) + if(PACKAGE_FIND_VERSION STREQUAL PACKAGE_VERSION) + set(PACKAGE_VERSION_EXACT TRUE) + endif() +endif() + +# if the installed or the using project don't have CMAKE_SIZEOF_VOID_P set, ignore it: +if("${CMAKE_SIZEOF_VOID_P}" STREQUAL "" OR "8" STREQUAL "") + return() +endif() + +# check that the installed version has the same 32/64bit-ness as the one which is currently searching: +if(NOT CMAKE_SIZEOF_VOID_P STREQUAL "8") + math(EXPR installedBits "8 * 8") + set(PACKAGE_VERSION "${PACKAGE_VERSION} (${installedBits}bit)") + set(PACKAGE_VERSION_UNSUITABLE FALSE) +endif()
meta-oe/recipes-graphics/glm/glm/glmTargets.cmake new file +107 -0
107 lines not on this page · raw message
meta-oe/recipes-graphics/glm/glm_0.9.9.5.bb deleted +0 -23
@@ -1,23 +0,0 @@ -SUMMARY = "OpenGL Mathematics Library" -DESCRIPTION = "OpenGL Mathematics (GLM) is a header only C++ \ -mathematics library for graphics software based on the OpenGL \ -Shading Language (GLSL) specifications." -HOMEPAGE = "https://glm.g-truc.net" -BUGTRACKER = "https://github.com/g-truc/glm/issues" -SECTION = "libs" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://readme.md;beginline=21;endline=22;md5=3075b5727d36f29edccf97b93e72b790" - -SRC_URI = " \ - git://github.com/g-truc/glm;branch=master \ -" -# v0.9.9.5 -SRCREV = "d162eee1e6f7c317a09229fe6ceab8ec6ab9a4b4" - -S = "${WORKDIR}/git" - -inherit cmake - -RDEPENDS_${PN}-dev = "" - -BBCLASSEXTEND = "native"
meta-oe/recipes-graphics/glm/glm_0.9.9.6.bb new file +39 -0
@@ -0,0 +1,39 @@ +SUMMARY = "OpenGL Mathematics Library" +DESCRIPTION = "OpenGL Mathematics (GLM) is a header only C++ \ +mathematics library for graphics software based on the OpenGL \ +Shading Language (GLSL) specifications." +HOMEPAGE = "https://glm.g-truc.net" +BUGTRACKER = "https://github.com/g-truc/glm/issues" +SECTION = "libs" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://copying.txt;md5=4a735e33f271f57404fda17e80085411" + +SRC_URI = " \ + git://github.com/g-truc/glm;branch=master \ + file://0001-Fix-Wimplicit-int-float-conversion-warnings-with-cla.patch \ + file://glmConfig.cmake.in \ + file://glmConfigVersion.cmake.in \ + file://glm.pc.in \ + file://glmTargets.cmake \ +" +SRCREV = "4db8f89aace8f04c839b606e15b39fb8383ec732" + +S = "${WORKDIR}/git" + +inherit cmake + +do_install() { + install -d ${D}${includedir} ${D}${docdir}/glm ${D}${libdir}/pkgconfig ${D}${libdir}/cmake/glm + cp -R --no-dereference --preserve=mode,links ${S}/glm ${D}${includedir} + cp -R --no-dereference --preserve=mode,links ${S}/doc ${D}${docdir}/glm + rm ${D}${includedir}/glm/CMakeLists.txt + sed "s/@VERSION@/${PV}/" ${WORKDIR}/glmConfigVersion.cmake.in > ${D}${libdir}/cmake/glm/glmConfigVersion.cmake + sed "s/@VERSION@/${PV}/" ${WORKDIR}/glmConfig.cmake.in > ${D}${libdir}/cmake/glm/glmConfig.cmake + sed "s/@VERSION@/${PV}/" ${WORKDIR}/glm.pc.in > ${D}${libdir}/pkgconfig/glm.pc + install -Dm644 ${WORKDIR}/glmTargets.cmake ${D}${libdir}/cmake/glm/glmTargets.cmake + +} + +RDEPENDS_${PN}-dev = "" + +BBCLASSEXTEND = "native"
Signature · 1 line
2.24.1
PATCH 2/5 rocksdb: Upgrade to 6.5.2
Backport an upstream patch to fix build
Delete patches which are either upstreamed or not required
--- ...ake-has-stock-FindZLIB-in-upper-case.patch | 29 ------- ...and-do-not-mark-default-copy-constru.patch | 57 ------------- ...-breakage-from-lock_guard-error-6161.patch | 36 +++++++++ .../rocksdb/files/0001-fix-Issue-5303.patch | 80 ------------------- ...ild-failure-with-Werror-maybe-uninit.patch | 35 -------- meta-oe/recipes-dbs/rocksdb/rocksdb_git.bb | 17 ++-- 6 files changed, 43 insertions(+), 211 deletions(-) delete mode 100644 meta-oe/recipes-dbs/rocksdb/files/0001-CMake-has-stock-FindZLIB-in-upper-case.patch delete mode 100644 meta-oe/recipes-dbs/rocksdb/files/0001-Disable-Wshadow-and-do-not-mark-default-copy-constru.patch create mode 100644 meta-oe/recipes-dbs/rocksdb/files/0001-Fix-build-breakage-from-lock_guard-error-6161.patch delete mode 100644 meta-oe/recipes-dbs/rocksdb/files/0001-fix-Issue-5303.patch delete mode 100644 meta-oe/recipes-dbs/rocksdb/files/0001-utilities-Fix-build-failure-with-Werror-maybe-uninit.patch
meta-oe/recipes-dbs/rocksdb/files/0001-CMake-has-stock-FindZLIB-in-upper-case.patch deleted +0 -29
@@ -1,29 +0,0 @@ -From 38146a5d803a1fb9b10f011aa857872b6f20cd02 Mon Sep 17 00:00:00 2001 -From: Tongliang Liao <[email protected]> -Date: Mon, 29 Apr 2019 03:51:51 -0700 -Subject: [PATCH] CMake has stock FindZLIB in upper case. More details in - https://cmake.org/cmake/help/v3.14/module/FindZLIB.html - - -Upstream-Status: Backport https://github.com/facebook/rocksdb/pull/5261 - ---- - CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 40cdd26bb..355686566 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -92,7 +92,7 @@ else() - endif() - - if(WITH_ZLIB) -- find_package(zlib REQUIRED) -+ find_package(ZLIB REQUIRED) - add_definitions(-DZLIB) - if(ZLIB_INCLUDE_DIRS) - # CMake 3 --- -2.11.0 -
meta-oe/recipes-dbs/rocksdb/files/0001-Disable-Wshadow-and-do-not-mark-default-copy-constru.patch deleted +0 -57
57 lines not on this page · raw message
meta-oe/recipes-dbs/rocksdb/files/0001-Fix-build-breakage-from-lock_guard-error-6161.patch new file +36 -0
@@ -0,0 +1,36 @@ +From b626703de7ece507f360507e49d3ecb448b12e07 Mon Sep 17 00:00:00 2001 +From: Maysam Yabandeh <[email protected]> +Date: Thu, 12 Dec 2019 13:48:50 -0800 +Subject: [PATCH] Fix build breakage from lock_guard error (#6161) + +Summary: +This change fixes a source issue that caused compile time error which breaks build for many fbcode services in that setup. The size() member function of channel is a const member, so member variables accessed within it are implicitly const as well. This caused error when clang fails to resolve to a constructor that takes std::mutex because the suitable constructor got rejected due to loss of constness for its argument. The fix is to add mutable modifier to the lock_ member of channel. +Pull Request resolved: https://github.com/facebook/rocksdb/pull/6161 + +Differential Revision: D18967685 + +Pulled By: maysamyabandeh + +Upstream-Status: Backport + +fbshipit-source-id: 698b6a5153c3c92eeacb842c467aa28cc350d432 +--- + util/channel.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/util/channel.h b/util/channel.h +index 0225482c0..a8a47680a 100644 +--- a/util/channel.h ++++ b/util/channel.h +@@ -60,7 +60,7 @@ class channel { + + private: + std::condition_variable cv_; +- std::mutex lock_; ++ mutable std::mutex lock_; + std::queue<T> buffer_; + bool eof_; + }; +-- +2.24.1 +
meta-oe/recipes-dbs/rocksdb/files/0001-fix-Issue-5303.patch deleted +0 -80
80 lines not on this page · raw message
meta-oe/recipes-dbs/rocksdb/files/0001-utilities-Fix-build-failure-with-Werror-maybe-uninit.patch deleted +0 -35
@@ -1,35 +0,0 @@ -From 8996f075e64da0e6ffeda57632ef31f8710defcc Mon Sep 17 00:00:00 2001 -From: He Zhe <[email protected]> -Date: Fri, 15 Mar 2019 16:47:03 +0800 -Subject: [PATCH] utilities: Fix build failure with -Werror=maybe-uninitialized - -Summary: -Initialize magic_number to zero to avoid such failure. -utilities/blob_db/blob_log_format.cc:91:3: error: 'magic_number' may be used -uninitialized in this function [-Werror=maybe-uninitialized] - if (magic_number != kMagicNumber) { - ^~ - -Upstream-Status: Accepted [expected version 5.19] - -Signed-off-by: He Zhe <[email protected]> ---- - utilities/blob_db/blob_log_format.cc | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/utilities/blob_db/blob_log_format.cc b/utilities/blob_db/blob_log_format.cc -index 2bf7028..8726cb8 100644 ---- a/utilities/blob_db/blob_log_format.cc -+++ b/utilities/blob_db/blob_log_format.cc -@@ -82,7 +82,7 @@ Status BlobLogFooter::DecodeFrom(Slice src) { - uint32_t src_crc = 0; - src_crc = crc32c::Value(src.data(), BlobLogFooter::kSize - sizeof(uint32_t)); - src_crc = crc32c::Mask(src_crc); -- uint32_t magic_number; -+ uint32_t magic_number = 0; - if (!GetFixed32(&src, &magic_number) || !GetFixed64(&src, &blob_count) || - !GetFixed64(&src, &expiration_range.first) || - !GetFixed64(&src, &expiration_range.second) || !GetFixed32(&src, &crc)) { --- -2.7.4 -
meta-oe/recipes-dbs/rocksdb/rocksdb_git.bb +7 -10
@@ -6,15 +6,12 @@ LIC_FILES_CHKSUM = "file://LICENSE.Apache;md5=3b83ef96387f14655fc854ddc3c6bd57 \ file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ file://LICENSE.leveldb;md5=fb04ff57a14f308f2eed4a9b87d45837" -SRCREV = "628a7fd74b5611657106c57f724f1682b114684c" -SRCBRANCH = "6.0.fb" -PV = "6.0.2" +SRCREV = "4cfbd87afd08a16df28436fb990ef6b154ee6114" +SRCBRANCH = "6.5.fb" +PV = "6.5.2" SRC_URI = "git://github.com/facebook/${BPN}.git;branch=${SRCBRANCH} \ - file://0001-CMake-has-stock-FindZLIB-in-upper-case.patch \ - file://0001-Disable-Wshadow-and-do-not-mark-default-copy-constru.patch \ - file://0001-utilities-Fix-build-failure-with-Werror-maybe-uninit.patch \ - file://0001-fix-Issue-5303.patch \ + file://0001-Fix-build-breakage-from-lock_guard-error-6161.patch \ " S = "${WORKDIR}/git"
@@ -22,9 +19,9 @@ S = "${WORKDIR}/git" inherit cmake PACKAGECONFIG ??= "bzip2 zlib lz4 gflags" -PACKAGECONFIG[bzip2] = "-DWITH_BZ2=ON -DBZIP2_LIBRARIES:STRING=bz2,-DWITH_BZ2=OFF,bzip2" -PACKAGECONFIG[lz4] = "-DWITH_LZ4=ON -DLZ4_LIBRARIES:STRING=lz4,-DWITH_LZ4=OFF,lz4" -PACKAGECONFIG[zlib] = "-DWITH_ZLIB=ON -DZLIB_LIBRARY:STRING=z,-DWITH_ZLIB=OFF,zlib" +PACKAGECONFIG[bzip2] = "-DWITH_BZ2=ON,-DWITH_BZ2=OFF,bzip2" +PACKAGECONFIG[lz4] = "-DWITH_LZ4=ON,-DWITH_LZ4=OFF,lz4" +PACKAGECONFIG[zlib] = "-DWITH_ZLIB=ON,-DWITH_ZLIB=OFF,zlib" PACKAGECONFIG[zstd] = "-DWITH_ZSTD=ON,-DWITH_ZSTD=OFF,zstd" PACKAGECONFIG[lite] = "-DROCKSDB_LITE=ON,-DROCKSDB_LITE=OFF" PACKAGECONFIG[gflags] = "-DWITH_GFLAGS=ON,-DWITH_GFLAGS=OFF,gflags"
Signature · 1 line
2.24.1
PATCH 3/5 mariadb: Upgrade to 10.4.11
In reply to Khem RajBackport a rocksdb patch to fix clang error
Refresh existing patches as needed
Switch SRC_URI to downloads.mariadb.org since archive.mariadb.org is too slow if no mirrors are used
---
...e_10.3.18.bb => mariadb-native_10.4.11.bb} | 0
meta-oe/recipes-dbs/mysql/mariadb.inc | 7 ++--
...-breakage-from-lock_guard-error-6161.patch | 32 +++++++++++++++++++
.../mysql/mariadb/fix-arm-atomic.patch | 9 ++----
...{mariadb_10.3.18.bb => mariadb_10.4.11.bb} | 0
5 files changed, 38 insertions(+), 10 deletions(-)
rename meta-oe/recipes-dbs/mysql/{mariadb-native_10.3.18.bb => mariadb-native_10.4.11.bb} (100%)
create mode 100644 meta-oe/recipes-dbs/mysql/mariadb/0001-Fix-build-breakage-from-lock_guard-error-6161.patch
rename meta-oe/recipes-dbs/mysql/{mariadb_10.3.18.bb => mariadb_10.4.11.bb} (100%)meta-oe/recipes-dbs/mysql/mariadb-native_10.4.11.bb renamed from meta-oe/recipes-dbs/mysql/mariadb-native_10.3.18.bb +0 -0
meta-oe/recipes-dbs/mysql/mariadb.inc +4 -3
@@ -4,7 +4,7 @@ SECTION = "libs" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=b1becf0cfa3366e0f4d854d1d264f311" -SRC_URI = "http://archive.mariadb.org/${BP}/source/${BP}.tar.gz \ +SRC_URI = "https://downloads.mariadb.org/interstitial/${BP}/source/${BP}.tar.gz \ file://my.cnf \ file://mysqld.service \ file://install_db.service \
@@ -18,9 +18,10 @@ SRC_URI = "http://archive.mariadb.org/${BP}/source/${BP}.tar.gz \ file://c11_atomics.patch \ file://clang_version_header_conflict.patch \ file://fix-arm-atomic.patch \ + file://0001-Fix-build-breakage-from-lock_guard-error-6161.patch \ " -SRC_URI[md5sum] = "b3524c0825c3a1c255496daea38304a0" -SRC_URI[sha256sum] = "69456ca85bf9d96c6d28b4ade2a9f6787d79a602e27ef941f9ba4e0b55dddedc" +SRC_URI[md5sum] = "d0de881ab8ead46928cafb7d558535c1" +SRC_URI[sha256sum] = "4c076232b99433b09eb3c6d62f607192b3474d022703699b8f6aef4e79de3fb9" UPSTREAM_CHECK_URI = "https://github.com/MariaDB/server/releases"
meta-oe/recipes-dbs/mysql/mariadb/0001-Fix-build-breakage-from-lock_guard-error-6161.patch new file +32 -0
@@ -0,0 +1,32 @@ +Subject: [PATCH] Fix build breakage from lock_guard error (#6161) + +Summary: +This change fixes a source issue that caused compile time error which +breaks build for many fbcode services in that setup. The size() member +function of channel is a const member, so member variables accessed +within it are implicitly const as well. This caused error when clang +fails to resolve to a constructor that takes std::mutex because the +suitable constructor got rejected due to loss of constness for its +argument. The fix is to add mutable modifier to the lock_ member of +channel. + +Pull Request resolved: https://github.com/facebook/rocksdb/pull/6161 + +Differential Revision: D18967685 + +Pulled By: maysamyabandeh + +Upstream-Status: Backport + +fbshipit-source-id:698b6a5153c3c92eeacb842c467aa28cc350d432 +--- a/storage/rocksdb/rocksdb/util/channel.h ++++ b/storage/rocksdb/rocksdb/util/channel.h +@@ -60,7 +60,7 @@ class channel { + + private: + std::condition_variable cv_; +- std::mutex lock_; ++ mutable std::mutex lock_; + std::queue<T> buffer_; + bool eof_; + };
meta-oe/recipes-dbs/mysql/mariadb/fix-arm-atomic.patch +2 -7
@@ -15,11 +15,9 @@ Signed-off-by: Mingli Yu <[email protected]> storage/rocksdb/build_rocksdb.cmake | 3 +++ 1 file changed, 3 insertions(+) -diff --git a/storage/rocksdb/build_rocksdb.cmake b/storage/rocksdb/build_rocksdb.cmake -index c36c761..2b539ff 100644 --- a/storage/rocksdb/build_rocksdb.cmake +++ b/storage/rocksdb/build_rocksdb.cmake -@@ -424,6 +424,9 @@ list(APPEND SOURCES ${CMAKE_CURRENT_BINARY_DIR}/build_version.cc) +@@ -470,6 +470,9 @@ list(APPEND SOURCES ${CMAKE_CURRENT_BINA ADD_CONVENIENCE_LIBRARY(rocksdblib ${SOURCES}) target_link_libraries(rocksdblib ${THIRDPARTY_LIBS} ${SYSTEM_LIBS})
@@ -27,8 +25,5 @@ index c36c761..2b539ff 100644 + TARGET_LINK_LIBRARIES(rocksdblib atomic) +ENDIF() IF(CMAKE_CXX_COMPILER_ID MATCHES "GNU" OR CMAKE_CXX_COMPILER_ID MATCHES "Clang") - set_target_properties(rocksdblib PROPERTIES COMPILE_FLAGS "-fPIC -fno-builtin-memcmp -frtti") + set_target_properties(rocksdblib PROPERTIES COMPILE_FLAGS "-fPIC -fno-builtin-memcmp") endif() --- -2.17.1 -
meta-oe/recipes-dbs/mysql/mariadb_10.4.11.bb renamed from meta-oe/recipes-dbs/mysql/mariadb_10.3.18.bb +0 -0
Signature · 1 line
2.24.1
PATCH 4/5 ruli: Fix implicit conversion from 'unsigned int' to 'float'
In reply to Khem Raj--- .../ruli/files/float-conversion.patch | 19 +++++++++++++++++++ .../recipes-support/ruli/ruli_0.36.bb | 1 + 2 files changed, 20 insertions(+) create mode 100644 meta-networking/recipes-support/ruli/files/float-conversion.patch
meta-networking/recipes-support/ruli/files/float-conversion.patch new file +19 -0
@@ -0,0 +1,19 @@ +clarify type conversion + +fixes +| ruli_rand.c:54:47: error: implicit conversion from 'unsigned int' to 'float' changes value from 4294967295 to 4294967296 [-Werror,-Wimplicit-int-float-conversion] +| + +Upstream-Status: Pending +Signed-off-by: Khem Raj <[email protected]> +--- a/src/ruli_rand.c ++++ b/src/ruli_rand.c +@@ -51,7 +51,7 @@ int ruli_rand_next(ruli_rand_t *rand_ctx + + u = isaac_rand(&rand_ctx->isaac_ctx); + +- r = (int) ((float) (1.0 + max - min) * u / ISAAC_UB4MAXVAL + min); ++ r = (int) ((float) (1.0 + max - min) * u / (float) (ISAAC_UB4MAXVAL + min)); + + assert(min <= r); + assert(r <= max);
meta-networking/recipes-support/ruli/ruli_0.36.bb +1 -0
@@ -12,6 +12,7 @@ SRC_URI = "http://download.savannah.gnu.org/releases/ruli/ruli_${PV}.orig.tar.gz file://0001-src-ruli_addr.c-Add-missing-format-string.patch \ file://0001-ruli_srv-Mark-prev_addr_list_size-as-unused.patch \ file://0001-Make-space-for-flags-from-environment.patch \ + file://float-conversion.patch \ " SRC_URI[md5sum] = "e73fbfdeadddb68a703a70cea5271468"
Signature · 1 line
2.24.1
PATCH v2 5/5 fluentbit: Upgrade to 1.3.5
In reply to Khem RajSync recipe with the one in sourcecode
Record Accessor feature requires Flex and Bison
fts dependency is needed on musl
Delete cmake_multilib.patch its fixed upstream
---
v2: Do not make it systemd-only
.../fluentbit/fluentbit/cmake_multilib.patch | 18 ------- .../cross-build-init-system-detection.patch | 38 +++++++++++++ .../fluentbit/fluentbit/jemalloc.patch | 16 +++--- .../fluentbit/fluentbit_0.12.19.bb | 30 ----------- .../fluentbit/fluentbit_1.3.5.bb | 54 +++++++++++++++++++ 5 files changed, 99 insertions(+), 57 deletions(-) delete mode 100644 meta-oe/recipes-extended/fluentbit/fluentbit/cmake_multilib.patch create mode 100644 meta-oe/recipes-extended/fluentbit/fluentbit/cross-build-init-system-detection.patch delete mode 100644 meta-oe/recipes-extended/fluentbit/fluentbit_0.12.19.bb create mode 100644 meta-oe/recipes-extended/fluentbit/fluentbit_1.3.5.bb
meta-oe/recipes-extended/fluentbit/fluentbit/cmake_multilib.patch deleted +0 -18
@@ -1,18 +0,0 @@ -Use CMAKE_INSTALL_LIBDIR instead of hardcoding lib path - -Helps build on platforms where libpaths are not lib/ but say lib64/ - -Upstream-Status: Pending -Signed-off-by: Khem Raj <[email protected]> - ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -182,7 +182,7 @@ if(NOT FLB_WITHOUT_SHARED_LIB) - PROPERTIES OUTPUT_NAME fluent-bit) - - # Library install routines -- install(TARGETS fluent-bit-shared LIBRARY DESTINATION lib) -+ install(TARGETS fluent-bit-shared LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) - endif() - - # Static Library
meta-oe/recipes-extended/fluentbit/fluentbit/cross-build-init-system-detection.patch new file +38 -0
@@ -0,0 +1,38 @@ +Define CMake variables to indicate init system for target +incase of cross compile, detecting systemd support based on +host directory structure is not right thing to do + +Upstream-Status: Pending +Signed-off-by: Khem Raj <[email protected]> + +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -317,7 +317,7 @@ if(FLB_BINARY) + install(TARGETS fluent-bit-bin RUNTIME DESTINATION ${FLB_INSTALL_BINDIR}) + + # Detect init system, install upstart, systemd or init.d script +- if(IS_DIRECTORY /lib/systemd/system) ++ if(IS_DIRECTORY /lib/systemd/system OR FLB_SYSTEMD) + set(FLB_SYSTEMD_SCRIPT "${PROJECT_SOURCE_DIR}/init/${FLB_OUT_NAME}.service") + configure_file( + "${PROJECT_SOURCE_DIR}/init/systemd.in" +@@ -325,7 +325,7 @@ if(FLB_BINARY) + ) + install(FILES ${FLB_SYSTEMD_SCRIPT} DESTINATION /lib/systemd/system) + install(DIRECTORY DESTINATION ${FLB_INSTALL_CONFDIR}) +- elseif(IS_DIRECTORY /usr/share/upstart) ++ elseif(IS_DIRECTORY /usr/share/upstart OR FLB_UPSTART) + set(FLB_UPSTART_SCRIPT "${PROJECT_SOURCE_DIR}/init/${FLB_OUT_NAME}.conf") + configure_file( + "${PROJECT_SOURCE_DIR}/init/upstart.in" +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -70,6 +70,8 @@ option(FLB_RECORD_ACCESSOR "Enable re + option(FLB_SYSTEM_STRPTIME "Use strptime in system libc" Yes) + option(FLB_STATIC_CONF "Build binary using static configuration") + option(FLB_STREAM_PROCESSOR "Enable Stream Processor" Yes) ++option(FLB_SYSTEMD "Enable systemd init system" No) ++option(FLB_UPSTART "Enable upstart init system" No) + option(FLB_CORO_STACK_SIZE "Set coroutine stack size") + + # Metrics: Experimental Feature, disabled by default on 0.12 series
meta-oe/recipes-extended/fluentbit/fluentbit/jemalloc.patch +7 -9
@@ -3,16 +3,14 @@ Add --with-jemalloc-prefix=je_ so it compiles on musl Signed-off-by: Khem Raj <[email protected]> Upstream-Status: Pending -Index: fluent-bit-0.12.1/CMakeLists.txt -=================================================================== ---- fluent-bit-0.12.1.orig/CMakeLists.txt -+++ fluent-bit-0.12.1/CMakeLists.txt -@@ -325,7 +325,7 @@ if(FLB_JEMALLOC AND ${CMAKE_SYSTEM_NAME} +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -523,7 +523,7 @@ if(FLB_JEMALLOC AND ${CMAKE_SYSTEM_NAME} # Link to Jemalloc as an external dependency ExternalProject_Add(jemalloc - SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/lib/jemalloc -- CONFIGURE_COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/lib/jemalloc/configure ${AUTOCONF_HOST_OPT} --with-lg-quantum=3 --enable-cc-silence --prefix=<INSTALL_DIR> -+ CONFIGURE_COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/lib/jemalloc/configure --with-jemalloc-prefix=je_ ${AUTOCONF_HOST_OPT} --with-lg-quantum=3 --enable-cc-silence --prefix=<INSTALL_DIR> + SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/lib/jemalloc-5.2.1 +- CONFIGURE_COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/lib/jemalloc-5.2.1/configure ${AUTOCONF_HOST_OPT} --with-lg-quantum=3 --enable-cc-silence --prefix=<INSTALL_DIR> ++ CONFIGURE_COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/lib/jemalloc-5.2.1/configure ${AUTOCONF_HOST_OPT} --with-jemalloc-prefix=je_ --with-lg-quantum=3 --enable-cc-silence --prefix=<INSTALL_DIR> CFLAGS=-std=gnu99\ -Wall\ -pipe\ -g3\ -O3\ -funroll-loops - BUILD_COMMAND ${MAKE} + BUILD_COMMAND $(MAKE) INSTALL_DIR ${CMAKE_CURRENT_BINARY_DIR}/
meta-oe/recipes-extended/fluentbit/fluentbit_0.12.19.bb deleted +0 -30
@@ -1,30 +0,0 @@ -SUMMARY = "Fast data collector for Embedded Linux" -HOMEPAGE = "http://fluentbit.io" -BUGTRACKER = "https://github.com/fluent/fluent-bit/issues" - -SRC_URI = "http://fluentbit.io/releases/0.12/fluent-bit-${PV}.tar.gz \ - file://jemalloc.patch \ - file://cmake_multilib.patch \ - " -SRC_URI[md5sum] = "7c8708312ac9122faacf9e2a4751eb34" -SRC_URI[sha256sum] = "23a81087edf0e2c6f2d49411c6a82308afc5224f67bbaa45729c057af62e9241" - -S = "${WORKDIR}/fluent-bit-${PV}" - -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=2ee41112a44fe7014dce33e26468ba93" - -DEPENDS = "zlib" -INSANE_SKIP_${PN}-dev += "dev-elf" - -inherit cmake systemd - -EXTRA_OECMAKE = "-DGNU_HOST=${HOST_SYS} -DFLB_ALL=ON -DFLB_TD=1" - -# With Ninja it fails with: -# ninja: error: build.ninja:134: bad $-escape (literal $ must be written as $$) -OECMAKE_GENERATOR = "Unix Makefiles" - -SYSTEMD_SERVICE_${PN} = "td-agent-bit.service" - -TARGET_CC_ARCH_append = " ${SELECTED_OPTIMIZATION}"
meta-oe/recipes-extended/fluentbit/fluentbit_1.3.5.bb new file +54 -0
54 lines not on this page · raw message
Signature · 1 line
2.24.1