From patchwork Fri Aug 19 06:40:53 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 11595 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 58D9EC28B2B for ; Fri, 19 Aug 2022 06:40:58 +0000 (UTC) Received: from mail-pl1-f177.google.com (mail-pl1-f177.google.com [209.85.214.177]) by mx.groups.io with SMTP id smtpd.web08.231.1660891257617305863 for ; Thu, 18 Aug 2022 23:40:57 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=TAtkcRJE; spf=pass (domain: gmail.com, ip: 209.85.214.177, mailfrom: raj.khem@gmail.com) Received: by mail-pl1-f177.google.com with SMTP id d16so3361298pll.11 for ; Thu, 18 Aug 2022 23:40:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc; bh=viLM6ukTqpTpsdvUx7WRalU7tkEULYXkSdXoG8yHAbQ=; b=TAtkcRJEP3LJMIgUGHo09kIuZGf30Npz4HoOj4Z8ZIWt57G1eYbCJAXRjGdr9Dfdpf Aq2Ntq0WssRZzu3mG1vnv7vtoom/uG36T+jyZKfl/5PheryJ9OC/PosgyIzqtjPDU8u7 fLfE6KD7U0Vwr7fN33OeRSWfj86J05Hmbm2kd/iIy5VYuTYJ7S4zarFPJyVrU3pqFKLj pINpXeREN//5HwLaC1k9wS7olzVg3TNTUEqqGR+o7IyJReEWkkmgq0oYmQrg9CdIakDh Gb1lqgHT1vTtaA1cogfBCuJped+PqfkJF2JPABmHyYfTu+nXXf0M8NDIpvec5S16blAh tD9w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc; bh=viLM6ukTqpTpsdvUx7WRalU7tkEULYXkSdXoG8yHAbQ=; b=VDk+Is8nxu95WCLDMISNeO04zgOoVH9PRVG9Iwl+9TE9TzvLREV9pOpeP3gie1BmYy SiRcKthr7KF/4/ZmVz3K7lJPk/klS2CP7HmX3x91Fx9c0bKkGtpFYdcK5YQAlgFTz+q2 tSFpAmzyYJbCtl2jX/bgs04UyF6DX3agafN4HpODTWA5EGgRm+AxIMhjoYXNV8EOHRcf /M/JQwf1vQ6Ygnz13fiZhRBK+NWJ/89pnFWk3dewYZl4tlsFbL41it22dtInMMJeALr2 DEOQ9VT2/AHUdv90cD7khoWykLDG0XdbhM++nHU60+mYFMyma3K/PsKua6+6ZnJBpPvl ks+w== X-Gm-Message-State: ACgBeo0NXV9/tubtY4NtUnY5wtwYVOvfpct2yiPnADf3CjXU7oPG8X+O VzLLzg0NuB+6+lCMdygLGcUcqkk2JAkxUA== X-Google-Smtp-Source: AA6agR5EQp6IOHea+OuNDUJgpfKZIJXMQRu+Kw8dPtSPcwvkbGKIkfSt0kO7rUW4YGTYoQ78J7/cuw== X-Received: by 2002:a17:90a:8911:b0:1fa:c8f7:1450 with SMTP id u17-20020a17090a891100b001fac8f71450mr6868809pjn.123.1660891256582; Thu, 18 Aug 2022 23:40:56 -0700 (PDT) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9200:a0f0::d53f]) by smtp.gmail.com with ESMTPSA id j125-20020a625583000000b00535fd3290f0sm1111857pfb.113.2022.08.18.23.40.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 18 Aug 2022 23:40:56 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Cc: Khem Raj Subject: [meta-oe][PATCH 1/2] fluentbit: Use CMAKE_C_STANDARD_LIBRARIES cmake var to pass libatomic Date: Thu, 18 Aug 2022 23:40:53 -0700 Message-Id: <20220819064054.1471627-1-raj.khem@gmail.com> X-Mailer: git-send-email 2.37.2 MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 19 Aug 2022 06:40:58 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/98322 Since libatomic needs to be linked last in the list of libs, take advantange of using CMAKE_C_STANDARD_LIBRARIES insread of FLB_DEPS since DFLB_DEPS is not appended last to linker flags in CMakefiles it ends up with undefined references for libatomic symbols in libs appearing after FLB_LIBS in sequence Use it for mips too Signed-off-by: Khem Raj --- meta-oe/recipes-extended/fluentbit/fluentbit_1.9.6.bb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/meta-oe/recipes-extended/fluentbit/fluentbit_1.9.6.bb b/meta-oe/recipes-extended/fluentbit/fluentbit_1.9.6.bb index ea6f81cbf0..a801694f42 100644 --- a/meta-oe/recipes-extended/fluentbit/fluentbit_1.9.6.bb +++ b/meta-oe/recipes-extended/fluentbit/fluentbit_1.9.6.bb @@ -75,8 +75,9 @@ EXTRA_OECMAKE += "-DFLB_RELEASE=On" # musl needs these options EXTRA_OECMAKE:append:libc-musl = ' -DFLB_JEMALLOC_OPTIONS="--with-jemalloc-prefix=je_ --with-lg-quantum=3" -DFLB_CORO_STACK_SIZE=24576' -EXTRA_OECMAKE:append:riscv64 = " -DFLB_DEPS='atomic'" -EXTRA_OECMAKE:append:riscv32 = " -DFLB_DEPS='atomic'" +EXTRA_OECMAKE:append:riscv64 = " -DCMAKE_C_STANDARD_LIBRARIES=-latomic" +EXTRA_OECMAKE:append:riscv32 = " -DCMAKE_C_STANDARD_LIBRARIES=-latomic" +EXTRA_OECMAKE:append:mips = " -DCMAKE_C_STANDARD_LIBRARIES=-latomic" inherit cmake systemd pkgconfig From patchwork Fri Aug 19 06:40:54 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 11596 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 21B92C32771 for ; Fri, 19 Aug 2022 06:41:08 +0000 (UTC) Received: from mail-pj1-f52.google.com (mail-pj1-f52.google.com [209.85.216.52]) by mx.groups.io with SMTP id smtpd.web10.248.1660891258413970825 for ; Thu, 18 Aug 2022 23:40:58 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=VV7Q2odP; spf=pass (domain: gmail.com, ip: 209.85.216.52, mailfrom: raj.khem@gmail.com) Received: by mail-pj1-f52.google.com with SMTP id o5-20020a17090a3d4500b001ef76490983so3983118pjf.2 for ; Thu, 18 Aug 2022 23:40:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc; bh=H2VSXbA98M8FOB7BQDfV2MoPooHhzTbd9lgaBhJP7zk=; b=VV7Q2odP4bSjhj6BpJAh60mIM4Vc3O1Y0sFd4cMmHGRYi3btD9q3AHZANqzV9Ho6kh 6ULZvPBL8N0AWT0lxLRJEACJMM68tus0tR+6+Vz7aAX7SLw3b8Ao1y9WD3KIzdSNxAms zIEy4cSFhGv0R2WeEecDyT9QXZTHI8z2K86JEbq2BZl3E2OgbHRxaRR10JL70ELpxMzE 5kljkKAGAnA++Y/mr/Ez8qRBoM2RRS+gc55z4d2UFlQ1MWoz2R3oNLVO0JT/ts593dFq SJ1u0wVthTCGfTXOex6RNT6iujL8QfgCT3shi+hRaf/1XWG5F1EX9qnU2n3bOtOVNeJZ Hxhw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc; bh=H2VSXbA98M8FOB7BQDfV2MoPooHhzTbd9lgaBhJP7zk=; b=buIBWCfVfx/O2ggOLnKpx1KnzLtG/N01BabZ7rXvVfrUvF2JlYFvA8+SeZ0pQZmUlq hNkMXVObYONAr+TSs+mz2iRIBYWiSfpQh/QjLap06jrqzh1nNL3gT2aj+fVlFFOxb4QF 7Zx+M549hhG3P3NHUNUG3fmFnzAf1r8qeAPuE2ezzZcocVQNNsQ2/sM0lLJ7cccVSFEm EWpdmdWCDJvhb1g7XYyg6HT7zxgI5xeoANxt0XfS+iu3Apb26+MjApthO3e+990+RxQH xMPlBX8xh5mpTTuTeT+sq3oLcnktT1iftzfkC+Fe/aYsHIunMVyPwstWhb90CT0yvRc7 /Q8g== X-Gm-Message-State: ACgBeo1Wre9Z3dP+3m2/hbuzmuvRj3ZqjkUhpknBaMnMO0SpPFqPw8J/ rszDH1inQBqwJAf3j7Ux+vuWk6du3/KM+g== X-Google-Smtp-Source: AA6agR5Qyeirg1Z5KzQHc9AsVprIwHqU6hpAatamFEkzMoyDX6hmsmn7tVsbOhMitGxJtRXOq33uNw== X-Received: by 2002:a17:902:ef96:b0:172:abb9:657e with SMTP id iz22-20020a170902ef9600b00172abb9657emr5954993plb.48.1660891257472; Thu, 18 Aug 2022 23:40:57 -0700 (PDT) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9200:a0f0::d53f]) by smtp.gmail.com with ESMTPSA id j125-20020a625583000000b00535fd3290f0sm1111857pfb.113.2022.08.18.23.40.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 18 Aug 2022 23:40:57 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Cc: Khem Raj Subject: [meta-oe][PATCH 2/2] fluentbit: Upgrade to 1.9.7 and fix build on x86 Date: Thu, 18 Aug 2022 23:40:54 -0700 Message-Id: <20220819064054.1471627-2-raj.khem@gmail.com> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20220819064054.1471627-1-raj.khem@gmail.com> References: <20220819064054.1471627-1-raj.khem@gmail.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 19 Aug 2022 06:41:08 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/98323 Signed-off-by: Khem Raj --- ...emove-unused-variable-in-mpi_mul_hlp.patch | 42 +++++++++++++++++++ ...{fluentbit_1.9.6.bb => fluentbit_1.9.7.bb} | 7 +++- 2 files changed, 47 insertions(+), 2 deletions(-) create mode 100644 meta-oe/recipes-extended/fluentbit/fluentbit/0001-Revert-Remove-unused-variable-in-mpi_mul_hlp.patch rename meta-oe/recipes-extended/fluentbit/{fluentbit_1.9.6.bb => fluentbit_1.9.7.bb} (92%) diff --git a/meta-oe/recipes-extended/fluentbit/fluentbit/0001-Revert-Remove-unused-variable-in-mpi_mul_hlp.patch b/meta-oe/recipes-extended/fluentbit/fluentbit/0001-Revert-Remove-unused-variable-in-mpi_mul_hlp.patch new file mode 100644 index 0000000000..8a165dc0d2 --- /dev/null +++ b/meta-oe/recipes-extended/fluentbit/fluentbit/0001-Revert-Remove-unused-variable-in-mpi_mul_hlp.patch @@ -0,0 +1,42 @@ +From af6cefba8c2675f58b75f93785337ab23054568c Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Thu, 18 Aug 2022 23:35:23 -0700 +Subject: [PATCH] Revert Remove unused variable in mpi_mul_hlp() + +This reverts +https://github.com/Mbed-TLS/mbedtls/commit/e7f14a3090e6595eb3c8d821704ad9c90f6d3712 + +Which helps in compiling the x86 asm code. + +Upstream-Status: Pending + +Signed-off-by: Khem Raj +--- + lib/mbedtls-2.28.0/library/bignum.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/lib/mbedtls-2.28.0/library/bignum.c b/lib/mbedtls-2.28.0/library/bignum.c +index 9c256ae..62e7f76 100644 +--- a/lib/mbedtls-2.28.0/library/bignum.c ++++ b/lib/mbedtls-2.28.0/library/bignum.c +@@ -1392,7 +1392,7 @@ void mpi_mul_hlp( size_t i, + mbedtls_mpi_uint *d, + mbedtls_mpi_uint b ) + { +- mbedtls_mpi_uint c = 0; ++ mbedtls_mpi_uint c = 0, t = 0; + + #if defined(MULADDC_HUIT) + for( ; i >= 8; i -= 8 ) +@@ -1443,6 +1443,8 @@ void mpi_mul_hlp( size_t i, + } + #endif /* MULADDC_HUIT */ + ++ t++; ++ + while( c != 0 ) + { + *d += c; c = ( *d < c ); d++; +-- +2.37.2 + diff --git a/meta-oe/recipes-extended/fluentbit/fluentbit_1.9.6.bb b/meta-oe/recipes-extended/fluentbit/fluentbit_1.9.7.bb similarity index 92% rename from meta-oe/recipes-extended/fluentbit/fluentbit_1.9.6.bb rename to meta-oe/recipes-extended/fluentbit/fluentbit_1.9.7.bb index a801694f42..a1f879488d 100644 --- a/meta-oe/recipes-extended/fluentbit/fluentbit_1.9.6.bb +++ b/meta-oe/recipes-extended/fluentbit/fluentbit_1.9.7.bb @@ -22,13 +22,13 @@ SRC_URI = "https://releases.fluentbit.io/1.9/source-${PV}.tar.gz;subdir=fluent-b file://0004-Use-correct-type-to-store-return-from-flb_kv_item_cr.patch \ file://0005-stackdriver-Fix-return-type-mismatch.patch \ file://0006-monkey-Fix-TLS-detection-testcase.patch \ + file://0001-Revert-Remove-unused-variable-in-mpi_mul_hlp.patch \ " SRC_URI:append:libc-musl = "\ file://0001-Use-posix-strerror_r-with-musl.patch \ file://0002-chunkio-Link-with-fts-library-with-musl.patch \ " -SRC_URI[sha256sum] = "5ef7dd97e10936269fe5f4e5d3ebf16559333066f7d6757ba12464a9d6186570" - +SRC_URI[sha256sum] = "8ca2ac081d7eee717483c06608adcb5e3d5373e182ad87dba21a23f8278c6540" S = "${WORKDIR}/fluent-bit-${PV}" DEPENDS = "zlib bison-native flex-native openssl" @@ -78,6 +78,9 @@ EXTRA_OECMAKE:append:libc-musl = ' -DFLB_JEMALLOC_OPTIONS="--with-jemalloc-prefi EXTRA_OECMAKE:append:riscv64 = " -DCMAKE_C_STANDARD_LIBRARIES=-latomic" EXTRA_OECMAKE:append:riscv32 = " -DCMAKE_C_STANDARD_LIBRARIES=-latomic" EXTRA_OECMAKE:append:mips = " -DCMAKE_C_STANDARD_LIBRARIES=-latomic" +EXTRA_OECMAKE:append:x86 = " -DCMAKE_C_STANDARD_LIBRARIES=-latomic" + +CFLAGS:append:x86 = " -DMBEDTLS_HAVE_SSE2" inherit cmake systemd pkgconfig