From patchwork Sun Dec 29 18:25:40 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 182580 Delivered-To: patch@linaro.org Received: by 2002:a92:815a:0:0:0:0:0 with SMTP id e87csp5493139ild; Sun, 29 Dec 2019 10:25:57 -0800 (PST) X-Google-Smtp-Source: APXvYqxgYKX5uc8n9O0wHdNdp51j2hXBrKnqCrjHe/eBzkqPFWnG4mvv6y5LwF/8ZXru8Y/UKnzo X-Received: by 2002:a17:902:264:: with SMTP id 91mr12202900plc.271.1577643957363; Sun, 29 Dec 2019 10:25:57 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1577643957; cv=none; d=google.com; s=arc-20160816; b=qlp+AVnm0CK86GHKGOJTBfPtHkaikaXVoTQBnbedD7j2WkWTaDs57R2rWHX8uhpgrg brqJynu/sVPA0kl8/VwcduyD9kI5fAQ1Zm45l6Sd/Z3N4QsZXAbgOxbyzMmVRZjl6o0P /gG+jQK5ibegZwgCzCo9TdC3wZx6yKH7jsFZaYfCBuFDUFdexv0HnRdN3xr2voZWGmeb 3xoQef7vBtVuJnyh90SFDaKKq3ejj4ttbCg1CLMa9OVhQIUaG6dkfYtim9tv7lur63wP qwGx1XFp9/V843RefxIDAPPZMBvyINor243H22M7n7nHpLxZHADXuosoyh1/R12U5oa4 Xtmw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:list-subscribe:list-help :list-post:list-archive:list-unsubscribe:list-id:precedence:subject :mime-version:message-id:date:to:from:dkim-signature:delivered-to; bh=qPytKMVhyINfRKSLJ2tN63+EBEz4GwFilssqy4+c8d4=; b=XiQgmEDugvZ8zguU45Dq49h4j41pUhz9993nwag6Qnj2u2WACLzUcecQgMaIt9MHYK wihnP9XHKJ2ByhdQUBC7uY2FC/PslkZ9rVr1mk4wA8BbVImHnsGvh/H9/OO9qvzQh6+i xX3G3LHKpjb6ivvuOkFsNsY8ZMze8ZXLhrR7hh0QmT91S6Gj/BxQFmZf0x7+9ot4M1Fo SL965a0uzOpoJxIbJtkH7rTwzuBtS/i4CPwqGyHaXvMhZoePO5yu8qFh97GZvu6USV7q 9qiEly3u8QERzuyPTb2+Ji38vRn3Kvg3SN2DoJMUgi9pE9wbkrgibi2WAfNNyzCtueJa xHMA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b="AVbrRC+/"; spf=pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-devel-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id s142si36766170pgs.227.2019.12.29.10.25.56; Sun, 29 Dec 2019 10:25:57 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b="AVbrRC+/"; spf=pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-devel-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from ec2-34-214-78-129.us-west-2.compute.amazonaws.com (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 0D9E07F823; Sun, 29 Dec 2019 18:25:51 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-pj1-f48.google.com (mail-pj1-f48.google.com [209.85.216.48]) by mail.openembedded.org (Postfix) with ESMTP id E16F47F7E4 for ; Sun, 29 Dec 2019 18:25:49 +0000 (UTC) Received: by mail-pj1-f48.google.com with SMTP id n96so6935900pjc.3 for ; Sun, 29 Dec 2019 10:25:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=ZanRSj8LG8uCOYnz0mLwudpJj7KhfBAGX2d0nNdUnNI=; b=AVbrRC+/wSUX9smLkgYOQFj/xErF7sO/VSmZ8nwDMY9uyWqvzTu1kZE63MlBG+GBah XcPm+X5I0O3xdciPuZo2j5zO5Cmmumtkd/+kU4VbJxleIvFMnVt1acgdcjKfwRDUbeBX 4FTfdDNeAtapOYV9Rz+JWHxYPseIbx1ken2Cp+3JsKxdeBb6oa4UJC1qK2/JM2Xfmlvc xnVIiPMr5940Q0zHqvrMSoa82GgjZBRYabzUQHV1UBU6qoCQGG+M8g4VMfjktC4d41f1 Fzeq5RVOQVdevfxuwJ9aRNr8qImqgQ2RqzJeYJvZUF3qwdObBe/TBgF7oKI1lWPFVElV 8Ygg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=ZanRSj8LG8uCOYnz0mLwudpJj7KhfBAGX2d0nNdUnNI=; b=j2F9camu5LLKOiFwisM4t+4tCNIEQhaA8CaehpVxFDukiGpmCilAybuRVSTgHOinQl XRXBSjGeR48tmkr5TrjVizKf7SJVPPW1aFGSxRILOi2SrS+Eu7WS8IkumZcJ+Q50d9fX rhBiZmptlDkyxFmiMQO3roTeUJEqds77Qp6ecssgWsWIzFm4hX21rOMWqa6eA9a9vxA5 q79SsPq9AiuucvFUz4eVuZ28g3I0HPZy1fa1i4sh6Bnlt+lw4YI2q39VdeQG0W1/1HQ1 J16XL5SX2b5m9Mt+TU2Afphm/AXsL8HLDAOeg+O/Jnr8m0w6lnwDzqOdpAKfYzKmPwoY M1EQ== X-Gm-Message-State: APjAAAXJDk95GPmaFaEn4MtB8LcU9avPIiWycZKhdlnTgdDeIAaLzR84 j463fhzM3K0b5Vl1ZyEm3cDV1KBr4E0= X-Received: by 2002:a17:902:9b86:: with SMTP id y6mr60156298plp.253.1577643950311; Sun, 29 Dec 2019 10:25:50 -0800 (PST) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9200:4e0::2f83]) by smtp.gmail.com with ESMTPSA id gc1sm21395010pjb.20.2019.12.29.10.25.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 29 Dec 2019 10:25:49 -0800 (PST) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Sun, 29 Dec 2019 10:25:40 -0800 Message-Id: <20191229182544.16104-1-raj.khem@gmail.com> X-Mailer: git-send-email 2.24.1 MIME-Version: 1.0 Subject: [oe] [meta-oe][PATCH v2 1/5] glm: Upgrade to 0.9.9.6 X-BeenThere: openembedded-devel@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Using the OpenEmbedded metadata to build Distributions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: openembedded-devel-bounces@lists.openembedded.org Errors-To: openembedded-devel-bounces@lists.openembedded.org 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 Signed-off-by: Khem Raj --- 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 -- 2.24.1 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-oe/recipes-graphics/glm/glm/0001-Fix-Wimplicit-int-float-conversion-warnings-with-cla.patch b/meta-oe/recipes-graphics/glm/glm/0001-Fix-Wimplicit-int-float-conversion-warnings-with-cla.patch new file mode 100644 index 0000000000..2eb50a5a3a --- /dev/null +++ b/meta-oe/recipes-graphics/glm/glm/0001-Fix-Wimplicit-int-float-conversion-warnings-with-cla.patch @@ -0,0 +1,158 @@ +From 461861cd2e34294830b121db834c05ff39424f6f Mon Sep 17 00:00:00 2001 +From: Khem Raj +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 +--- + 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 \ + return_type_scalar_multiplication \ + operator/(Vec lh, T const& s){ \ +- return lh *= 1.0f / s; \ ++ return lh *= 1.0f / static_cast(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 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 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 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 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 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 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 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 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 + diff --git a/meta-oe/recipes-graphics/glm/glm/glm.pc.in b/meta-oe/recipes-graphics/glm/glm/glm.pc.in new file mode 100644 index 0000000000..54052e287d --- /dev/null +++ b/meta-oe/recipes-graphics/glm/glm/glm.pc.in @@ -0,0 +1,7 @@ +prefix=/usr +includedir=${prefix}/include + +Name: GLM +Description: OpenGL Mathematics +Version: @VERSION@ +Cflags: -I${includedir} diff --git a/meta-oe/recipes-graphics/glm/glm/glmConfig.cmake.in b/meta-oe/recipes-graphics/glm/glm/glmConfig.cmake.in new file mode 100644 index 0000000000..8ab23a18d7 --- /dev/null +++ b/meta-oe/recipes-graphics/glm/glm/glmConfig.cmake.in @@ -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() diff --git a/meta-oe/recipes-graphics/glm/glm/glmConfigVersion.cmake.in b/meta-oe/recipes-graphics/glm/glm/glmConfigVersion.cmake.in new file mode 100644 index 0000000000..561a0db61f --- /dev/null +++ b/meta-oe/recipes-graphics/glm/glm/glmConfigVersion.cmake.in @@ -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() diff --git a/meta-oe/recipes-graphics/glm/glm/glmTargets.cmake b/meta-oe/recipes-graphics/glm/glm/glmTargets.cmake new file mode 100644 index 0000000000..905b67731b --- /dev/null +++ b/meta-oe/recipes-graphics/glm/glm/glmTargets.cmake @@ -0,0 +1,107 @@ +# Generated by CMake + +if("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" LESS 2.5) + message(FATAL_ERROR "CMake >= 2.6.0 required") +endif() +cmake_policy(PUSH) +cmake_policy(VERSION 2.6) +#---------------------------------------------------------------- +# Generated CMake target import file. +#---------------------------------------------------------------- + +# Commands may need to know the format version. +set(CMAKE_IMPORT_FILE_VERSION 1) + +# Protect against multiple inclusion, which would fail when already imported targets are added once more. +set(_targetsDefined) +set(_targetsNotDefined) +set(_expectedTargets) +foreach(_expectedTarget glm) + list(APPEND _expectedTargets ${_expectedTarget}) + if(NOT TARGET ${_expectedTarget}) + list(APPEND _targetsNotDefined ${_expectedTarget}) + endif() + if(TARGET ${_expectedTarget}) + list(APPEND _targetsDefined ${_expectedTarget}) + endif() +endforeach() +if("${_targetsDefined}" STREQUAL "${_expectedTargets}") + unset(_targetsDefined) + unset(_targetsNotDefined) + unset(_expectedTargets) + set(CMAKE_IMPORT_FILE_VERSION) + cmake_policy(POP) + return() +endif() +if(NOT "${_targetsDefined}" STREQUAL "") + message(FATAL_ERROR "Some (but not all) targets in this export set were already defined.\nTargets Defined: ${_targetsDefined}\nTargets not yet defined: ${_targetsNotDefined}\n") +endif() +unset(_targetsDefined) +unset(_targetsNotDefined) +unset(_expectedTargets) + + +# Compute the installation prefix relative to this file. +get_filename_component(_IMPORT_PREFIX "${CMAKE_CURRENT_LIST_FILE}" PATH) +# Use original install prefix when loaded through a +# cross-prefix symbolic link such as /lib -> /usr/lib. +get_filename_component(_realCurr "${_IMPORT_PREFIX}" REALPATH) +get_filename_component(_realOrig "/usr/lib/cmake/glm" REALPATH) +if(_realCurr STREQUAL _realOrig) + set(_IMPORT_PREFIX "/usr/lib/cmake/glm") +endif() +unset(_realOrig) +unset(_realCurr) +get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH) +get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH) +get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH) +if(_IMPORT_PREFIX STREQUAL "/") + set(_IMPORT_PREFIX "") +endif() + +# Create imported target glm +add_library(glm INTERFACE IMPORTED) + +set_target_properties(glm PROPERTIES + INTERFACE_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/include" +) + +if(CMAKE_VERSION VERSION_LESS 3.0.0) + message(FATAL_ERROR "This file relies on consumers using CMake 3.0.0 or greater.") +endif() + +# Load information for each installed configuration. +get_filename_component(_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH) +file(GLOB CONFIG_FILES "${_DIR}/glmTargets-*.cmake") +foreach(f ${CONFIG_FILES}) + include(${f}) +endforeach() + +# Cleanup temporary variables. +set(_IMPORT_PREFIX) + +# Loop over all imported files and verify that they actually exist +foreach(target ${_IMPORT_CHECK_TARGETS} ) + foreach(file ${_IMPORT_CHECK_FILES_FOR_${target}} ) + if(NOT EXISTS "${file}" ) + message(FATAL_ERROR "The imported target \"${target}\" references the file + \"${file}\" +but this file does not exist. Possible reasons include: +* The file was deleted, renamed, or moved to another location. +* An install or uninstall procedure did not complete successfully. +* The installation package was faulty and contained + \"${CMAKE_CURRENT_LIST_FILE}\" +but not all the files it references. +") + endif() + endforeach() + unset(_IMPORT_CHECK_FILES_FOR_${target}) +endforeach() +unset(_IMPORT_CHECK_TARGETS) + +# This file does not depend on other imported targets which have +# been exported from the same project but in a separate export set. + +# Commands beyond this point should not need to know the version. +set(CMAKE_IMPORT_FILE_VERSION) +cmake_policy(POP) diff --git a/meta-oe/recipes-graphics/glm/glm_0.9.9.5.bb b/meta-oe/recipes-graphics/glm/glm_0.9.9.5.bb deleted file mode 100644 index f367e4eae0..0000000000 --- a/meta-oe/recipes-graphics/glm/glm_0.9.9.5.bb +++ /dev/null @@ -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" diff --git a/meta-oe/recipes-graphics/glm/glm_0.9.9.6.bb b/meta-oe/recipes-graphics/glm/glm_0.9.9.6.bb new file mode 100644 index 0000000000..e2f4dbebc5 --- /dev/null +++ b/meta-oe/recipes-graphics/glm/glm_0.9.9.6.bb @@ -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" From patchwork Sun Dec 29 18:25:41 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 182581 Delivered-To: patch@linaro.org Received: by 2002:a92:815a:0:0:0:0:0 with SMTP id e87csp5493317ild; Sun, 29 Dec 2019 10:26:12 -0800 (PST) X-Google-Smtp-Source: APXvYqwrQKknUI/v9cAz66qR0Wb8pKqLWCShaly0uR4p4JVeo+25q/RAAeZ6xsT+enJfsdPG8p0r X-Received: by 2002:a17:90a:fa82:: with SMTP id cu2mr41486536pjb.109.1577643972099; Sun, 29 Dec 2019 10:26:12 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1577643972; cv=none; d=google.com; s=arc-20160816; b=UCck1PiNBg95fZnXvu3/bZ5fHU/h5p1jmo+SvepWsm/IHMj8CdNaKGbNkpL1/kgMmV L6O+FyJZLONfsREVT9KpiVUzefhPYcTyn30uOHFsPTOA9a9OqgjquR1mYmAE0pLXJG8G nQMFDVbgWg3WDbAWmWErGGDTZx4ci6rdtBjB5GFBg+ocKncMT3tbkQZUMWsZhKI4YnRg JelaejfRgIqvlz36MOB5x6TvxNaAgTLfQs3VIvzcO55ZEF9TkZork/nLgt+meo7NFnVC 4fJMoZxn+WGfh6W5o+OMn2Dj1wYXSk72n/xEISq935YnOiXfAa7fLl8UdRVqynFwMPub 3nkg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:list-subscribe:list-help :list-post:list-archive:list-unsubscribe:list-id:precedence:subject :mime-version:references:in-reply-to:message-id:date:to:from :dkim-signature:delivered-to; bh=8Oh3kMvu8VbB95DqqN6nzQfu6oA3eFi838rxRYXtmzU=; b=w8c54v3WcqBLnPei/y6fAEY7REGEoMhzqHLFmup/X7wv9R0Q/q3Czvfhoy8ZHKaMNG lMbTTg4tNn1CyRrUmHLnOOm3oboa89WMXHt9PZTSWhcRJrKweb9Xw8USvxlsKj0mhpQc yVpM14dQ0r/PI+6S0umeWc90TjjhBgLrpM5x78HwgJjgwaWDbNzExnrjrnh6GoVRufG8 vrQN4p6RGr625PTkZ/y2hwJFYsXMaYMlsSXgvrhA8YGrVtYVt1vlwMi507u1CWl8E2wC bxLaFK961k0TaLWcquplJFMu9Q1NxwRCGavPcZPK5+QKyttfTvs5Xnc3uabxl0mGx1o4 A9ww== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=cG+AKM07; spf=pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-devel-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id dw9si20055751pjb.0.2019.12.29.10.26.11; Sun, 29 Dec 2019 10:26:12 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=cG+AKM07; spf=pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-devel-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from ec2-34-214-78-129.us-west-2.compute.amazonaws.com (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id C6C0E7F822; Sun, 29 Dec 2019 18:26:08 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-pf1-f177.google.com (mail-pf1-f177.google.com [209.85.210.177]) by mail.openembedded.org (Postfix) with ESMTP id 63CC27F7E4 for ; Sun, 29 Dec 2019 18:25:50 +0000 (UTC) Received: by mail-pf1-f177.google.com with SMTP id x6so16159650pfo.10 for ; Sun, 29 Dec 2019 10:25:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=qfJjHi0z7GonyYM5Q8j4zwvokOYNEzkljIgCglcB0VE=; b=cG+AKM07Ds0T3u0IwB9fyLWfzJjNP5lOjI6ZF/ZoGjmHt/GGjKNimZ+KNFo+9AMdln vedH7AMh50pMSsz+Ri9vns8MuD2s6RHXjWYeonCWcB5nZwjpYRs2iEMaNwdahKNaIyBq aWy6+4OZbGE6HKF55qLzcorCxwFiWtMuXZG9qMcMRgiRXgCn0QB99PbcQd54uLyAsqRW x7f5j2Iy489007tewMQS3DbUzKz7VONN0v2VNPXhvWehluT5+O0O74EU8OXgVHSwQLyv 62QHscG3tRC6P20RTp3GNuUbFZLfTJaQ5trbq6D/kg/M54j7ZT4csJ46Z8PFIqPBIJ/t 7G1g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=qfJjHi0z7GonyYM5Q8j4zwvokOYNEzkljIgCglcB0VE=; b=pN+RMuX7mSbm3tV+pHAIHEtIm61gqQ9gs5MUqmg2QtZbv9+Km8V4k9U3xzXh/RpAcP jzXXjoRCPUx4+W/bENKY/86WsjroMsYanMLQRQmYk6/wVFNmRW0OZw3RK/Rldgw/ZAUi 28Fa+eN5NKtioWZp5T+g/01GdZcmpOVdUVpoDXoPEu2+iw2aBXLllQUNYtIhHVnuzEC+ CEVWnK3BK3DBfRvid5h5yEOjyrqbAJ8OxoHMnYGgDjM1PN1oJjhUvZ417E1DkKFXHh16 nHtfs8iJFUf8O8xLeJvYe/gsTydlpRymtg+FxYRG/eNHqCAEURoIou9R6qPuZW+A/ImG ZgJA== X-Gm-Message-State: APjAAAXFUpfgML0zdYUfdN8WCOwK8yWrHGS4SqA8YTE3+1a2+SUCZgZO gvNkh24Rq9C/9eN9hNOOd/PQwKF1qbo= X-Received: by 2002:a62:1cd6:: with SMTP id c205mr66811616pfc.179.1577643951028; Sun, 29 Dec 2019 10:25:51 -0800 (PST) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9200:4e0::2f83]) by smtp.gmail.com with ESMTPSA id gc1sm21395010pjb.20.2019.12.29.10.25.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 29 Dec 2019 10:25:50 -0800 (PST) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Sun, 29 Dec 2019 10:25:41 -0800 Message-Id: <20191229182544.16104-2-raj.khem@gmail.com> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20191229182544.16104-1-raj.khem@gmail.com> References: <20191229182544.16104-1-raj.khem@gmail.com> MIME-Version: 1.0 Subject: [oe] [meta-oe][PATCH 2/5] rocksdb: Upgrade to 6.5.2 X-BeenThere: openembedded-devel@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Using the OpenEmbedded metadata to build Distributions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: openembedded-devel-bounces@lists.openembedded.org Errors-To: openembedded-devel-bounces@lists.openembedded.org Backport an upstream patch to fix build Delete patches which are either upstreamed or not required Signed-off-by: Khem Raj --- ...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 -- 2.24.1 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-oe/recipes-dbs/rocksdb/files/0001-CMake-has-stock-FindZLIB-in-upper-case.patch b/meta-oe/recipes-dbs/rocksdb/files/0001-CMake-has-stock-FindZLIB-in-upper-case.patch deleted file mode 100644 index 9682f8ad40..0000000000 --- a/meta-oe/recipes-dbs/rocksdb/files/0001-CMake-has-stock-FindZLIB-in-upper-case.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 38146a5d803a1fb9b10f011aa857872b6f20cd02 Mon Sep 17 00:00:00 2001 -From: Tongliang Liao -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 - diff --git a/meta-oe/recipes-dbs/rocksdb/files/0001-Disable-Wshadow-and-do-not-mark-default-copy-constru.patch b/meta-oe/recipes-dbs/rocksdb/files/0001-Disable-Wshadow-and-do-not-mark-default-copy-constru.patch deleted file mode 100644 index eccaa3a37a..0000000000 --- a/meta-oe/recipes-dbs/rocksdb/files/0001-Disable-Wshadow-and-do-not-mark-default-copy-constru.patch +++ /dev/null @@ -1,57 +0,0 @@ -From ee728434124b9b7d17abbd060a62aac79a9b79c0 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Tue, 12 Feb 2019 14:31:24 -0800 -Subject: [PATCH] Disable -Wshadow and do not mark default copy constructors - -Signed-off-by: Khem Raj ---- - CMakeLists.txt | 2 +- - utilities/persistent_cache/block_cache_tier.h | 4 ++-- - utilities/persistent_cache/block_cache_tier_file.h | 2 +- - 3 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 98e2e1973..3a24a075b 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -254,7 +254,7 @@ if(FAIL_ON_WARNINGS) - if(MSVC) - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /WX") - else() # assume GCC -- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror") -+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror -Wno-error=shadow") - endif() - endif() - -diff --git a/utilities/persistent_cache/block_cache_tier.h b/utilities/persistent_cache/block_cache_tier.h -index 2b2c0ef4f..96d0540a4 100644 ---- a/utilities/persistent_cache/block_cache_tier.h -+++ b/utilities/persistent_cache/block_cache_tier.h -@@ -91,9 +91,9 @@ class BlockCacheTier : public PersistentCacheTier { - : key_(std::move(key)), data_(data) {} - ~InsertOp() {} - -- InsertOp() = delete; -+ InsertOp() = default; - InsertOp(InsertOp&& /*rhs*/) = default; -- InsertOp& operator=(InsertOp&& rhs) = default; -+ InsertOp& operator=(InsertOp&& rhs) = delete; - - // used for estimating size by bounded queue - size_t Size() { return data_.size() + key_.size(); } -diff --git a/utilities/persistent_cache/block_cache_tier_file.h b/utilities/persistent_cache/block_cache_tier_file.h -index e38b6c9a1..d9b89a4f7 100644 ---- a/utilities/persistent_cache/block_cache_tier_file.h -+++ b/utilities/persistent_cache/block_cache_tier_file.h -@@ -262,7 +262,7 @@ class ThreadedWriter : public Writer { - : file_(file), buf_(buf), file_off_(file_off), callback_(callback) {} - - IO(const IO&) = default; -- IO& operator=(const IO&) = default; -+ IO& operator=(const IO&) = delete; - size_t Size() const { return sizeof(IO); } - - WritableFile* file_ = nullptr; // File to write to --- -2.20.1 - diff --git a/meta-oe/recipes-dbs/rocksdb/files/0001-Fix-build-breakage-from-lock_guard-error-6161.patch b/meta-oe/recipes-dbs/rocksdb/files/0001-Fix-build-breakage-from-lock_guard-error-6161.patch new file mode 100644 index 0000000000..ac87d0c60d --- /dev/null +++ b/meta-oe/recipes-dbs/rocksdb/files/0001-Fix-build-breakage-from-lock_guard-error-6161.patch @@ -0,0 +1,36 @@ +From b626703de7ece507f360507e49d3ecb448b12e07 Mon Sep 17 00:00:00 2001 +From: Maysam Yabandeh +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 buffer_; + bool eof_; + }; +-- +2.24.1 + diff --git a/meta-oe/recipes-dbs/rocksdb/files/0001-fix-Issue-5303.patch b/meta-oe/recipes-dbs/rocksdb/files/0001-fix-Issue-5303.patch deleted file mode 100644 index ba9834dfef..0000000000 --- a/meta-oe/recipes-dbs/rocksdb/files/0001-fix-Issue-5303.patch +++ /dev/null @@ -1,80 +0,0 @@ -From 512aaf3d833973f6146c6f1235b590901876175e Mon Sep 17 00:00:00 2001 -From: biocodz -Date: Fri, 7 Jun 2019 09:49:37 -0400 -Subject: [PATCH] fix Issue 5303 - -Upstream-Status: Submitted [https://github.com/facebook/rocksdb/pull/5426] - ---- - db/internal_stats.h | 21 +++++++++++++++++++++ - db/version_edit.h | 8 ++++++++ - utilities/persistent_cache/persistent_cache_util.h | 2 +- - 3 files changed, 30 insertions(+), 1 deletion(-) - -diff --git a/db/internal_stats.h b/db/internal_stats.h -index 6fa8727a4..09447644d 100644 ---- a/db/internal_stats.h -+++ b/db/internal_stats.h -@@ -236,6 +236,27 @@ class InternalStats { - } - } - -+ CompactionStats & operator=(const CompactionStats& c) { -+ count = c.count; -+ micros = c.micros; -+ cpu_micros = c.cpu_micros; -+ bytes_read_non_output_levels = c.bytes_read_non_output_levels; -+ bytes_read_output_level = c.bytes_read_output_level; -+ bytes_written = c.bytes_written; -+ bytes_moved = c.bytes_moved; -+ num_input_files_in_non_output_levels = -+ c.num_input_files_in_non_output_levels; -+ num_input_files_in_output_level = c.num_input_files_in_output_level; -+ num_output_files = c.num_output_files; -+ num_input_records = c.num_input_records; -+ num_dropped_records = c.num_dropped_records; -+ int num_of_reasons = static_cast(CompactionReason::kNumOfReasons); -+ for (int i = 0; i < num_of_reasons; i++) { -+ counts[i] = c.counts[i]; -+ } -+ return *this; -+ } -+ - void Clear() { - this->micros = 0; - this->cpu_micros = 0; -diff --git a/db/version_edit.h b/db/version_edit.h -index 229531792..5c50ef552 100644 ---- a/db/version_edit.h -+++ b/db/version_edit.h -@@ -52,6 +52,14 @@ struct FileDescriptor { - smallest_seqno(_smallest_seqno), - largest_seqno(_largest_seqno) {} - -+ FileDescriptor(const FileDescriptor& fd) { -+ table_reader = fd.table_reader; -+ packed_number_and_path_id = fd.packed_number_and_path_id; -+ file_size = fd.file_size; -+ smallest_seqno = fd.smallest_seqno; -+ largest_seqno = fd.largest_seqno; -+ } -+ - FileDescriptor& operator=(const FileDescriptor& fd) { - table_reader = fd.table_reader; - packed_number_and_path_id = fd.packed_number_and_path_id; -diff --git a/utilities/persistent_cache/persistent_cache_util.h b/utilities/persistent_cache/persistent_cache_util.h -index 214bb5875..254c038f9 100644 ---- a/utilities/persistent_cache/persistent_cache_util.h -+++ b/utilities/persistent_cache/persistent_cache_util.h -@@ -48,7 +48,7 @@ class BoundedQueue { - T t = std::move(q_.front()); - size_ -= t.Size(); - q_.pop_front(); -- return std::move(t); -+ return t; - } - - size_t Size() const { --- -2.11.0 - diff --git a/meta-oe/recipes-dbs/rocksdb/files/0001-utilities-Fix-build-failure-with-Werror-maybe-uninit.patch b/meta-oe/recipes-dbs/rocksdb/files/0001-utilities-Fix-build-failure-with-Werror-maybe-uninit.patch deleted file mode 100644 index ef0429a3c8..0000000000 --- a/meta-oe/recipes-dbs/rocksdb/files/0001-utilities-Fix-build-failure-with-Werror-maybe-uninit.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 8996f075e64da0e6ffeda57632ef31f8710defcc Mon Sep 17 00:00:00 2001 -From: He Zhe -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 ---- - 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 - diff --git a/meta-oe/recipes-dbs/rocksdb/rocksdb_git.bb b/meta-oe/recipes-dbs/rocksdb/rocksdb_git.bb index 9fd5ee15be..68c6bc2ffa 100644 --- a/meta-oe/recipes-dbs/rocksdb/rocksdb_git.bb +++ b/meta-oe/recipes-dbs/rocksdb/rocksdb_git.bb @@ -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" From patchwork Sun Dec 29 18:25:42 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 182582 Delivered-To: patch@linaro.org Received: by 2002:a92:815a:0:0:0:0:0 with SMTP id e87csp5493436ild; Sun, 29 Dec 2019 10:26:20 -0800 (PST) X-Google-Smtp-Source: APXvYqyj1ly5MbmImYHykSBtK2IfR//8wNQ5eSgFS+mPI+4AYNKHI+9jsG6CNK5x5xFwpj9PwCDW X-Received: by 2002:a17:90a:36af:: with SMTP id t44mr40383035pjb.25.1577643980611; Sun, 29 Dec 2019 10:26:20 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1577643980; cv=none; d=google.com; s=arc-20160816; b=hE4V3WmKLEuiuPTVU9wpejJzpyyvXQSEgY87sObrBtVtUh6tt5PkV3ahumpjldIdad YybZzLL6HLxW0pk92RYe2GTXhVsprZ/lCIIMMhUbkNgolFtgUNSEf3OXAixh6ZtYtNC0 +cjGGASBrfFl//stvobKNUXy1wI6JL8jznRg5t/il4Z106z1Y9EuZfIDpNE3H0IWK8mM XkSDiCazFBOkyiFaPWef1dSLDGFGPDbD6rkISRK+UsjFg9sVSMNXLMgUBstEfa9x/Cx2 kfQKyxCa5o6PeLmGNqwPqDv3UFORje9l+8J6zluyaAJKhOvvAbcWKh3QjlaM+xAQrEkS Gvcw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:list-subscribe:list-help :list-post:list-archive:list-unsubscribe:list-id:precedence:subject :mime-version:references:in-reply-to:message-id:date:to:from :dkim-signature:delivered-to; bh=NrJ3H4Aa67fsR3lERGFJzqA16A3GCM0T35++5RpVl6U=; b=gy9wIb8Q+LiPp4YIiMlEjiGxxbAAVOSEB96feHkOQQ1qj83/89cHGvM/WZDf03ykmU yA3ZTxtJwUPMawJMulYe7FJPWiVka2JZiS6swObY156hpXvzQk9LD9PJmmEcz0iaQuBU Am2QZWe8BO0n2gN9dOHJku5Uei4LUeONczNibnkFfb2fwvJOn97dVyPM+Aj0aJEsjNLK uh+T8tIvL+m3mSxgQcIejwjm0VJSVPu29QTqRaNXEduDJ2bKP1BbyDCcIyaWmRzY/e8i 43TXHvlXfWGap2+TzfUcF9B2WqtVcilYW215Cf/jmC6UfI0sPYO8hKUM+fssFPo5z90o 7zJg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=aUDVlZL5; spf=pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-devel-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id d10si39298275pga.420.2019.12.29.10.26.20; Sun, 29 Dec 2019 10:26:20 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=aUDVlZL5; spf=pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-devel-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from ec2-34-214-78-129.us-west-2.compute.amazonaws.com (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 719137F82E; Sun, 29 Dec 2019 18:26:13 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-pl1-f171.google.com (mail-pl1-f171.google.com [209.85.214.171]) by mail.openembedded.org (Postfix) with ESMTP id 1AFE77F7D7 for ; Sun, 29 Dec 2019 18:25:51 +0000 (UTC) Received: by mail-pl1-f171.google.com with SMTP id g6so10849770plp.6 for ; Sun, 29 Dec 2019 10:25:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=EWPfz74sm8O4P1Fuk/TMvTOv5CRDhHfsqwK8YKGqBZQ=; b=aUDVlZL5EvUnFOeGWZul0h1ByVapcf11HPPwOzOFwBV0ENCpSqWsqmQMbqWjByw5M9 lv1j5DhgBKAQyHwQKGCzP1am3BN3bj6aBwT8Av+ju4a1Lj603qpFAw5I6FaaNieWNkD5 AvHwTkVz/TmMFutw4evqSA68rrZP2RKkmjAE+SF+rfJ1jBnUxNMmmAuQ+kKxGt86RM4L ORxIkhv8jmPYWdx3FLRqeiRzid/SHfLvjG65jQxH/icFUMW0YzwMGXymudGOjg1Mhy7z hIb9lOqTPoaOEZ1toMGGlD6PAzmHRfFfl/bto7HH8SjeVqnAodxPBa+VeTWfEwT3gzzr vfZg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=EWPfz74sm8O4P1Fuk/TMvTOv5CRDhHfsqwK8YKGqBZQ=; b=NnCqZ9hn3+F1B57WusQiAt/cXWEUPfpbJEFoc4cVBpPyPESJHnaqbpuaLfwVok/vW+ k1XDK/QqmSoEe3tWxqHQI/9lwAdxu7WHt8bpZErDcXh0m2ABBBiHX05mpHPQS6AGz+RE NWE0o49uDtOObQU4JuIbnbOz9X5kO4lBya2RyNkrrSZrLR1dMkrdNq5IOU5NmTQSjERT 17SiXjMcBni1WX46lQhB0Su+2Mx7Waixa88Hh4Z6f9A+yI55vjfx93YNyNxzh0J8zcK3 hx0sw3hsMdzLNuK6bshJ3yqlYLtrq0pD/exor7S3tUF6ssbDU9yX2EO7sAVZCu3fFzfr +wkg== X-Gm-Message-State: APjAAAVxQVt3ElXUPRGLyJk/iY/iS8SuTQryObvvQ17OMeyyq5d3mdEf RrxKC6OVZOchFrGMFY7vAHihrLEb4Gs= X-Received: by 2002:a17:90a:aa81:: with SMTP id l1mr41379297pjq.62.1577643951720; Sun, 29 Dec 2019 10:25:51 -0800 (PST) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9200:4e0::2f83]) by smtp.gmail.com with ESMTPSA id gc1sm21395010pjb.20.2019.12.29.10.25.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 29 Dec 2019 10:25:51 -0800 (PST) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Sun, 29 Dec 2019 10:25:42 -0800 Message-Id: <20191229182544.16104-3-raj.khem@gmail.com> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20191229182544.16104-1-raj.khem@gmail.com> References: <20191229182544.16104-1-raj.khem@gmail.com> MIME-Version: 1.0 Subject: [oe] [meta-oe][PATCH 3/5] mariadb: Upgrade to 10.4.11 X-BeenThere: openembedded-devel@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Using the OpenEmbedded metadata to build Distributions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: openembedded-devel-bounces@lists.openembedded.org Errors-To: openembedded-devel-bounces@lists.openembedded.org Backport 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 Signed-off-by: Khem Raj --- ...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%) -- 2.24.1 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-oe/recipes-dbs/mysql/mariadb-native_10.3.18.bb b/meta-oe/recipes-dbs/mysql/mariadb-native_10.4.11.bb similarity index 100% rename from meta-oe/recipes-dbs/mysql/mariadb-native_10.3.18.bb rename to meta-oe/recipes-dbs/mysql/mariadb-native_10.4.11.bb diff --git a/meta-oe/recipes-dbs/mysql/mariadb.inc b/meta-oe/recipes-dbs/mysql/mariadb.inc index ec5ac11ef0..1c1b8a0a87 100644 --- a/meta-oe/recipes-dbs/mysql/mariadb.inc +++ b/meta-oe/recipes-dbs/mysql/mariadb.inc @@ -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" diff --git a/meta-oe/recipes-dbs/mysql/mariadb/0001-Fix-build-breakage-from-lock_guard-error-6161.patch b/meta-oe/recipes-dbs/mysql/mariadb/0001-Fix-build-breakage-from-lock_guard-error-6161.patch new file mode 100644 index 0000000000..87c70617a1 --- /dev/null +++ b/meta-oe/recipes-dbs/mysql/mariadb/0001-Fix-build-breakage-from-lock_guard-error-6161.patch @@ -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 buffer_; + bool eof_; + }; diff --git a/meta-oe/recipes-dbs/mysql/mariadb/fix-arm-atomic.patch b/meta-oe/recipes-dbs/mysql/mariadb/fix-arm-atomic.patch index 34d31148b4..185b7b77ff 100644 --- a/meta-oe/recipes-dbs/mysql/mariadb/fix-arm-atomic.patch +++ b/meta-oe/recipes-dbs/mysql/mariadb/fix-arm-atomic.patch @@ -15,11 +15,9 @@ Signed-off-by: Mingli Yu 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 - diff --git a/meta-oe/recipes-dbs/mysql/mariadb_10.3.18.bb b/meta-oe/recipes-dbs/mysql/mariadb_10.4.11.bb similarity index 100% rename from meta-oe/recipes-dbs/mysql/mariadb_10.3.18.bb rename to meta-oe/recipes-dbs/mysql/mariadb_10.4.11.bb From patchwork Sun Dec 29 18:25:43 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 182583 Delivered-To: patch@linaro.org Received: by 2002:a92:815a:0:0:0:0:0 with SMTP id e87csp5493501ild; Sun, 29 Dec 2019 10:26:27 -0800 (PST) X-Google-Smtp-Source: APXvYqxNTFPdsuC4dx91MvBj5x6CeQmBAhNALKpkDkWA4KvsECm58JCL8EQJhAs7SjJz5ucadrt7 X-Received: by 2002:a17:90a:f496:: with SMTP id bx22mr41598994pjb.101.1577643987402; Sun, 29 Dec 2019 10:26:27 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1577643987; cv=none; d=google.com; s=arc-20160816; b=0y56cxrWzKHiqBjwCzYPEX0gAud8sx9EaKawwHL8KABtyPSa10pPiz41rr0mN2Wny5 fFkiHP8WVoVcUkUTG3Z3yqGzJJZ9htk/UJw+dV8qyFCK6vcHmy+TEGCHRrXAw4L5PbcH VKuDW+5WNEZcmpJEhK1KdiDsadRdIvaJcB6B7JEhykE0MNXaiPpyfvdRFP33s1C8bHaW CA5foO35BTWSZbu6fOxAV9SkTK36HuTN2HH6BGedsMZEnmD1KaQZ/DZ3jGGAje3OR/KE cB7Elh98ftg6FInJFiAmCnj+cm+3kcRI/PgdQtaZVGgmiMfK2xyJ2VF+qilaY1S6Le+s oP0Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:list-subscribe:list-help :list-post:list-archive:list-unsubscribe:list-id:precedence:subject :mime-version:references:in-reply-to:message-id:date:to:from :dkim-signature:delivered-to; bh=9BfDgCt1Mxwa2uGeRW0pbHk7RnBhLJbXbPHXSl/GHYY=; b=zSBHsquQ9qxS7Oi+t3fGhsQLMlA/HJfk3yuNloMA476F/0hjDfYBgwoiNZfWTjjOFU l7D+om4bRfL6Y0ZJJSkvbnrFDs4vydH/ZwuRbloVvezBRB5EUmKzsMi6C9hLOm+fnXPy 9fpl8TriMvyG2+59Xk9WuCU8e1mXWt71vzW4/vQ9pF/jruG5OGY+XZm2yFTVLfc0zWkZ FVCte4k680NMIFDkEBV90YwE3tN/rYp//WX3gtI0MmJkYmcReTdOrPMsNLT2reNacLu/ TCSbz2qOrPZb5NZEHYoFn7LatGHdilTxx/A82Xvw9lxYop/V6NPj6reZLBT0DdZ4OQ8n rdWQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=JPLxGVSw; spf=pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-devel-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id a20si38586884pgw.378.2019.12.29.10.26.27; Sun, 29 Dec 2019 10:26:27 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=JPLxGVSw; spf=pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-devel-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from ec2-34-214-78-129.us-west-2.compute.amazonaws.com (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id C156B7F832; Sun, 29 Dec 2019 18:26:14 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-pf1-f195.google.com (mail-pf1-f195.google.com [209.85.210.195]) by mail.openembedded.org (Postfix) with ESMTP id C8E287F81E for ; Sun, 29 Dec 2019 18:25:51 +0000 (UTC) Received: by mail-pf1-f195.google.com with SMTP id z16so17266297pfk.0 for ; Sun, 29 Dec 2019 10:25:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=lbqYO6566wvNNsbZy5s3Wf5LMTpzQkODQYv12W/3Wl4=; b=JPLxGVSwRNNvfWu0DllaFieqNiQpJ1D3YtAjHtUJF+w5pFGKwJ9yBTtWpmccKLa/fX lifzy87ah76nTDfo6Tj+RIUQV/V+M9ZvxBsyni9bk+OYZGNtAgrDZWJ81g9F/6VyOR9e EfsRzHPaDTK3X9QRrDgyI/339gQUkhVdCFuMLDNOL0vC+4MBij74WOG2yi/1NX4UBLbl tyi9BxfPm651dCpd3cZJB2hn5+ak9h83dQQXnziq15SkwwsH9WmFSsRTPLvcje5F1z98 rSD4AkaTIyWhvFGP+u9mVIW4R01NsAanKg34tfjRN1aq294zL4xUSBAExU5zWpIyhAAS Z+Jw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=lbqYO6566wvNNsbZy5s3Wf5LMTpzQkODQYv12W/3Wl4=; b=Csh2olekVJo5D3qMi9UaRvkOb1isua5hKHABz5i63IbBTW5jaDW5j4e1iZPPitjm9h MPi60g1xgZPQteKI7+fN03eJ2JtNa03ZiC0iCSwNosRzHPGC5e4Uq9cq0yoQmGNWV4Us swQZQSrQ6liSUF0SYnNTtAJt5UdLs0raipuuEfImuFn0L6TAtvqIejK1lHOeRM9TXJER rD/qtZASxO3dNtywsxudJAeZ1uRN4lqa2K/iXayX1ULSLAU+nvhP36qZUV8BULA6g0XT trQ3YZyoiU+0ZOmp4GO3pmMfkTdz08DHtXuGTBRN1i5xJydEF6Mna73pBMXATZ5C0xQK sRTA== X-Gm-Message-State: APjAAAXWXvYil1GdRm1TIYNXuuXv1cZwYcuesoH5VYwFc8e71DQawOb8 jcne0xHo9ppcPVi8wENh5Zcl5Pfa9ww= X-Received: by 2002:aa7:90cc:: with SMTP id k12mr44555826pfk.105.1577643952381; Sun, 29 Dec 2019 10:25:52 -0800 (PST) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9200:4e0::2f83]) by smtp.gmail.com with ESMTPSA id gc1sm21395010pjb.20.2019.12.29.10.25.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 29 Dec 2019 10:25:52 -0800 (PST) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Sun, 29 Dec 2019 10:25:43 -0800 Message-Id: <20191229182544.16104-4-raj.khem@gmail.com> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20191229182544.16104-1-raj.khem@gmail.com> References: <20191229182544.16104-1-raj.khem@gmail.com> MIME-Version: 1.0 Subject: [oe] [meta-networking][PATCH 4/5] ruli: Fix implicit conversion from 'unsigned int' to 'float' X-BeenThere: openembedded-devel@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Using the OpenEmbedded metadata to build Distributions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: openembedded-devel-bounces@lists.openembedded.org Errors-To: openembedded-devel-bounces@lists.openembedded.org Signed-off-by: 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 -- 2.24.1 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-networking/recipes-support/ruli/files/float-conversion.patch b/meta-networking/recipes-support/ruli/files/float-conversion.patch new file mode 100644 index 0000000000..999f23fc6a --- /dev/null +++ b/meta-networking/recipes-support/ruli/files/float-conversion.patch @@ -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 +--- 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); diff --git a/meta-networking/recipes-support/ruli/ruli_0.36.bb b/meta-networking/recipes-support/ruli/ruli_0.36.bb index 8548f9a353..f920b592ac 100644 --- a/meta-networking/recipes-support/ruli/ruli_0.36.bb +++ b/meta-networking/recipes-support/ruli/ruli_0.36.bb @@ -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" From patchwork Sun Dec 29 18:25:44 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 182584 Delivered-To: patch@linaro.org Received: by 2002:a92:815a:0:0:0:0:0 with SMTP id e87csp5493595ild; Sun, 29 Dec 2019 10:26:35 -0800 (PST) X-Google-Smtp-Source: APXvYqwHj1BleHDi6AiTbZ/7HIDR2TklBtm8ojL0xMf9DDlyvcMieh8eE/nVLTEEmmKpDxRbBeAZ X-Received: by 2002:a17:902:59cd:: with SMTP id d13mr64790373plj.146.1577643995564; Sun, 29 Dec 2019 10:26:35 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1577643995; cv=none; d=google.com; s=arc-20160816; b=eMiXaqya8pANOZcgIH+LrWlleP5cGVMVLEJF9GPltgiMzbShK67UyT21ceS63gEmLM xyoa9OdbRQK40fjEQjkhPeZCWYLOeNrfx+i+nvYsXboja+UKmyNG3lOa5vRhWql1UPpT oDKsjvsuq7vGMoaWF0w+B0GYpCxBiZB4uFnImSSoOkYNwg5uLXel1+lVnmh8fgGAesfu pVhs3c44G37oIW8JczuBz6BrVmh0MtUdDbb5cJ/XV5nJUnwFXzBX+aWEA//tO1JGI9ed K1z5Sp6Np8l05713cgaiiqG70YmKpTz7J+0GRgytwkJdt/idu6njoAmt/sBIUa2S5oy3 NXeA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:list-subscribe:list-help :list-post:list-archive:list-unsubscribe:list-id:precedence:subject :mime-version:references:in-reply-to:message-id:date:to:from :dkim-signature:delivered-to; bh=47UoXwT+Eu2p3AqNrUjEHLLSQ4edJoO4E6F8bGMyOtM=; b=Q8iSBWn/Dd9fV4Y/WI57/THCRJwLu5CJcfRZ1QJ8juni//WkIVhiw4EA4c9KUe+/YA nu/DClBy1L2vmjP7Uz7xdocD6GzJ1tT92T8JnJ/XxXGQinUQE4vefkzZpOOCv4L+0FB0 NwrF066ijB2LQ+oWEwor7pHzPw3p0vsBg0JLQTRvhWRuLU7/nkavi922xorXVzm5Op8v Igs3S7c+4MkTQxKAAG4mw95/C+EQ7z1vvx2pSnQC1oRqfNqCgUF51m1xWvRHyVecN4vU 7oPZWnnp/pPbvqUY0YG4FWkFpBsD5t2zSCkM9rV0pof121tyv2+/ynxTKLjnXHtsPFP1 sk7w== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=jw3iMOvZ; spf=pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-devel-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id t15si32976662pgj.144.2019.12.29.10.26.35; Sun, 29 Dec 2019 10:26:35 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=jw3iMOvZ; spf=pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-devel-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from ec2-34-214-78-129.us-west-2.compute.amazonaws.com (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id E14587F838; Sun, 29 Dec 2019 18:26:15 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-pj1-f41.google.com (mail-pj1-f41.google.com [209.85.216.41]) by mail.openembedded.org (Postfix) with ESMTP id 7BDE57F7BC for ; Sun, 29 Dec 2019 18:25:52 +0000 (UTC) Received: by mail-pj1-f41.google.com with SMTP id u63so4123122pjb.0 for ; Sun, 29 Dec 2019 10:25:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=0050Bg32kJs482EcCQwyA5nqErIhJWcYvacctE9cwSI=; b=jw3iMOvZ6mMSCq8uZODk+p5VOOZPRH174iKvY66OR9dJZAoNzz6cRJSpTAgr5Rls1X 4MikUC5MabA5z1gjE1NQFGQstfTRo76CSxFcSmdd61WcQNNIGz83dmcM3p609IDsC46f Faqv6F1UU6IKH7TnQDoaRq4bpuq/r6Lqt8wikYCSsMSBgAJYBFtvxAMnxMgvOlWiJqa/ 2nkdsk4mNbGy91JJt9uB8MDSS8K1re2dmf6+UBuaSW7jtR/0BC4toksjNQFV0R8KTvqM HP1gYn/+wlz4QrbVtgVLi2d14cvyKl1IXVyU5ubcyvjuvCYIoRhXtYk4GkNyrSmvVmLu +hHQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=0050Bg32kJs482EcCQwyA5nqErIhJWcYvacctE9cwSI=; b=ZLlbhEed2BroZphfOE5COoUuvt2ZLxfQrsOxJzIq16jp2O2CrHhmCpDivdtKenfbs1 9itvLc6edO6PNmD9jZptaLh5TeCko/q1eQPrSPpoN4cMNuJqHIluq3kNvWkMHWHN81Vn j3pspoJKbQn8h2VtbXK6VBfLQA+r7+84+C1WohBWX5wDFUFo3UOzAGceId7kjmozSTEW TwZ+fU1z8MeO/2f6efA+Tg8/G9ZsqK2O3mCyt3gxoL1hUjxBvEIkm4giC1NIoR0Gd6s8 4Yx3uZWirhvmDTo1D9qu91ksY9fu2F5e1UigyGWoql7Td4V338w3OuFABL5CnpnCG8qD JbVw== X-Gm-Message-State: APjAAAXYUaUBfIXdmtPcEAOa/6e6Sy9c2LPeArdkxsxbHYFJ+MRySeOY oq6YbfVPTY8ACVf8n2J+juBYtVa6FQc= X-Received: by 2002:a17:902:8641:: with SMTP id y1mr64188634plt.110.1577643953026; Sun, 29 Dec 2019 10:25:53 -0800 (PST) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9200:4e0::2f83]) by smtp.gmail.com with ESMTPSA id gc1sm21395010pjb.20.2019.12.29.10.25.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 29 Dec 2019 10:25:52 -0800 (PST) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Sun, 29 Dec 2019 10:25:44 -0800 Message-Id: <20191229182544.16104-5-raj.khem@gmail.com> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20191229182544.16104-1-raj.khem@gmail.com> References: <20191229182544.16104-1-raj.khem@gmail.com> MIME-Version: 1.0 Subject: [oe] [meta-oe][PATCH V2 5/5] fluentbit: Upgrade to 1.3.5 X-BeenThere: openembedded-devel@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Using the OpenEmbedded metadata to build Distributions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: openembedded-devel-bounces@lists.openembedded.org Errors-To: openembedded-devel-bounces@lists.openembedded.org Sync 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 Signed-off-by: Khem Raj --- 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 -- 2.24.1 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-oe/recipes-extended/fluentbit/fluentbit/cmake_multilib.patch b/meta-oe/recipes-extended/fluentbit/fluentbit/cmake_multilib.patch deleted file mode 100644 index 8fe9f3e703..0000000000 --- a/meta-oe/recipes-extended/fluentbit/fluentbit/cmake_multilib.patch +++ /dev/null @@ -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 - ---- 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 diff --git a/meta-oe/recipes-extended/fluentbit/fluentbit/cross-build-init-system-detection.patch b/meta-oe/recipes-extended/fluentbit/fluentbit/cross-build-init-system-detection.patch new file mode 100644 index 0000000000..a185789992 --- /dev/null +++ b/meta-oe/recipes-extended/fluentbit/fluentbit/cross-build-init-system-detection.patch @@ -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 + +--- 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 diff --git a/meta-oe/recipes-extended/fluentbit/fluentbit/jemalloc.patch b/meta-oe/recipes-extended/fluentbit/fluentbit/jemalloc.patch index abaf92c052..67b3397a6f 100644 --- a/meta-oe/recipes-extended/fluentbit/fluentbit/jemalloc.patch +++ b/meta-oe/recipes-extended/fluentbit/fluentbit/jemalloc.patch @@ -3,16 +3,14 @@ Add --with-jemalloc-prefix=je_ so it compiles on musl Signed-off-by: Khem Raj 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= -+ CONFIGURE_COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/lib/jemalloc/configure --with-jemalloc-prefix=je_ ${AUTOCONF_HOST_OPT} --with-lg-quantum=3 --enable-cc-silence --prefix= + 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= ++ 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= CFLAGS=-std=gnu99\ -Wall\ -pipe\ -g3\ -O3\ -funroll-loops - BUILD_COMMAND ${MAKE} + BUILD_COMMAND $(MAKE) INSTALL_DIR ${CMAKE_CURRENT_BINARY_DIR}/ diff --git a/meta-oe/recipes-extended/fluentbit/fluentbit_0.12.19.bb b/meta-oe/recipes-extended/fluentbit/fluentbit_0.12.19.bb deleted file mode 100644 index 27b910b8be..0000000000 --- a/meta-oe/recipes-extended/fluentbit/fluentbit_0.12.19.bb +++ /dev/null @@ -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}" diff --git a/meta-oe/recipes-extended/fluentbit/fluentbit_1.3.5.bb b/meta-oe/recipes-extended/fluentbit/fluentbit_1.3.5.bb new file mode 100644 index 0000000000..fc74fc86ae --- /dev/null +++ b/meta-oe/recipes-extended/fluentbit/fluentbit_1.3.5.bb @@ -0,0 +1,54 @@ +SUMMARY = "Fast Log processor and Forwarder" +DESCRIPTION = "Fluent Bit is a data collector, processor and \ +forwarder for Linux. It supports several input sources and \ +backends (destinations) for your data. \ +" + +HOMEPAGE = "http://fluentbit.io" +BUGTRACKER = "https://github.com/fluent/fluent-bit/issues" + +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=2ee41112a44fe7014dce33e26468ba93" +SECTION = "net" + +SRC_URI = "http://fluentbit.io/releases/1.3/fluent-bit-${PV}.tar.gz \ + file://jemalloc.patch \ + file://cross-build-init-system-detection.patch \ + " +SRC_URI[md5sum] = "6eae6dfd0a874e5dd270c36e9c68f747" +SRC_URI[sha256sum] = "e037c76c89269c8dc4027a08e442fefd2751b0f1e0f9c38f9a4b12d781a9c789" + +S = "${WORKDIR}/fluent-bit-${PV}" +DEPENDS = "zlib bison-native flex-native" +DEPENDS_append_libc-musl = " fts " + +INSANE_SKIP_${PN}-dev += "dev-elf" + +# Use CMake 'Unix Makefiles' generator +OECMAKE_GENERATOR ?= "Unix Makefiles" + +# Fluent Bit build options +# ======================== + +# Host related setup +EXTRA_OECMAKE += "-DGNU_HOST=${HOST_SYS} -DFLB_ALL=ON -DFLB_TD=1" + +# Disable LuaJIT and filter_lua support +EXTRA_OECMAKE += "-DFLB_LUAJIT=Off -DFLB_FILTER_LUA=Off " + +# Disable Library and examples +EXTRA_OECMAKE += "-DFLB_SHARED_LIB=Off -DFLB_EXAMPLES=Off " + +EXTRA_OECMAKE += "${@bb.utils.contains('DISTRO_FEATURES','systemd','-DFLB_SYSTEMD=On','',d)}" + +# Kafka Output plugin (disabled by default): note that when +# enabling Kafka output plugin, the backend library librdkafka +# requires 'openssl' as a dependency. +# +# DEPENDS += "openssl " +# EXTRA_OECMAKE += "-DFLB_OUT_KAFKA=On " + +inherit cmake systemd features_check + +SYSTEMD_SERVICE_${PN} = "td-agent-bit.service" +TARGET_CC_ARCH_append = " ${SELECTED_OPTIMIZATION}"