From patchwork Wed Sep 7 23:40:41 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 12464 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 C29D6C38145 for ; Wed, 7 Sep 2022 23:41:15 +0000 (UTC) Received: from mail-pg1-f177.google.com (mail-pg1-f177.google.com [209.85.215.177]) by mx.groups.io with SMTP id smtpd.web11.2755.1662594066063108099 for ; Wed, 07 Sep 2022 16:41:06 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=l8bSz1wN; spf=pass (domain: gmail.com, ip: 209.85.215.177, mailfrom: raj.khem@gmail.com) Received: by mail-pg1-f177.google.com with SMTP id 202so15033681pgc.8 for ; Wed, 07 Sep 2022 16:41:06 -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:subject:date; bh=/PCHI3p/qP9grLpy6DmQJ16veo0/36gKhqtKUIR+4eA=; b=l8bSz1wNv/Fd+82sneF9T4foNIXbJtyQw0XavcDgOgb9ziHbllswDaXvoiw8k8f36K p+3EXHOhdxeq3s7aNb9M24MRL/agPTsCMx2J0+VOZOsmJwMi+gawMpyqCaPDUFhw6iFk jaVcZ/DXZEJ16HjjEiARFHAkI4DnrUPALwOikkz/Z3UFjLwAP7ZI/claysgQHBkpL0hX M9gp3lcXl/iqxibGvnbHlY0MSaVQsbauns+0znrqZVoTO+i0HVz9nSPtPgst0vwz/xp9 kA6rAMPTC8Kx9oP8VlHtAfscb2j30JoxEdL7UO8zxcdW+U0zbeW7FKODsT8CFXCEsLe2 VKng== 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:subject:date; bh=/PCHI3p/qP9grLpy6DmQJ16veo0/36gKhqtKUIR+4eA=; b=xKcooXAXZMEYbOr6jV5BGehv7WRIEeusm+riF5ddISfE+i1peG2zIZpOVe0kW7Ct49 WnMNcNO31lwuoqFvndfz4j5i/eM2U5bIvMiMds+MqCla0mmOkV6QRzuosQuQno92lk9U 0uoz9aDKeeX8woo0gi2FZbdEBfrghX7oQstLO8w2mC07Eh6Cm6vqlkiri5Es2bTMWBWJ ZYD3c9VIX8JEbUhYbowDe5utoIqFXXljReMl3WWJbdW357oJ8TNvoqbet7rffc3H0wD9 1HDRR0zL8hiHk7e9MuymufEjwS6jKmDY4Z1q8LTwSyEyt2NmyDBl0eVJC/nXI+fcbSYL uz4A== X-Gm-Message-State: ACgBeo2+kuQaoiUy9+eRjlE3QxCo8gHoEpxmqlFrvw3TDMdSDindc29a CTMnM15z7ZsZShDSc9og5UI4NnWtMLYwuQ== X-Google-Smtp-Source: AA6agR7gS6ArZ3jy+ij2k+sLh7/3wDbe6vuC5U9umniwPTs76+NKBhwHiMs2QGBR3VuqT8MChAo12A== X-Received: by 2002:a05:6a00:2292:b0:538:1d03:9818 with SMTP id f18-20020a056a00229200b005381d039818mr6174039pfe.42.1662594065087; Wed, 07 Sep 2022 16:41:05 -0700 (PDT) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9200:a0f0::1761]) by smtp.gmail.com with ESMTPSA id ij5-20020a170902ab4500b0016c5306917fsm10276495plb.53.2022.09.07.16.41.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 07 Sep 2022 16:41:04 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Cc: Khem Raj Subject: [meta-oe][PATCH 01/22] openldap: Fix configure check for pthread_detach Date: Wed, 7 Sep 2022 16:40:41 -0700 Message-Id: <20220907234102.3312797-1-raj.khem@gmail.com> X-Mailer: git-send-email 2.37.3 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 ; Wed, 07 Sep 2022 23:41:15 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/98691 Signed-off-by: Khem Raj --- ...ure-Pass-pthread_t-to-pthread_detach.patch | 32 +++++++++++++++++++ .../openldap/openldap_2.5.12.bb | 1 + 2 files changed, 33 insertions(+) create mode 100644 meta-oe/recipes-support/openldap/openldap/0001-configure-Pass-pthread_t-to-pthread_detach.patch diff --git a/meta-oe/recipes-support/openldap/openldap/0001-configure-Pass-pthread_t-to-pthread_detach.patch b/meta-oe/recipes-support/openldap/openldap/0001-configure-Pass-pthread_t-to-pthread_detach.patch new file mode 100644 index 0000000000..6e73f8b382 --- /dev/null +++ b/meta-oe/recipes-support/openldap/openldap/0001-configure-Pass-pthread_t-to-pthread_detach.patch @@ -0,0 +1,32 @@ +From 7577b120acda087bf3f5f613c2c72663b3864ad8 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Sun, 4 Sep 2022 09:43:06 -0700 +Subject: [PATCH] configure: Pass pthread_t to pthread_detach + +This helps compilers when using C2X standard + +Upstream-Status: Pending +Signed-off-by: Khem Raj +--- + configure.ac | 5 +---- + 1 file changed, 1 insertion(+), 4 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 0978eeb..58d15f8 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1467,10 +1467,7 @@ pthread_rwlock_t rwlock; + dnl save the flags + AC_LINK_IFELSE([AC_LANG_PROGRAM([[ + #include +-#ifndef NULL +-#define NULL (void*)0 +-#endif +-]], [[pthread_detach(NULL);]])],[ol_cv_func_pthread_detach=yes],[ol_cv_func_pthread_detach=no]) ++]], [[pthread_detach((pthread_t)-1);]])],[ol_cv_func_pthread_detach=yes],[ol_cv_func_pthread_detach=no]) + ]) + + if test $ol_cv_func_pthread_detach = no ; then +-- +2.37.3 + diff --git a/meta-oe/recipes-support/openldap/openldap_2.5.12.bb b/meta-oe/recipes-support/openldap/openldap_2.5.12.bb index c01db08e46..a8ea84d70f 100644 --- a/meta-oe/recipes-support/openldap/openldap_2.5.12.bb +++ b/meta-oe/recipes-support/openldap/openldap_2.5.12.bb @@ -22,6 +22,7 @@ SRC_URI = "http://www.openldap.org/software/download/OpenLDAP/openldap-release/$ file://0001-build-top.mk-unset-STRIP_OPTS.patch \ file://0001-libraries-Makefile.in-ignore-the-mkdir-errors.patch \ file://0001-librewrite-include-ldap_pvt_thread.h-before-redefini.patch \ + file://0001-configure-Pass-pthread_t-to-pthread_detach.patch \ " SRC_URI[sha256sum] = "d5086cbfc49597fa7d0670a429a9054552d441b16ee8b2435412797ab0e37b96" From patchwork Wed Sep 7 23:40:42 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 12471 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 02253C6FA93 for ; Wed, 7 Sep 2022 23:41:16 +0000 (UTC) Received: from mail-pf1-f176.google.com (mail-pf1-f176.google.com [209.85.210.176]) by mx.groups.io with SMTP id smtpd.web12.2737.1662594066644795825 for ; Wed, 07 Sep 2022 16:41:06 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=NyPD0O0o; spf=pass (domain: gmail.com, ip: 209.85.210.176, mailfrom: raj.khem@gmail.com) Received: by mail-pf1-f176.google.com with SMTP id o126so7157400pfb.6 for ; Wed, 07 Sep 2022 16:41:06 -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:subject:date; bh=xzTynCNFfsuZ+Axu5aqps+3Pd9jJPkMQe8D+TkZOKzc=; b=NyPD0O0oQYwWfr5i+oQZ4hw78StTa9ycqAxye6b5tK9A5KjRSXjFQ2Q1TY2ItsQmC0 QnIuH13lOsziHvvPGYwlB8VnCUMz+HrqSoDtQqg6+CvDhjWo8HLAFqaAR2frhtvc+7zY MfpdOOhf9RiMF25pmrPvLuX6ucQJzTSpItYN6gIJnDoR5mvmKzJwJlSpZzbylcwaCrmP IwWn45y4gRYvXCWPO1GgEgJTp9UgND8EUq5UGotq+ckLVoL3V2Avzu4KSjz6yFNcx8Aw b/J+qJ95u1T/E6tZ65Hh2x7f+ZmULRwQQI43CF/10C8VUhqAP5lEjt07B5/ZD+MRrDVc L6fQ== 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 :subject:date; bh=xzTynCNFfsuZ+Axu5aqps+3Pd9jJPkMQe8D+TkZOKzc=; b=m9seY6u+i0m/l/v9RIJu5Mold5P2GFyFJxHPnqy7buHQKIDAh8NiUMBDobcbQgK/7M RjH6ffof7CtpRW+9nzqifDee7wyodHNz6+eAtmdTn0wEIME9WnHyujZtLuQU8A08Nehz XcCzDar44RnxbTu9Lh4e4H+A30I46fODjUmf9I5AemfAJpZHoWlOkoi3acxEp9LbOdKq SdxFuXtgzYa2wdVe7LPKLSgOHRr/d9OZDV89m2XRlMjoWpNPlbimfDQTDexS2GSZY80+ Whr9OM4tleEjdFH5pRzqZBmGtbxjB8rDh7gpFwYvN2lMQVroE3IxQhFugZ0Tpzc7pNCy GfRQ== X-Gm-Message-State: ACgBeo2gLEpH2skPdeOY72wlMFQ0QQWIaGUbxTk0QtPmIolGdek240p4 C7gUguREhKZKU/+8Prd+4Tqz3LuUpvw2uw== X-Google-Smtp-Source: AA6agR7F1suF1+nxpok9IyvSOjVDHhpOyJXefdOsH3AI3CZF+N97AeTFIPmJX0wtmRZprQegNF0TwA== X-Received: by 2002:a62:18ca:0:b0:53e:2588:9e03 with SMTP id 193-20020a6218ca000000b0053e25889e03mr6361477pfy.24.1662594065859; Wed, 07 Sep 2022 16:41:05 -0700 (PDT) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9200:a0f0::1761]) by smtp.gmail.com with ESMTPSA id ij5-20020a170902ab4500b0016c5306917fsm10276495plb.53.2022.09.07.16.41.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 07 Sep 2022 16:41:05 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Cc: Khem Raj Subject: [meta-oe][PATCH 02/22] libimobiledevice: Explicitly pass -D_GNU_SOURCE via cflags Date: Wed, 7 Sep 2022 16:40:42 -0700 Message-Id: <20220907234102.3312797-2-raj.khem@gmail.com> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20220907234102.3312797-1-raj.khem@gmail.com> References: <20220907234102.3312797-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 ; Wed, 07 Sep 2022 23:41:16 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/98692 musl will need this defines for funcitons like asprintf Signed-off-by: Khem Raj --- .../libimobiledevice/libimobiledevice_git.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta-oe/recipes-connectivity/libimobiledevice/libimobiledevice_git.bb b/meta-oe/recipes-connectivity/libimobiledevice/libimobiledevice_git.bb index 3dfd4e90fe..52176872cf 100644 --- a/meta-oe/recipes-connectivity/libimobiledevice/libimobiledevice_git.bb +++ b/meta-oe/recipes-connectivity/libimobiledevice/libimobiledevice_git.bb @@ -17,3 +17,5 @@ S = "${WORKDIR}/git" inherit autotools pkgconfig EXTRA_OECONF = " --without-cython " + +CFLAGS += "-D_GNU_SOURCE" From patchwork Wed Sep 7 23:40:43 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 12474 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 EC23FC6FA92 for ; Wed, 7 Sep 2022 23:41:15 +0000 (UTC) Received: from mail-pj1-f42.google.com (mail-pj1-f42.google.com [209.85.216.42]) by mx.groups.io with SMTP id smtpd.web11.2756.1662594067454241459 for ; Wed, 07 Sep 2022 16:41:07 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=njPAoreq; spf=pass (domain: gmail.com, ip: 209.85.216.42, mailfrom: raj.khem@gmail.com) Received: by mail-pj1-f42.google.com with SMTP id q15-20020a17090a304f00b002002ac83485so563700pjl.0 for ; Wed, 07 Sep 2022 16:41:07 -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:subject:date; bh=FYw3yYdgMvE4oilf9gB9FpyBFH4BDGn1pxMdlFiXcoI=; b=njPAoreqyg4frk1Jq+ermbrrNcSrBnH/NZTkRll+wLCpoJPQoWXalTI0BnEI9OxKKe 7KDRbBUW3xaA/SgrapDtRZ6of4vYbtaPWDoPVeGfK5fNOH5DNUsXBB0Rbzc/X53l8bYU tRyDE74l4O0cG99qnphG+cXivou95/K+M9tAhARy/N7n7zxYE/WofAsqUODUrWrMgZIu JX/iXMoYeJKElxOa9L8wObm/NqL5YZ+bu6j5v8QOj+70S6VD63Lzqw4JW76TJ3+CeGB0 QkBrU1uOUFBw0oYMPOG4PDasWkw/xmjI4o7VQLvXvoAg6s8tzMqgO+bphQ9YnjoBrwQB Ic9w== 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 :subject:date; bh=FYw3yYdgMvE4oilf9gB9FpyBFH4BDGn1pxMdlFiXcoI=; b=LUz+BQZ2qYar3uB+G8bZk5kaoMvQX9v6/l1pF0QqQM5X0qGpeI3BmcO/JLQv17eN6g Yvcqcl8Gp1SiQNaDIvc/vWsbX94xnh3E1qdIBdd2Tr28DuSG9XjUqtbNKt2eg6PovukH 1SUKWwj3m700gQGOw13lmopS0NOoefca93zbWt7RHgysGNYeGbkjNja7Mysgox5yVUpa aef1tfcjqmpQ2ORu/7bHehcl5VUSQtPVLbsZqNKZWsznQShgQ2ahhl0vLvT2hRYcnI90 eqkRpSlshLwca0ZgGnnsUDvJIJHAmyBNlDsmqi1G5HDgGSxpm1+ht/rVrEvWSYMRlC3/ szLQ== X-Gm-Message-State: ACgBeo0i544cO9o0FPo+PNINLTpLb8IplU9aDxpXuaJVyeF3en+YMgIP +mh5fDvuCXEPyqF/BeaTwqQO8ElJOwXjpQ== X-Google-Smtp-Source: AA6agR6ZKKfzGpIMob2HbPoMg0hRiZd6rtopxpcprTZzvJgFoQuAp7mlNpMMWGb8eND7xyRI6Aw2iQ== X-Received: by 2002:a17:90a:b00f:b0:1f7:67c6:5df5 with SMTP id x15-20020a17090ab00f00b001f767c65df5mr967591pjq.59.1662594066641; Wed, 07 Sep 2022 16:41:06 -0700 (PDT) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9200:a0f0::1761]) by smtp.gmail.com with ESMTPSA id ij5-20020a170902ab4500b0016c5306917fsm10276495plb.53.2022.09.07.16.41.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 07 Sep 2022 16:41:06 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Cc: Khem Raj Subject: [meta-oe][PATCH 03/22] jq: Upgrade to latest and fix configure tests Date: Wed, 7 Sep 2022 16:40:43 -0700 Message-Id: <20220907234102.3312797-3-raj.khem@gmail.com> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20220907234102.3312797-1-raj.khem@gmail.com> References: <20220907234102.3312797-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 ; Wed, 07 Sep 2022 23:41:15 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/98693 Signed-off-by: Khem Raj --- ...XOPEN_SOURCE-when-checking-for-strpt.patch | 40 +++++++++++++++++++ ...ace-_BSD_SOURCE-with-_DEFAULT_SOURCE.patch | 30 ++++++++++++++ meta-oe/recipes-devtools/jq/jq_git.bb | 7 +++- 3 files changed, 75 insertions(+), 2 deletions(-) create mode 100644 meta-oe/recipes-devtools/jq/jq/0001-configure-Pass-_XOPEN_SOURCE-when-checking-for-strpt.patch create mode 100644 meta-oe/recipes-devtools/jq/jq/0002-builtin-Replace-_BSD_SOURCE-with-_DEFAULT_SOURCE.patch diff --git a/meta-oe/recipes-devtools/jq/jq/0001-configure-Pass-_XOPEN_SOURCE-when-checking-for-strpt.patch b/meta-oe/recipes-devtools/jq/jq/0001-configure-Pass-_XOPEN_SOURCE-when-checking-for-strpt.patch new file mode 100644 index 0000000000..e4d6ebb45b --- /dev/null +++ b/meta-oe/recipes-devtools/jq/jq/0001-configure-Pass-_XOPEN_SOURCE-when-checking-for-strpt.patch @@ -0,0 +1,40 @@ +From 40bbd419ad8d1bd9cbe8b17063c323f8a40ab327 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Tue, 6 Sep 2022 09:59:31 -0700 +Subject: [PATCH 1/2] configure: Pass _XOPEN_SOURCE when checking for strptime + +Include sys/time.h for gettimeofday since thats where its in glibc + +Upstream-Status: Submitted [https://github.com/stedolan/jq/pull/2480] +Signed-off-by: Khem Raj +--- + configure.ac | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index a2cd99e..95afe06 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -139,7 +139,10 @@ AC_FUNC_ALLOCA + + AC_FIND_FUNC([isatty], [c], [#include ], [0]) + AC_FIND_FUNC([_isatty], [c], [#include ], [0]) ++OLD_CFLAGS=$CFLAGS ++CFLAGS="$CFLAGS -D_XOPEN_SOURCE" + AC_FIND_FUNC([strptime], [c], [#include ], [0, 0, 0]) ++CFLAGS=$OLD_CFLAGS + AC_FIND_FUNC([strftime], [c], [#include ], [0, 0, 0, 0]) + AC_FIND_FUNC([setenv], [c], [#include ], [0, 0, 0]) + AC_FIND_FUNC([timegm], [c], [#include ], [0]) +@@ -147,7 +150,7 @@ AC_FIND_FUNC([gmtime_r], [c], [#include ], [0, 0]) + AC_FIND_FUNC([gmtime], [c], [#include ], [0]) + AC_FIND_FUNC([localtime_r], [c], [#include ], [0, 0]) + AC_FIND_FUNC([localtime], [c], [#include ], [0]) +-AC_FIND_FUNC([gettimeofday], [c], [#include ], [0, 0]) ++AC_FIND_FUNC([gettimeofday], [c], [#include ], [0, 0]) + AC_CHECK_MEMBER([struct tm.tm_gmtoff], [AC_DEFINE([HAVE_TM_TM_GMT_OFF],1,[Define to 1 if the system has the tm_gmt_off field in struct tm])], + [], [[#include ]]) + AC_CHECK_MEMBER([struct tm.__tm_gmtoff], [AC_DEFINE([HAVE_TM___TM_GMT_OFF],1,[Define to 1 if the system has the __tm_gmt_off field in struct tm])], +-- +2.37.3 + diff --git a/meta-oe/recipes-devtools/jq/jq/0002-builtin-Replace-_BSD_SOURCE-with-_DEFAULT_SOURCE.patch b/meta-oe/recipes-devtools/jq/jq/0002-builtin-Replace-_BSD_SOURCE-with-_DEFAULT_SOURCE.patch new file mode 100644 index 0000000000..d2f999a728 --- /dev/null +++ b/meta-oe/recipes-devtools/jq/jq/0002-builtin-Replace-_BSD_SOURCE-with-_DEFAULT_SOURCE.patch @@ -0,0 +1,30 @@ +From cda1734bed3b048c01452c798877d05b8c2f4c15 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Tue, 6 Sep 2022 10:00:59 -0700 +Subject: [PATCH 2/2] builtin: Replace _BSD_SOURCE with _DEFAULT_SOURCE + +newer glibc has remove _BSD_SOURCE and wants it to be replaced with _DEFAULT_SOURCE + +Fixes +/usr/include/features.h:194:3: warning: "_BSD_SOURCE and _SVID_SOURCE are deprecated, use _DEFAULT_SOURCE" [-W#warnings] +warning "_BSD_SOURCE and _SVID_SOURCE are deprecated, use _DEFAULT_SOURCE" + +Uptream-Status: Submitted [https://github.com/stedolan/jq/pull/2480] +Signed-off-by: Khem Raj +--- + src/builtin.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/builtin.c b/src/builtin.c +index 1c6b08c..2a31496 100644 +--- a/src/builtin.c ++++ b/src/builtin.c +@@ -1,4 +1,4 @@ +-#define _BSD_SOURCE ++#define _DEFAULT_SOURCE + #define _GNU_SOURCE + #ifndef __sun__ + # define _XOPEN_SOURCE +-- +2.37.3 + diff --git a/meta-oe/recipes-devtools/jq/jq_git.bb b/meta-oe/recipes-devtools/jq/jq_git.bb index 8b0218c83e..f69b435e51 100644 --- a/meta-oe/recipes-devtools/jq/jq_git.bb +++ b/meta-oe/recipes-devtools/jq/jq_git.bb @@ -9,8 +9,11 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=2814b59e00e7918c864fa3b6bbe049b4" PV = "1.6+git${SRCPV}" -SRC_URI = "git://github.com/stedolan/jq;protocol=https;branch=master" -SRCREV = "a9f97e9e61a910a374a5d768244e8ad63f407d3e" +SRC_URI = "git://github.com/stedolan/jq;protocol=https;branch=master \ + file://0001-configure-Pass-_XOPEN_SOURCE-when-checking-for-strpt.patch \ + file://0002-builtin-Replace-_BSD_SOURCE-with-_DEFAULT_SOURCE.patch \ + " +SRCREV = "cff5336ec71b6fee396a95bb0e4bea365e0cd1e8" S = "${WORKDIR}/git" inherit autotools-brokensep From patchwork Wed Sep 7 23:40:44 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 12472 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 E7D26C6FA8E for ; Wed, 7 Sep 2022 23:41:15 +0000 (UTC) Received: from mail-pl1-f173.google.com (mail-pl1-f173.google.com [209.85.214.173]) by mx.groups.io with SMTP id smtpd.web09.2842.1662594068352123264 for ; Wed, 07 Sep 2022 16:41:08 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=hdn4yvwH; spf=pass (domain: gmail.com, ip: 209.85.214.173, mailfrom: raj.khem@gmail.com) Received: by mail-pl1-f173.google.com with SMTP id u22so16076294plq.12 for ; Wed, 07 Sep 2022 16:41:08 -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:subject:date; bh=Zc4c8v4qMh3q5deGLPxq2quTctJ6iq+1A5RYGKzlIew=; b=hdn4yvwHHaj5oNsxXjD43aSzNp73vi73xu509SAZoE22UXrspLO1+L3yLbQW4DtmfU FQJtMD/049wJj5Wu10afUbRCOGfdphHP/oqME+qo2r5UOayOMx7gFeqrSPdOcZDeVwmm UCI1IZwOWm8QSIGNFTyn1MQWMGewW9bJm36AhQ3ORCf49c9TofA/nsL0NhSGSgU2/vxC bWYrPpf98KHwUJl/2DMXqXa76QqH3sEEd8fgWRGFQkOGIf4OAXsunvV2q+PPK3E0stMe 3kHR33Gec5PAUofjx2CObVEIujcseISX/rqBIEp7CFikbHxk6M0TRtKReJvQ1TnzOU81 x3KA== 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 :subject:date; bh=Zc4c8v4qMh3q5deGLPxq2quTctJ6iq+1A5RYGKzlIew=; b=2c/Exxks0VtGHiwG4EsfV96FVcswYoW1BfistpTlWKxeYEgZk6mRFCf2kdg1a0GM/l qjlKS4zVRrO/sjfJ0Szlt9/RQzm9ypENFTrl3h7cDx3NIRQcF5BxwkUsJrYJ0WSYg2na dsnFufk56oWZRaVuEnkBW9NNSzVFs32GHLsBW9Qwmr/7HDfx6hmfZ2v+00+KLOMPNkNx 1apgtMw5NRlUzhpBZz5JXD068FvNUZp0AVZ17TkRH/Asj3JzL+c+ZvkgHVY/yOoLOVF7 xSlWFIY458XIYE3HaFhuhxUPsLvZvbGjdJZDWzhQyptYsIlC1IxnWU9kJ/jRjUIzp1v2 EWDg== X-Gm-Message-State: ACgBeo2iv92TC1J6Rcab9WlQuRl56vY4Hv5gIADB4ChognM81z/5Fmyf yMnsWBuLlU9TRZGpjf6Di5kKkiwqxfkK/g== X-Google-Smtp-Source: AA6agR5uBp6XCy2WGM6882ET+4mgfwSuujAsstGT2E0JDp3/IfEnqiy9taT9iOIhZtU/gnYI1090ww== X-Received: by 2002:a17:902:e552:b0:16c:571d:fc08 with SMTP id n18-20020a170902e55200b0016c571dfc08mr6064563plf.151.1662594067599; Wed, 07 Sep 2022 16:41:07 -0700 (PDT) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9200:a0f0::1761]) by smtp.gmail.com with ESMTPSA id ij5-20020a170902ab4500b0016c5306917fsm10276495plb.53.2022.09.07.16.41.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 07 Sep 2022 16:41:07 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Cc: Khem Raj Subject: [meta-oe][PATCH 04/22] lcdproc: Fix build on non-x86 and arm architectures Date: Wed, 7 Sep 2022 16:40:44 -0700 Message-Id: <20220907234102.3312797-4-raj.khem@gmail.com> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20220907234102.3312797-1-raj.khem@gmail.com> References: <20220907234102.3312797-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 ; Wed, 07 Sep 2022 23:41:15 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/98694 Signed-off-by: Khem Raj --- .../0001-Fix-compilation-with-GCC-10.x.patch | 7 ----- .../0003-Fix-non-x86-platforms-on-musl.patch | 28 ++++++++++++++----- 2 files changed, 21 insertions(+), 14 deletions(-) diff --git a/meta-oe/dynamic-layers/meta-python/recipes-extended/lcdproc/lcdproc/0001-Fix-compilation-with-GCC-10.x.patch b/meta-oe/dynamic-layers/meta-python/recipes-extended/lcdproc/lcdproc/0001-Fix-compilation-with-GCC-10.x.patch index 35634dd9ba..cd8a69c3fb 100644 --- a/meta-oe/dynamic-layers/meta-python/recipes-extended/lcdproc/lcdproc/0001-Fix-compilation-with-GCC-10.x.patch +++ b/meta-oe/dynamic-layers/meta-python/recipes-extended/lcdproc/lcdproc/0001-Fix-compilation-with-GCC-10.x.patch @@ -16,8 +16,6 @@ Signed-off-by: Harald Geyer clients/lcdproc/iface.h | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) -diff --git a/clients/lcdproc/iface.c b/clients/lcdproc/iface.c -index 40e50cb7..1ac355bd 100644 --- a/clients/lcdproc/iface.c +++ b/clients/lcdproc/iface.c @@ -32,6 +32,7 @@ @@ -28,8 +26,6 @@ index 40e50cb7..1ac355bd 100644 static int iface_count = 0; /* number of interfaces */ static char unit_label[10] = "B"; /* default unit label is Bytes */ -diff --git a/clients/lcdproc/iface.h b/clients/lcdproc/iface.h -index cc6dbaaf..c1bd6b5b 100644 --- a/clients/lcdproc/iface.h +++ b/clients/lcdproc/iface.h @@ -18,7 +18,7 @@ @@ -41,6 +37,3 @@ index cc6dbaaf..c1bd6b5b 100644 /** Update screen content */ int iface_screen(int rep, int display, int *flags_ptr); --- -2.28.0 - diff --git a/meta-oe/dynamic-layers/meta-python/recipes-extended/lcdproc/lcdproc/0003-Fix-non-x86-platforms-on-musl.patch b/meta-oe/dynamic-layers/meta-python/recipes-extended/lcdproc/lcdproc/0003-Fix-non-x86-platforms-on-musl.patch index e39e9bda14..eed9ceee5e 100644 --- a/meta-oe/dynamic-layers/meta-python/recipes-extended/lcdproc/lcdproc/0003-Fix-non-x86-platforms-on-musl.patch +++ b/meta-oe/dynamic-layers/meta-python/recipes-extended/lcdproc/lcdproc/0003-Fix-non-x86-platforms-on-musl.patch @@ -17,19 +17,33 @@ Signed-off-by: Khem Raj server/drivers/port.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/server/drivers/port.h b/server/drivers/port.h -index c584cd4e..bde235b3 100644 --- a/server/drivers/port.h +++ b/server/drivers/port.h -@@ -94,7 +94,7 @@ static inline int port_deny_multiple(unsigned short port, unsigned short count); +@@ -94,7 +94,7 @@ static inline int port_deny_multiple(uns /* ---------------------------- Linux ------------------------------------ */ /* Use ioperm, inb and outb in (Linux) */ /* And iopl for higher addresses of PCI LPT cards */ -#if defined HAVE_IOPERM -+#if defined(__GLIBC__) || (defined(__x86__) || defined(__x86_64__)) ++#if HAVE_INB /* Glibc2 and Glibc1 */ # ifdef HAVE_SYS_IO_H --- -2.24.1 - +@@ -333,7 +333,7 @@ static inline int port_deny_multiple (un + return i386_set_ioperm(port, count, 0); + } + +-#else ++#elif defined(__x86__) && defined(__x86_64__) + + /* ------------------------- Everything else ----------------------------- */ + /* Last chance! Use /dev/io and i386 ASM code (BSD4.3 ?) */ +--- a/configure.ac ++++ b/configure.ac +@@ -144,6 +144,7 @@ AC_CHECK_LIB(i386, i386_get_ioperm, + [])] + ) + ++AC_CHECK_FUNCS(inb) + AC_CHECK_FUNCS(iopl) + AC_CHECK_FUNCS(ioperm) + AC_CHECK_HEADERS(sys/io.h) From patchwork Wed Sep 7 23:40:45 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 12473 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 E9D4FC6FA91 for ; Wed, 7 Sep 2022 23:41:15 +0000 (UTC) Received: from mail-pl1-f170.google.com (mail-pl1-f170.google.com [209.85.214.170]) by mx.groups.io with SMTP id smtpd.web12.2738.1662594069120675124 for ; Wed, 07 Sep 2022 16:41:09 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=hWG5fZnC; spf=pass (domain: gmail.com, ip: 209.85.214.170, mailfrom: raj.khem@gmail.com) Received: by mail-pl1-f170.google.com with SMTP id x1so11760119plv.5 for ; Wed, 07 Sep 2022 16:41:09 -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:subject:date; bh=ZqBMUYp5x5r9yQnu7SWbd97UWpptZCjzqEs7CUZHpCA=; b=hWG5fZnCG+yQlB8FFZignwqYE//Y5+VRw05jnIchK7rGv8cbtWV17m8fUyD+0YOxS0 Ce18n1rC/OLMCdHBAgMEKtqHM589ob2FKS+vDmLuf3bCaZdWP7QQwrJ0sP+o37UvMo68 fW9hHXrmnaL38G/yXCxx76pHE77/qsP9Oi69PIDXtegKb7NX1ozEc2OFYCbNrmXfUzYJ MAZwsvHLZH2npJRkDDuoX3vta9DblhaL83+9mWNVmrArpkZiYyXIuJv0B/OcvWFhLFHX Q/BzvARWH4XTg0nhhs2dYU+cy077sY4Nq7QkOmcHnQPKCpVLyHb8HL1XypqKCmENUUmG ZpaQ== 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 :subject:date; bh=ZqBMUYp5x5r9yQnu7SWbd97UWpptZCjzqEs7CUZHpCA=; b=IJ5V0cSnzj/0ZT3EyO02ZMLrVQHsOSev5wqwyk8KmU9f9e2TIrO7JzsF5a6Y/BIVt5 ta8qxkqRGtcq2bTySOASyGm0RUmRtVVNo/VaBhJfOyMtOPFz8fNzY0B4M1b7FlGbg7TZ hZgBd8Qp4iPwJ8sxjyUihNUDmrWfKUX8VzEkqmze0gRYrzQ2gN/Ag3AWTxzjS0k+yB4n WBFSYQuQFQj/lROSy5Ics69tHdR7KhbxLnEQf9Dxs2SXyiGY/FEVnhsmdlagpIXzbxtY iJFqje0+GAHgdDAHnEqyM/maPskiAWjaSHz2qpZPSVeDCunWLr3+2q/d3Bna04EzeClT DFTg== X-Gm-Message-State: ACgBeo3PYGsA8smbMZCtRB0sxQhM5CORaOGTzoRthQ1bbINwbBjtSON8 3+k9bhqWsdP+pr+G5ym3uYbPBkByNI9dWQ== X-Google-Smtp-Source: AA6agR6RcIJMM8ig6iHG5moQrgdRQMXmZs+5m1Vdg8hrSd+JrevRZN2BvroFVbq3grZUkeGt7kBBHQ== X-Received: by 2002:a17:902:f650:b0:172:8ee1:7f40 with SMTP id m16-20020a170902f65000b001728ee17f40mr6368106plg.101.1662594068384; Wed, 07 Sep 2022 16:41:08 -0700 (PDT) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9200:a0f0::1761]) by smtp.gmail.com with ESMTPSA id ij5-20020a170902ab4500b0016c5306917fsm10276495plb.53.2022.09.07.16.41.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 07 Sep 2022 16:41:08 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Cc: Khem Raj Subject: [meta-oe][PATCH 05/22] libsmi: Define _DEFAULT_SOURCE for timegm API Date: Wed, 7 Sep 2022 16:40:45 -0700 Message-Id: <20220907234102.3312797-5-raj.khem@gmail.com> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20220907234102.3312797-1-raj.khem@gmail.com> References: <20220907234102.3312797-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 ; Wed, 07 Sep 2022 23:41:15 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/98695 Signed-off-by: Khem Raj --- ...1-parser-yang-Define-_DEFAULT_SOURCE.patch | 28 +++++++++++++++++++ .../recipes-support/libsmi/libsmi_0.5.0.bb | 1 + 2 files changed, 29 insertions(+) create mode 100644 meta-oe/recipes-support/libsmi/libsmi/0001-parser-yang-Define-_DEFAULT_SOURCE.patch diff --git a/meta-oe/recipes-support/libsmi/libsmi/0001-parser-yang-Define-_DEFAULT_SOURCE.patch b/meta-oe/recipes-support/libsmi/libsmi/0001-parser-yang-Define-_DEFAULT_SOURCE.patch new file mode 100644 index 0000000000..9354a889a0 --- /dev/null +++ b/meta-oe/recipes-support/libsmi/libsmi/0001-parser-yang-Define-_DEFAULT_SOURCE.patch @@ -0,0 +1,28 @@ +From 86b706f694b822d8028fd36320147767056d2ffa Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Tue, 6 Sep 2022 12:09:00 -0700 +Subject: [PATCH] parser-yang: Define _DEFAULT_SOURCE + +This is needed for timegm API + +Upstream-Status: Pending +Signed-off-by: Khem Raj +--- + lib/parser-yang.y | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/lib/parser-yang.y b/lib/parser-yang.y +index b111607..0ded9d2 100644 +--- a/lib/parser-yang.y ++++ b/lib/parser-yang.y +@@ -21,6 +21,7 @@ + #ifdef BACKEND_YANG + + #define _ISOC99_SOURCE ++#define _DEFAULT_SOURCE + #include + #include + #include +-- +2.37.3 + diff --git a/meta-oe/recipes-support/libsmi/libsmi_0.5.0.bb b/meta-oe/recipes-support/libsmi/libsmi_0.5.0.bb index 53c59de78a..33e1b6fabd 100644 --- a/meta-oe/recipes-support/libsmi/libsmi_0.5.0.bb +++ b/meta-oe/recipes-support/libsmi/libsmi_0.5.0.bb @@ -8,6 +8,7 @@ SRC_URI = "https://www.ibr.cs.tu-bs.de/projects/${BPN}/download/${BP}.tar.gz \ file://smi.conf \ file://libsmi-fix-the-test-dump-files.patch \ file://0001-Define-createIdentifierRef-prototype-in-yang-complex.patch \ + file://0001-parser-yang-Define-_DEFAULT_SOURCE.patch \ " SRC_URI[md5sum] = "4bf47483c06c9f07d1b10fbc74eddf11" From patchwork Wed Sep 7 23:40:46 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 12468 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 D9EA4C6FA8B for ; Wed, 7 Sep 2022 23:41:15 +0000 (UTC) Received: from mail-pf1-f178.google.com (mail-pf1-f178.google.com [209.85.210.178]) by mx.groups.io with SMTP id smtpd.web08.2769.1662594069926655663 for ; Wed, 07 Sep 2022 16:41:10 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=NUhz8u67; spf=pass (domain: gmail.com, ip: 209.85.210.178, mailfrom: raj.khem@gmail.com) Received: by mail-pf1-f178.google.com with SMTP id 65so5925512pfx.0 for ; Wed, 07 Sep 2022 16:41:09 -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:subject:date; bh=vLqPsfTJzJjo4m1ZvVG5W79NzJ9HYrMGClBKMViTv/c=; b=NUhz8u67C5AA2gyCZlKz2asIk1iZGIsFhmfpsqEe/QO8HJQyxkWhOLQw9d95MHRMwe 6I4V3HJKV/M3jhAvToVlTwyqPHeItZjoEy2qtfA7n+gWZjuF5erugw8u0bfmEfxkNY1V pmFFFYpJQgC2uqe6zY/FtQyZLmSWcD9PyktxJyYiYTvCQTyjLKr0xz7b8JOnO2HYlgWS yDHlkAQZ8Vm15JRmpNm6A5mcjfFzt5bRMhLbA2lDh/WIa31d+OPPNLmPVmxgZAE8TrzI AXwPCNgCKEkKl5/e2gLZQTtJ415dhdjAt5UpdeU2tBZjqVk3lUveEcmCPUC5pzOgEbWt Axfg== 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 :subject:date; bh=vLqPsfTJzJjo4m1ZvVG5W79NzJ9HYrMGClBKMViTv/c=; b=eGg1CYnO90ro+4cWiJBvoCy99dwdwNx+wCyo04BAaDZ4TmW4GK1x2Q8/3IK6au/uJO I0k8Rra7p5kyjZVl23qACUyyW2piFcvFgJtJvyZhJrdSNpIuv649amaQwAjtMHS9kPA9 FALE9bMR2arAdAeTOBfqNvj71yI2cQu8Tc0k3Z7fPahta6rxbL8cTatjfI+B9yHWblh0 XwEdEXBKZZTsIHwghxhrXzl6Mvy1tLFXbfV7lEI12gHxUnD7nPijpmjApHHRWZwIEyNF fEuglOX9jzAfsIj/gUmMd7wDHkmz9kCHxtZzoVDuM+o6N9y4045oMwVYPM7gQggUZZ3V YHgQ== X-Gm-Message-State: ACgBeo32K47UPgadelwfoSegC5fSyh/Qd+jOwoE2S215ROayNZ3Lhf1j 5tp/TXpiBhqIyHTtsEtkXebvdyzEyczenw== X-Google-Smtp-Source: AA6agR4DxRsFskpNxyitgzVfGN+j+00F7kUqazSIf7vVUgltCmVApFduR56eByZpuP86pOSO6DOzwQ== X-Received: by 2002:a05:6a00:4c85:b0:538:5500:4873 with SMTP id eb5-20020a056a004c8500b0053855004873mr6350957pfb.81.1662594069184; Wed, 07 Sep 2022 16:41:09 -0700 (PDT) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9200:a0f0::1761]) by smtp.gmail.com with ESMTPSA id ij5-20020a170902ab4500b0016c5306917fsm10276495plb.53.2022.09.07.16.41.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 07 Sep 2022 16:41:08 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Cc: Khem Raj Subject: [meta-networking][PATCH 06/22] tftp-hpa: Fix includes for bsd_signal() Date: Wed, 7 Sep 2022 16:40:46 -0700 Message-Id: <20220907234102.3312797-6-raj.khem@gmail.com> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20220907234102.3312797-1-raj.khem@gmail.com> References: <20220907234102.3312797-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 ; Wed, 07 Sep 2022 23:41:15 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/98696 Signed-off-by: Khem Raj --- ...-Remove-double-inclusion-of-signal.h.patch | 39 +++++++++++++++++++ .../recipes-daemons/tftp-hpa/tftp-hpa_5.2.bb | 1 + 2 files changed, 40 insertions(+) create mode 100644 meta-networking/recipes-daemons/tftp-hpa/files/0001-tftp-Remove-double-inclusion-of-signal.h.patch diff --git a/meta-networking/recipes-daemons/tftp-hpa/files/0001-tftp-Remove-double-inclusion-of-signal.h.patch b/meta-networking/recipes-daemons/tftp-hpa/files/0001-tftp-Remove-double-inclusion-of-signal.h.patch new file mode 100644 index 0000000000..84658d667b --- /dev/null +++ b/meta-networking/recipes-daemons/tftp-hpa/files/0001-tftp-Remove-double-inclusion-of-signal.h.patch @@ -0,0 +1,39 @@ +From e9ed48d91642d384ce07cbb9bec788f07fc6354c Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Tue, 6 Sep 2022 14:51:42 -0700 +Subject: [PATCH] tftp: Remove double inclusion of signal.h + +Undefine __USE_XOPEN2K8 so we can get bsd_signal definition from system +headers + +Upstream-Status: Pending +Signed-off-by: Khem Raj +--- + config.h | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/config.h b/config.h +index 3ff2915..ae1a14b 100644 +--- a/config.h ++++ b/config.h +@@ -93,7 +93,6 @@ + #endif + + #include +-#include + + #ifdef HAVE_SYS_SOCKET_H + #include +@@ -296,6 +295,9 @@ char *xstrdup(const char *); + + #ifndef HAVE_BSD_SIGNAL + void (*bsd_signal(int, void (*)(int))) (int); ++#else ++#undef __USE_XOPEN2K8 ++#include + #endif + #ifndef HAVE_DUP2 + int dup2(int, int); +-- +2.37.3 + diff --git a/meta-networking/recipes-daemons/tftp-hpa/tftp-hpa_5.2.bb b/meta-networking/recipes-daemons/tftp-hpa/tftp-hpa_5.2.bb index af42bda93c..565f493ce2 100644 --- a/meta-networking/recipes-daemons/tftp-hpa/tftp-hpa_5.2.bb +++ b/meta-networking/recipes-daemons/tftp-hpa/tftp-hpa_5.2.bb @@ -29,6 +29,7 @@ SRC_URI = "http://kernel.org/pub/software/network/tftp/tftp-hpa/tftp-hpa-${PV}.t file://fix-writing-emtpy-file.patch \ file://0001-__progname-is-provided-by-libc.patch \ file://0001-tftp-Mark-toplevel-definition-as-external.patch \ + file://0001-tftp-Remove-double-inclusion-of-signal.h.patch \ file://tftpd-hpa.socket \ file://tftpd-hpa.service \ " From patchwork Wed Sep 7 23:40:47 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 12470 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 DC50EC6FA89 for ; Wed, 7 Sep 2022 23:41:15 +0000 (UTC) Received: from mail-pl1-f178.google.com (mail-pl1-f178.google.com [209.85.214.178]) by mx.groups.io with SMTP id smtpd.web09.2844.1662594070794028296 for ; Wed, 07 Sep 2022 16:41:10 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=fU3gIK8F; spf=pass (domain: gmail.com, ip: 209.85.214.178, mailfrom: raj.khem@gmail.com) Received: by mail-pl1-f178.google.com with SMTP id d12so16113141plr.6 for ; Wed, 07 Sep 2022 16:41:10 -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:subject:date; bh=Bz5Ud1fLt1polYXaOgWS9jnm57hQyNVxhUKYAlkxxJI=; b=fU3gIK8FYkZyaAypxtCnCWydRVHM5MoS4GdgvPG1o4/9v3WehD3DeRQYrSn29cEuvn 4j9Dvs6bKJiGU+fkd4ba07KcUkAJHPgc8cs3w4OKWX0NObfFhQ//TaK0w/xBauKCWyjA 3W/HbyYJhy7Z1E/Mi0SUENcwhh3TTkwSwEGeme8NBwC0SoJ/JFsBH9/HpFYWdWMI5OBP 4GB06iWE5E3cy9VpZfBjZouBXhcwpPGXp7PCt9CZ4lXcYhVV3mih2YrgPJImAbWXEEYV BynndOXhZppst+KdHncjCwSnhswc8bfXmhvOv2g/M9P3e+jzydEZjCHPc1u4Q8+jVxxj GOmQ== 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 :subject:date; bh=Bz5Ud1fLt1polYXaOgWS9jnm57hQyNVxhUKYAlkxxJI=; b=rRRsHfFaqIwlK2sk0jQhYlCazXzr5kqX+Yb6HAUJtTar9At4cKSOQptSxsfm39CWyp rbPu4HGmMw1p25ydLVFBWIGUdqdJEeXktpf6nAeXceCNG4nSX8oTyIbLfwVyCbs734Ey nMHDCnSwxwSXbEK09Tn+JfOBBNq1xVdp87hheBsV0xJ2g7QmR/M1OUfb1TB3qHoygFRO tUGySPPx7gvoRRxTOOFhYB13q+1EiabDSI3V18H9e6yHxcJgLB2Sk5A3fZDWmD3Jrlwk vLZHh27yCdHL1hyBFW+uKhT0BCG0h/WHhNYPMSEg0mzIfupP8j+Boodej8xO8TLGjo6K sBog== X-Gm-Message-State: ACgBeo158DThj9zd3GIbS+S3idBPHkr+k8uKAT093CB6qH+ZnhbLpOAA ARsrkaXGQzRC46nC8MPAmxGxQEr3ZXOGeQ== X-Google-Smtp-Source: AA6agR7FT7xwSa3oEZ5uY8aZPudtXtGnWrg/w9UpyLd0x4hRDbJWIe62FceQdX3739+vAtOXDhYZIw== X-Received: by 2002:a17:903:41c3:b0:176:b990:6c28 with SMTP id u3-20020a17090341c300b00176b9906c28mr6137043ple.94.1662594070041; Wed, 07 Sep 2022 16:41:10 -0700 (PDT) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9200:a0f0::1761]) by smtp.gmail.com with ESMTPSA id ij5-20020a170902ab4500b0016c5306917fsm10276495plb.53.2022.09.07.16.41.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 07 Sep 2022 16:41:09 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Cc: Khem Raj Subject: [meta-oe][PATCH 07/22] sblim-sfcb: Include config.h before using CONFIG_ERROR_H Date: Wed, 7 Sep 2022 16:40:47 -0700 Message-Id: <20220907234102.3312797-7-raj.khem@gmail.com> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20220907234102.3312797-1-raj.khem@gmail.com> References: <20220907234102.3312797-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 ; Wed, 07 Sep 2022 23:41:15 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/98697 Fix use before definition case. Signed-off-by: Khem Raj --- ...d-for-error.h-when-it-does-not-exist.patch | 27 +++++++++---------- 1 file changed, 12 insertions(+), 15 deletions(-) diff --git a/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb/0001-Replace-need-for-error.h-when-it-does-not-exist.patch b/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb/0001-Replace-need-for-error.h-when-it-does-not-exist.patch index e723050237..9bb9f44344 100644 --- a/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb/0001-Replace-need-for-error.h-when-it-does-not-exist.patch +++ b/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb/0001-Replace-need-for-error.h-when-it-does-not-exist.patch @@ -16,8 +16,6 @@ Upstream-Status: Pending trace.c | 4 +++- 5 files changed, 24 insertions(+), 5 deletions(-) -diff --git a/brokerUpc.c b/brokerUpc.c -index 17cbd9b..fe2b347 100644 --- a/brokerUpc.c +++ b/brokerUpc.c @@ -20,8 +20,11 @@ @@ -33,8 +31,6 @@ index 17cbd9b..fe2b347 100644 #include "support.h" #include "native.h" #include -diff --git a/configure.ac b/configure.ac -index ab2964e..d4915a1 100644 --- a/configure.ac +++ b/configure.ac @@ -517,7 +517,7 @@ fi @@ -46,8 +42,6 @@ index ab2964e..d4915a1 100644 AC_CHECK_HEADERS([cmpi/cmpimacs.h cmpi/cmpift.h cmpi/cmpidt.h],[],[AC_MSG_ERROR([Could not find required CPMI header.])]) # Checks for typedefs, structures, and compiler characteristics. -diff --git a/httpAdapter.c b/httpAdapter.c -index 2719e6c..e768972 100644 --- a/httpAdapter.c +++ b/httpAdapter.c @@ -71,7 +71,9 @@ @@ -61,11 +55,15 @@ index 2719e6c..e768972 100644 /* should probably go into cimRequest.h */ #define CIM_PROTOCOL_ANY 0 #define CIM_PROTOCOL_CIM_XML 1 -diff --git a/support.c b/support.c -index c7bba8b..5b3eef1 100644 --- a/support.c +++ b/support.c -@@ -32,7 +32,11 @@ +@@ -27,16 +27,20 @@ + * @sa native.h + */ + ++#include "config.h" + #include + #include #include "support.h" #include #include @@ -77,7 +75,11 @@ index c7bba8b..5b3eef1 100644 #include #include "native.h" #include "trace.h" -@@ -331,17 +335,25 @@ loadQualifierDeclMI(const char *provider, +-#include "config.h" + #include "control.h" + #include + +@@ -331,17 +335,25 @@ loadQualifierDeclMI(const char *provider _SFCB_RETURN(NULL); }; @@ -104,8 +106,6 @@ index c7bba8b..5b3eef1 100644 /** * flag to ensure MM is initialized only once */ -diff --git a/trace.c b/trace.c -index d7f30db..438af46 100644 --- a/trace.c +++ b/trace.c @@ -279,7 +279,9 @@ _sfcb_trap(int tn) @@ -119,6 +119,3 @@ index d7f30db..438af46 100644 sigHandler * setSignal(int sn, sigHandler * sh, int flags) { --- -2.14.1 - From patchwork Wed Sep 7 23:40:48 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 12469 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 DA5F4C6FA8D for ; Wed, 7 Sep 2022 23:41:15 +0000 (UTC) Received: from mail-pf1-f176.google.com (mail-pf1-f176.google.com [209.85.210.176]) by mx.groups.io with SMTP id smtpd.web11.2758.1662594071811253627 for ; Wed, 07 Sep 2022 16:41:11 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=PBdqQqHo; spf=pass (domain: gmail.com, ip: 209.85.210.176, mailfrom: raj.khem@gmail.com) Received: by mail-pf1-f176.google.com with SMTP id y136so11211176pfb.3 for ; Wed, 07 Sep 2022 16:41:11 -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:subject:date; bh=bdZwj+Gr+YOUjlKjTfgFEt1yEzjoozqKYpN3jU7stL4=; b=PBdqQqHo/19oH92+ai+v3GRWZEcTEksMj5T7SV8qP4HYeTezmgm8NLy3zHYGHM5seU 2VtkQpV5vFo7T+lpik/tB/tvLVIC9i/B5F79pTB7LSnpLj3UFT3COb3k8zSuNDcOqMk7 KoBIXqexNXzcIRJhgQ1YmXBM9eOiottDdMvBhPQU5uQgApbwQxHWrWWyesegt73iE0Q1 X2I8t+EBbxt35h5KDxKqIyamJ47ZgCQbQbf4jDIcRMSM9sboMyQgK4G/zaSTTqQM47na 9e32+zzn4fea+DBUqqEJ5vy3jByT+loCjwixJ7pJ7FKWzOsU2O2D3RQxmXLwO5xc3V5j N+9g== 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 :subject:date; bh=bdZwj+Gr+YOUjlKjTfgFEt1yEzjoozqKYpN3jU7stL4=; b=SozXDsLaVkByIeOLuoguSAF/cuzvHo0RYnhypmBfgPr9bOrllIyaq8Q/wYci0FUd4i lGl0aV+CiZqYxv9lK4VtmAii8Pe2UNa0mIIXGno3vGWKC8ks0pJt5jMI7np9rL5PvTV1 52VbM+E0vSwqG9mnIPduFMW7OydX+ZxHYeWJJjQqyOIAJ/YTkRLB0wM7o/dIfC8UR9fq DLnoZQCITMORPuHRUkTW33nwDTo3L89ZB39n0TIVvbpb9ISU23BRcmYUEeOheEAJ5L1o 0y2DbUwjLsp+2knwAJA2guj4SdAMlYDkHwZWF5ahdkPwevXaNO8kmgW521aBeXDqn65Z 5qNA== X-Gm-Message-State: ACgBeo3iTUHCtTc046DGjEL4k33amXQK806hqE2nDEixwmE1hT/Rk5Fv VtkHX4RXPPhHcnDiCEJ1SI4OfXpMMYwj6Q== X-Google-Smtp-Source: AA6agR4WthN3g9MKsVRJT537mdieIFxGSDjacO7iz59kvxPSzUuhXzRfmWauzyD17lGusqqQ/kgv4w== X-Received: by 2002:a05:6a00:1a14:b0:52d:3e35:5b38 with SMTP id g20-20020a056a001a1400b0052d3e355b38mr6169828pfv.11.1662594070895; Wed, 07 Sep 2022 16:41:10 -0700 (PDT) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9200:a0f0::1761]) by smtp.gmail.com with ESMTPSA id ij5-20020a170902ab4500b0016c5306917fsm10276495plb.53.2022.09.07.16.41.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 07 Sep 2022 16:41:10 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Cc: Wang Mingyu , Khem Raj Subject: [meta-oe][PATCH 08/22] cli11: upgrade 1.9.1 -> 2.2.0 Date: Wed, 7 Sep 2022 16:40:48 -0700 Message-Id: <20220907234102.3312797-8-raj.khem@gmail.com> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20220907234102.3312797-1-raj.khem@gmail.com> References: <20220907234102.3312797-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 ; Wed, 07 Sep 2022 23:41:15 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/98698 From: Wang Mingyu License-Update: Copyright year updated to 2022. 0001-Do-not-download-the-catch-framework-during-configure.patch added to download the catch framework before configure. Signed-off-by: Wang Mingyu Signed-off-by: Khem Raj --- ...the-catch-framework-during-configure.patch | 41 +++++++++++++++++++ meta-oe/recipes-support/cli11/cli11_1.9.1.bb | 17 -------- meta-oe/recipes-support/cli11/cli11_2.2.0.bb | 25 +++++++++++ 3 files changed, 66 insertions(+), 17 deletions(-) create mode 100644 meta-oe/recipes-support/cli11/cli11/0001-Do-not-download-the-catch-framework-during-configure.patch delete mode 100644 meta-oe/recipes-support/cli11/cli11_1.9.1.bb create mode 100644 meta-oe/recipes-support/cli11/cli11_2.2.0.bb diff --git a/meta-oe/recipes-support/cli11/cli11/0001-Do-not-download-the-catch-framework-during-configure.patch b/meta-oe/recipes-support/cli11/cli11/0001-Do-not-download-the-catch-framework-during-configure.patch new file mode 100644 index 0000000000..7e6611b6a8 --- /dev/null +++ b/meta-oe/recipes-support/cli11/cli11/0001-Do-not-download-the-catch-framework-during-configure.patch @@ -0,0 +1,41 @@ +From 93557d5c5acf9ebb2c0fa708658e1d36621dd23a Mon Sep 17 00:00:00 2001 +From: Wang Mingyu +Date: Wed, 7 Sep 2022 10:05:15 +0900 +Subject: [PATCH] Do not download the catch framework during configure. + +Upstream-Status: Inappropriate [configuration] + +Signed-off-by: Wang Mingyu +--- + tests/CMakeLists.txt | 15 --------------- + 1 file changed, 15 deletions(-) + +diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt +index 80c4f6a..ae210db 100644 +--- a/tests/CMakeLists.txt ++++ b/tests/CMakeLists.txt +@@ -74,21 +74,6 @@ if(Catch2_FOUND) + endif() + message(STATUS "Found Catch2") + target_link_libraries(catch_main PUBLIC Catch2::Catch2) +-else() +- message(STATUS "Downloading Catch2") +- +- # FetchContent would be better, but requires newer CMake. +- file(MAKE_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/catch2") +- set(url https://github.com/philsquared/Catch/releases/download/v2.13.7/catch.hpp) +- file( +- DOWNLOAD ${url} "${CMAKE_CURRENT_BINARY_DIR}/catch2/catch.hpp" +- STATUS status +- EXPECTED_HASH SHA256=ea379c4a3cb5799027b1eb451163dff065a3d641aaba23bf4e24ee6b536bd9bc) +- list(GET status 0 error) +- if(error) +- message(FATAL_ERROR "Could not download ${url}, and Catch2 not found on your system.") +- endif() +- target_include_directories(catch_main PUBLIC "${CMAKE_CURRENT_BINARY_DIR}") + endif() + + # Target must already exist +-- +2.25.1 + diff --git a/meta-oe/recipes-support/cli11/cli11_1.9.1.bb b/meta-oe/recipes-support/cli11/cli11_1.9.1.bb deleted file mode 100644 index 7de3335abd..0000000000 --- a/meta-oe/recipes-support/cli11/cli11_1.9.1.bb +++ /dev/null @@ -1,17 +0,0 @@ -SUMMARY = "C++11 command line parser" -DESCRIPTION = "A command line parser for C++11 and beyond that provides a rich feature set with a simple and intuitive interface." -HOMEPAGE = "https://github.com/CLIUtils/CLI11" -LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=b73927b18d5c6cd8d2ed28a6ad539733" -SRCREV = "5cb3efabce007c3a0230e4cc2e27da491c646b6c" -PV .= "+git${SRCPV}" - -SRC_URI += "gitsm://github.com/CLIUtils/CLI11;branch=v1;protocol=https" - -S = "${WORKDIR}/git" - -inherit cmake -inherit ptest - -# cli11 is a header only C++ library, so the main package will be empty. -RDEPENDS:${PN}-dev = "" diff --git a/meta-oe/recipes-support/cli11/cli11_2.2.0.bb b/meta-oe/recipes-support/cli11/cli11_2.2.0.bb new file mode 100644 index 0000000000..53a57489fe --- /dev/null +++ b/meta-oe/recipes-support/cli11/cli11_2.2.0.bb @@ -0,0 +1,25 @@ +SUMMARY = "C++11 command line parser" +DESCRIPTION = "A command line parser for C++11 and beyond that provides a rich feature set with a simple and intuitive interface." +HOMEPAGE = "https://github.com/CLIUtils/CLI11" +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://LICENSE;md5=9ad746b5f49c0fd53c08ca1faff1922c" +SRCREV = "b9be5b9444772324459989177108a6a65b8b2769" +PV .= "+git${SRCPV}" + +SRC_URI += "gitsm://github.com/CLIUtils/CLI11;branch=main;protocol=https \ + https://github.com/philsquared/Catch/releases/download/v2.13.7/catch.hpp \ + file://0001-Do-not-download-the-catch-framework-during-configure.patch" + +SRC_URI[sha256sum] = "ea379c4a3cb5799027b1eb451163dff065a3d641aaba23bf4e24ee6b536bd9bc" +S = "${WORKDIR}/git" + +do_configure:prepend() { + mkdir -p ${S}/tests/catch2 + cp ${DL_DIR}/catch.hpp ${S}/tests/catch2/catch.hpp +} + +inherit cmake +inherit ptest + +# cli11 is a header only C++ library, so the main package will be empty. +RDEPENDS:${PN}-dev = "" From patchwork Wed Sep 7 23:40:49 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 12467 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 CE61CC6FA8A for ; Wed, 7 Sep 2022 23:41:15 +0000 (UTC) Received: from mail-pl1-f179.google.com (mail-pl1-f179.google.com [209.85.214.179]) by mx.groups.io with SMTP id smtpd.web09.2845.1662594072496058207 for ; Wed, 07 Sep 2022 16:41:12 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=fI3sDNZ2; spf=pass (domain: gmail.com, ip: 209.85.214.179, mailfrom: raj.khem@gmail.com) Received: by mail-pl1-f179.google.com with SMTP id l10so2869892plb.10 for ; Wed, 07 Sep 2022 16:41:12 -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:subject:date; bh=JVKwYw/BSeS7L1q3UCZE6IXP4/y/ozXk/Me45AEPM8Y=; b=fI3sDNZ2lNB5jy0X4wR32w1sNEM1bUzHIl4KE9EDVWj9j6wcNm21wZc2awxkqb23an wrxa+DODZdgB5zlVY/ND5QY2iujW+Hv2n9hT5hmQiVF5/qUhRpP/Svy/h/Ophym1Fw52 YiLEfwt1a/FKww1WWd6H0rFD86JqhPaYoqbVi1rkuTbOb0RjyVZc6MfGsNEhR8lk+xIH SnChz1udarVcFtamRE5W90vENTE4InKgbeNBUgxG8BXIYZpuGWaPTCXDQ219A9XLTKVc FxTzKHCUfmiESR65G97W5rzSZZ/RLYrUDM0ELHISwaH0F0gCuDP/n6ieujXm9fa7LufH wYCg== 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 :subject:date; bh=JVKwYw/BSeS7L1q3UCZE6IXP4/y/ozXk/Me45AEPM8Y=; b=MOKL7oNEnO0lS0YVgRdBIu5OU8M3MTH1umEumsK4q5Qh8QOA+L6DZEA7MJDAI7tSSY n/NtqLNtRxgiEKHBWt/AwRig6Aq7wNy+iGoUModgvaUTyIiMv+gkxcMfD/6BquSmt2DV 96CTj01Fmpg1bO+n8uan90B//5zXY+Lat+ATaeEuVrzt0lLIxZZCcUUybtWHohUSTCLU gdqOOXNJM8XMAlW2DjXGc76Hd7jfVTNu2piO16wFh+kZmHcT06YPDUE9a30E7ZAKJlT2 LjN39nlXt82cW1zRVx4vYI+BusPwXmSXxek6KGUgjgl3NyCu32O9o0hKk9gLyfC+aQR1 gBIg== X-Gm-Message-State: ACgBeo2Cj1SPSvki474E3gt56tuOPUiX3OqWjlM5XjSdCfLna2qWBUfH UP/Qn8NXr58Zi8AnCR+f8A7Ptl3c12eSjQ== X-Google-Smtp-Source: AA6agR65uXFV3pqDRHElPs4UHUjPIB7jeyfZsHvpSC9H5cNX5AsayuZpFly8rgoQUX7lH0UgX6vQkg== X-Received: by 2002:a17:903:120c:b0:172:728a:3b24 with SMTP id l12-20020a170903120c00b00172728a3b24mr5908996plh.61.1662594071693; Wed, 07 Sep 2022 16:41:11 -0700 (PDT) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9200:a0f0::1761]) by smtp.gmail.com with ESMTPSA id ij5-20020a170902ab4500b0016c5306917fsm10276495plb.53.2022.09.07.16.41.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 07 Sep 2022 16:41:11 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Cc: Khem Raj Subject: [meta-oe][PATCH 09/22] minifi-cpp: Disable lto. Date: Wed, 7 Sep 2022 16:40:49 -0700 Message-Id: <20220907234102.3312797-9-raj.khem@gmail.com> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20220907234102.3312797-1-raj.khem@gmail.com> References: <20220907234102.3312797-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 ; Wed, 07 Sep 2022 23:41:15 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/98699 lto does not work always. Its enabled only in civetweb and no where else. Fow cosnsitent builds disable it everywhere. Signed-off-by: Khem Raj --- .../files/0001-civetweb-Disable-lto.patch | 33 +++++++++++++++++++ .../minifi-cpp/minifi-cpp_0.7.0.bb | 8 +++-- 2 files changed, 39 insertions(+), 2 deletions(-) create mode 100644 meta-oe/recipes-extended/minifi-cpp/files/0001-civetweb-Disable-lto.patch diff --git a/meta-oe/recipes-extended/minifi-cpp/files/0001-civetweb-Disable-lto.patch b/meta-oe/recipes-extended/minifi-cpp/files/0001-civetweb-Disable-lto.patch new file mode 100644 index 0000000000..ec4e6ffc45 --- /dev/null +++ b/meta-oe/recipes-extended/minifi-cpp/files/0001-civetweb-Disable-lto.patch @@ -0,0 +1,33 @@ +From 120c708d51f72ade4a31d3d8f35bcfad7b12e723 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Tue, 6 Sep 2022 20:38:03 -0700 +Subject: [PATCH] civetweb: Disable lto + +lto does not work everywhere, therefore disable it atleast in the cmake +file, we can still enable it via environment + +Upstream-Status: Pending + +Signed-off-by: Khem Raj +--- + thirdparty/civetweb-1.10/CMakeLists.txt | 4 ---- + 1 file changed, 4 deletions(-) + +--- a/thirdparty/civetweb-1.10/CMakeLists.txt ++++ b/thirdparty/civetweb-1.10/CMakeLists.txt +@@ -298,7 +298,6 @@ add_c_compiler_flag(/WX) + add_c_compiler_flag(-pedantic-errors) + add_c_compiler_flag(-fvisibility=hidden) + add_c_compiler_flag(-fstack-protector-strong RELEASE) +-add_c_compiler_flag(-flto RELEASE) + + add_c_compiler_flag(-fstack-protector-all DEBUG) + if (MINGW) +@@ -361,7 +360,6 @@ if (CIVETWEB_ENABLE_CXX) + add_cxx_compiler_flag(-pedantic-errors) + add_cxx_compiler_flag(-fvisibility=hidden) + add_cxx_compiler_flag(-fstack-protector-strong RELEASE) +- add_cxx_compiler_flag(-flto RELEASE) + + add_cxx_compiler_flag(-fstack-protector-all DEBUG) + if (MINGW) diff --git a/meta-oe/recipes-extended/minifi-cpp/minifi-cpp_0.7.0.bb b/meta-oe/recipes-extended/minifi-cpp/minifi-cpp_0.7.0.bb index 8fc253908f..3b57ceace6 100644 --- a/meta-oe/recipes-extended/minifi-cpp/minifi-cpp_0.7.0.bb +++ b/meta-oe/recipes-extended/minifi-cpp/minifi-cpp_0.7.0.bb @@ -30,6 +30,7 @@ SRC_URI = "git://github.com/apache/nifi-minifi-cpp.git;branch=master;protocol=ht file://0001-civetweb-CMakeLists.txt-do-not-search-gcc-ar-and-gcc.patch \ file://0001-cxxopts-Add-limits-header.patch \ file://0001-Fix-build-with-libc.patch \ + file://0001-civetweb-Disable-lto.patch \ file://minifi.service \ file://systemd-volatile.conf \ file://sysvinit-volatile.conf \ @@ -80,10 +81,13 @@ do_install[cleandirs] += "${WORKDIR}/minifi-install" PSEUDO_CONSIDER_PATHS .= ",${WORKDIR}/minifi-install" do_configure:prepend:libc-musl() { - sed -i -e 's/-DHAVE_GLIBC_STRERROR_R=1/-DHAVE_GLIBC_STRERROR_R=0/' ${S}/CMakeLists.txt - sed -i -e 's/-DHAVE_POSIX_STRERROR_R=0/-DHAVE_POSIX_STRERROR_R=1/' ${S}/CMakeLists.txt + sed -i -e 's/-DHAVE_GLIBC_STRERROR_R=?/-DHAVE_GLIBC_STRERROR_R=0/' ${S}/CMakeLists.txt + sed -i -e 's/-DHAVE_POSIX_STRERROR_R=?/-DHAVE_POSIX_STRERROR_R=1/' ${S}/CMakeLists.txt } +CFLAGS:append:libc-glibc = " -D_GNU_SOURCE" +CXXFLAGS:append:libc-glibc = " -D_GNU_SOURCE" + do_install() { DESTDIR='${WORKDIR}/minifi-install' cmake_runcmake_build --target ${OECMAKE_TARGET_INSTALL} MINIFI_BIN=${bindir} From patchwork Wed Sep 7 23:40:50 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 12466 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 CE5CBC54EE9 for ; Wed, 7 Sep 2022 23:41:15 +0000 (UTC) Received: from mail-pf1-f181.google.com (mail-pf1-f181.google.com [209.85.210.181]) by mx.groups.io with SMTP id smtpd.web12.2741.1662594073296777695 for ; Wed, 07 Sep 2022 16:41:13 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=OjbNyj6o; spf=pass (domain: gmail.com, ip: 209.85.210.181, mailfrom: raj.khem@gmail.com) Received: by mail-pf1-f181.google.com with SMTP id d82so2529713pfd.10 for ; Wed, 07 Sep 2022 16:41:13 -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:subject:date; bh=fffQkmT+JIz88MToxEwpthEI1vrjSDbcsMdSwxUNQA0=; b=OjbNyj6o+lkvDzqAGLV4xESSazQ85+S8+4OxBhjMoXLU7bax0fD2ugn4cINdRxx2Fs GlQRODoRMolethJdPoz0q40wtz7wwVFOG3CKOUBAcupghzMuiWALD4iMv82Bv318ds84 jZHtx7y5Ixh88bWHDXwSo5VbSEEMJM0NEutrAA+Zadp0JwWiVFh06XaVLGO4umXn/+9E JQHXQWOm7FSWfxOo+qwdJ3IAHy1DD7gjWJr0NWczTo7AThc8CBT1zhV/txLU4oD/2jjB YesayrYTgXqCozKulu3YkNd3J/SyrJ6B/f6E3VOxRUPqZPxdje4b1eGEZqaXpgtC8yDk /upw== 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 :subject:date; bh=fffQkmT+JIz88MToxEwpthEI1vrjSDbcsMdSwxUNQA0=; b=HYdIjIeUtGwM3RPhmCbobENBemlpB5caJtYfc982FYOpcztkYC6eQomPmJo6T6zeCY oSzRphhnZga0bm69Ap6EwM0L3f9HKp96oQ9GrjDcoEM+lRInTBesEmhFA/rwDMGimd6M pwk9gQeJhTywMhsC7kBSTb9YUUtUDjJQlQdD++MJyYxBervjxO1NJ+PHFtwQpHwEkbGh PBlhq1zQbI4RYJP7bxe/CcRv8zpBLzAbqsPELTO8IZcaFCfOQQwYqY2yKaL68AHy8XE0 C9r1uJ/ANtN6cqirzvCuZSX8blF1/XKgHKpibCIyoYfqD0RXPwzTJqlPoAYnQTqiJGrZ ZPKA== X-Gm-Message-State: ACgBeo1VNAQs5fE4MlNLgoqCaATDI3wAzHXolU9e+MaE2Q13RG4fCa60 b+/FzkBChSqo4itP03tWXVZsIkQSxOF4gQ== X-Google-Smtp-Source: AA6agR5ZmIuERAmgfUcfi51bq7tpJK/LTS8ZP8xeH+z+K+MGjgYKkM7kntIgROc8V/Xr/UoOeg7f0A== X-Received: by 2002:a62:30c7:0:b0:52f:9a31:5935 with SMTP id w190-20020a6230c7000000b0052f9a315935mr6236362pfw.14.1662594072550; Wed, 07 Sep 2022 16:41:12 -0700 (PDT) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9200:a0f0::1761]) by smtp.gmail.com with ESMTPSA id ij5-20020a170902ab4500b0016c5306917fsm10276495plb.53.2022.09.07.16.41.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 07 Sep 2022 16:41:12 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Cc: Khem Raj Subject: [meta-networking][PATCH 10/22] ntp: Fix check for pthread_detach Date: Wed, 7 Sep 2022 16:40:50 -0700 Message-Id: <20220907234102.3312797-10-raj.khem@gmail.com> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20220907234102.3312797-1-raj.khem@gmail.com> References: <20220907234102.3312797-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 ; Wed, 07 Sep 2022 23:41:15 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/98700 Signed-off-by: Khem Raj --- ...ix-types-in-check-for-pthread_detach.patch | 33 +++++++++++++++++++ .../recipes-support/ntp/ntp_4.2.8p15.bb | 1 + 2 files changed, 34 insertions(+) create mode 100644 meta-networking/recipes-support/ntp/ntp/0001-sntp-Fix-types-in-check-for-pthread_detach.patch diff --git a/meta-networking/recipes-support/ntp/ntp/0001-sntp-Fix-types-in-check-for-pthread_detach.patch b/meta-networking/recipes-support/ntp/ntp/0001-sntp-Fix-types-in-check-for-pthread_detach.patch new file mode 100644 index 0000000000..ca15470ace --- /dev/null +++ b/meta-networking/recipes-support/ntp/ntp/0001-sntp-Fix-types-in-check-for-pthread_detach.patch @@ -0,0 +1,33 @@ +From 864f43ae09d18b1114d5c894e836698743e4e44c Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Tue, 6 Sep 2022 21:36:35 -0700 +Subject: [PATCH] sntp: Fix types in check for pthread_detach + +New compilers are stricter and flag assigning NULL to pthread_t as error +therefore using a pthread_t variable constructed from -1 + +Upstream-Status: Pending +Signed-off-by: Khem Raj +--- + sntp/m4/openldap-thread-check.m4 | 5 +---- + 1 file changed, 1 insertion(+), 4 deletions(-) + +diff --git a/sntp/m4/openldap-thread-check.m4 b/sntp/m4/openldap-thread-check.m4 +index 7768a5c..b9e54ad 100644 +--- a/sntp/m4/openldap-thread-check.m4 ++++ b/sntp/m4/openldap-thread-check.m4 +@@ -262,10 +262,7 @@ pthread_rwlock_t rwlock; + dnl save the flags + AC_LINK_IFELSE([AC_LANG_PROGRAM([[ + #include +-#ifndef NULL +-#define NULL (void*)0 +-#endif +-]], [[pthread_detach(NULL);]])],[ol_cv_func_pthread_detach=yes],[ol_cv_func_pthread_detach=no]) ++]], [[pthread_detach((pthread_t)-1);]])],[ol_cv_func_pthread_detach=yes],[ol_cv_func_pthread_detach=no]) + ]) + + if test $ol_cv_func_pthread_detach = no ; then +-- +2.37.3 + diff --git a/meta-networking/recipes-support/ntp/ntp_4.2.8p15.bb b/meta-networking/recipes-support/ntp/ntp_4.2.8p15.bb index a30f720bb5..50f5477f27 100644 --- a/meta-networking/recipes-support/ntp/ntp_4.2.8p15.bb +++ b/meta-networking/recipes-support/ntp/ntp_4.2.8p15.bb @@ -15,6 +15,7 @@ SRC_URI = "http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/ntp-${PV}.tar.g file://reproducibility-fixed-path-to-posix-shell.patch \ file://0001-libntp-Do-not-use-PTHREAD_STACK_MIN-on-glibc.patch \ file://0001-test-Fix-build-with-new-compiler-defaults-to-fno-com.patch \ + file://0001-sntp-Fix-types-in-check-for-pthread_detach.patch \ file://ntpd \ file://ntp.conf \ file://ntpdate \ From patchwork Wed Sep 7 23:40:51 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 12463 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 C6184C6FA82 for ; Wed, 7 Sep 2022 23:41:15 +0000 (UTC) Received: from mail-pj1-f51.google.com (mail-pj1-f51.google.com [209.85.216.51]) by mx.groups.io with SMTP id smtpd.web09.2846.1662594074260466241 for ; Wed, 07 Sep 2022 16:41:14 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=djtT432H; spf=pass (domain: gmail.com, ip: 209.85.216.51, mailfrom: raj.khem@gmail.com) Received: by mail-pj1-f51.google.com with SMTP id z9-20020a17090a468900b001ffff693b27so534429pjf.2 for ; Wed, 07 Sep 2022 16:41:14 -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:subject:date; bh=tA3T7B+CovJYC8LTUtosWYaEjfrtozA12kZJB0wwMlA=; b=djtT432HGevk0MoQuMnhkWMhi14WGnD5tGRqVsla+fwxzQ/NBwHp/MMXWa0ktexeT0 M2cNQDl05DAInBzy6M6/arK4R4Ex+EgWfjYm7buuE5DaBTiLhFbQIt/LXStHklblwCd8 MylR1hrTai4mWTZgBmkNS0zOmFCRkIV2vqiGP7B3VFsHq1bpZ9dHZCAj6dM6ctlJPfMM uACQhWQl0WCpLrpoILvg+tfpRkMaJnkelTL5qmAInmum0wJiXHUmSFd7kw42TBmKEs2q 6BIC9PJ454mkvrj81eqN2vGqOiMdMzLMxudI6MQpryAhzvR3z3ZIo34/U0mLaqTJJhon GTDQ== 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 :subject:date; bh=tA3T7B+CovJYC8LTUtosWYaEjfrtozA12kZJB0wwMlA=; b=4nBG9TnF6arP8mAZj9CiHlIrs/DOJwzAeXCjMPHVrL6vV1yKLA8hxpD63fz4hbJOoM /waRGM3tHgYCqr8TDPqv1QzfBllKigdJv2ERObx2MyA4oI8A+PfbIpHN2ceuKkmpE4hN 7MvLU7Ivh5RFi/m9jbtpGbwnlIrUIfpYnLpBhn7eIopyYWWja24hnwOFQlnVQXgv8iih Mx6qcdDpKu8ZwgX8epC0rp5AorOiHEpIRCmnzmtzvYLIo6jR0dhrG9bFYiI4w/nk7r08 LIsYtXi0riRIk7Ci1p2AmaWrWDGVMC9jKfTT8xMVCyt8DTmUeBDwHGbVDUatpXaEIkps b6PA== X-Gm-Message-State: ACgBeo3KmpaYMEa4KnALGh6/PWb9FPU/nPICqAhvNc96iR77jTzGDkW1 QKWyd68H/6oX255By0lfsiG/HXgWe3vkVg== X-Google-Smtp-Source: AA6agR4IZ1gQZSaBLPuLfy+f46nFuGsoLOCfABAPNCRAMwcAGJBWU5qq4ou1SjQMNyN4E/0hmjGN6A== X-Received: by 2002:a17:902:d501:b0:174:c4c9:9b77 with SMTP id b1-20020a170902d50100b00174c4c99b77mr6217102plg.67.1662594073492; Wed, 07 Sep 2022 16:41:13 -0700 (PDT) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9200:a0f0::1761]) by smtp.gmail.com with ESMTPSA id ij5-20020a170902ab4500b0016c5306917fsm10276495plb.53.2022.09.07.16.41.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 07 Sep 2022 16:41:13 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Cc: Khem Raj Subject: [meta-networking][PATCH 11/22] netkit-telnet: Add time.h from strftime/time prototypes Date: Wed, 7 Sep 2022 16:40:51 -0700 Message-Id: <20220907234102.3312797-11-raj.khem@gmail.com> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20220907234102.3312797-1-raj.khem@gmail.com> References: <20220907234102.3312797-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 ; Wed, 07 Sep 2022 23:41:15 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/98701 Signed-off-by: Khem Raj --- ...time.h-form-time-and-strftime-protot.patch | 27 +++++++++++++++++++ .../netkit-telnet/netkit-telnet_0.17.bb | 1 + 2 files changed, 28 insertions(+) create mode 100644 meta-networking/recipes-netkit/netkit-telnet/files/0001-utility-Include-time.h-form-time-and-strftime-protot.patch diff --git a/meta-networking/recipes-netkit/netkit-telnet/files/0001-utility-Include-time.h-form-time-and-strftime-protot.patch b/meta-networking/recipes-netkit/netkit-telnet/files/0001-utility-Include-time.h-form-time-and-strftime-protot.patch new file mode 100644 index 0000000000..a5e634caab --- /dev/null +++ b/meta-networking/recipes-netkit/netkit-telnet/files/0001-utility-Include-time.h-form-time-and-strftime-protot.patch @@ -0,0 +1,27 @@ +From 23b068e695881be0e8205ecccadf775fc3d5889d Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Tue, 6 Sep 2022 21:25:50 -0700 +Subject: [PATCH] utility: Include time.h form time() and strftime() prototypes + +Upstream-Status: Pending + +Signed-off-by: Khem Raj +--- + telnetd/utility.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/telnetd/utility.c b/telnetd/utility.c +index 4811f14..b539777 100644 +--- a/telnetd/utility.c ++++ b/telnetd/utility.c +@@ -40,6 +40,7 @@ char util_rcsid[] = + #define PRINTOPTIONS + + #include ++#include /* for time() anf strftime() */ + #include + + #ifdef AUTHENTICATE +-- +2.37.3 + diff --git a/meta-networking/recipes-netkit/netkit-telnet/netkit-telnet_0.17.bb b/meta-networking/recipes-netkit/netkit-telnet/netkit-telnet_0.17.bb index 56860ea098..6d60c6fbbe 100644 --- a/meta-networking/recipes-netkit/netkit-telnet/netkit-telnet_0.17.bb +++ b/meta-networking/recipes-netkit/netkit-telnet/netkit-telnet_0.17.bb @@ -14,6 +14,7 @@ SRC_URI = "${DEBIAN_MIRROR}/main/n/netkit-telnet/netkit-telnet_${PV}.orig.tar.gz file://0001-telnet-telnetd-Fix-deadlock-on-cleanup.patch \ file://CVE-2020-10188.patch \ file://0001-telnetd-utility.c-Fix-buffer-overflow-in-netoprintf.patch \ + file://0001-utility-Include-time.h-form-time-and-strftime-protot.patch \ " UPSTREAM_CHECK_URI = "${DEBIAN_MIRROR}/main/n/netkit-telnet/" From patchwork Wed Sep 7 23:40:52 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 12465 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 C0890ECAAD3 for ; Wed, 7 Sep 2022 23:41:15 +0000 (UTC) Received: from mail-pf1-f176.google.com (mail-pf1-f176.google.com [209.85.210.176]) by mx.groups.io with SMTP id smtpd.web11.2758.1662594071811253627 for ; Wed, 07 Sep 2022 16:41:15 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=aHB6R/jF; spf=pass (domain: gmail.com, ip: 209.85.210.176, mailfrom: raj.khem@gmail.com) Received: by mail-pf1-f176.google.com with SMTP id y136so11211309pfb.3 for ; Wed, 07 Sep 2022 16:41:14 -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:subject:date; bh=7Vhm9kNo6Mmud5mrZ14pVSdEa3WkpA+OJh8lmIr91us=; b=aHB6R/jFbdTzjLROqvY093JDjAtGSijj9UL65b0lpYcy1kWhkS5IJTcTAo1/dUBTO3 eVqbPO1/YnltPov9GuYkRgepSw2pb15yvzySeudVBmg0FG6ZpakZ34ARRFjJYcEqdQQv +VlbIMvwTfeTXGhv8kTREc0Tp9T7XRMqrcvn9gqMVH1LOuy+UdjcEKygnGmJsSWKyMgF YkVP+nnESvmhFVBSJ0JMXWzBA7SwpCUbbaZ0ZBtHy42mzShjDrrWxsUjqTtjpKtVI+sv J0bhRBA+LzJeFBibEqtF9ZkN0s+qFRKDAMo0zTjrCIa4ZJ+Szacr6EszUBtRt59Ag8ld MuWg== 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 :subject:date; bh=7Vhm9kNo6Mmud5mrZ14pVSdEa3WkpA+OJh8lmIr91us=; b=Oy5MeCYlkmDAsG3aJXYE5spDFGk2mvtVwFRFcsAs48J9iU+Z1MtaM47cz4HX0DY0oU k7wm/wkzn8EAXQ+FhXK4svSgXTf2l737aVDdv71vZh3wr/irNEUwVN2RezURa6ER7BrW d7i4/hLlhNPtIjZb8zeoncvxncQ0q9Cfzrs0enKU6+O+AKr8t6ZMh9DsPSsmJ0eyweWk PQIau6WkjJtKK6rUKwLmZF+6R72lhTxz2JuZAPYwRFPKZZdxIj8KDxgGXNASj19kPvvJ CXvmHNJKm+6glFLOCKQcOcOJPT6ZUydUqOKleduX3uwBS5d3SQziaSx2XHiYswjuWOsa Zg1g== X-Gm-Message-State: ACgBeo1DS2JZ+svHB+64HIsbEAI51c5A3hZ31CzJsOsezqaiRGsJBqKg yfy0MRU7mGNR1liIdR3jvHBCpS3TqeV3Tw== X-Google-Smtp-Source: AA6agR4la3f952caF/LG7Tk29AqQeJo4qtID3fFB593hUBWLGVN3hmr8XkB+5X7yNKkonuFDYmIKmA== X-Received: by 2002:a62:3347:0:b0:53d:f935:9f01 with SMTP id z68-20020a623347000000b0053df9359f01mr6421453pfz.8.1662594074211; Wed, 07 Sep 2022 16:41:14 -0700 (PDT) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9200:a0f0::1761]) by smtp.gmail.com with ESMTPSA id ij5-20020a170902ab4500b0016c5306917fsm10276495plb.53.2022.09.07.16.41.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 07 Sep 2022 16:41:13 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Cc: Khem Raj Subject: [meta-oe][PATCH 12/22] passwdqc: Upgrade to 2.0.2 Date: Wed, 7 Sep 2022 16:40:52 -0700 Message-Id: <20220907234102.3312797-12-raj.khem@gmail.com> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20220907234102.3312797-1-raj.khem@gmail.com> References: <20220907234102.3312797-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 ; Wed, 07 Sep 2022 23:41:15 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/98702 License-Update: install-dependencies.sh and run-build-and-tests.sh are mentioned under GPL-2.0 but they are not included in release tarball Signed-off-by: Khem Raj --- .../passwdqc/passwdqc/makefile-add-ldflags.patch | 16 +++++++--------- .../{passwdqc_1.3.1.bb => passwdqc_2.0.2.bb} | 5 ++--- 2 files changed, 9 insertions(+), 12 deletions(-) rename meta-oe/recipes-security/passwdqc/{passwdqc_1.3.1.bb => passwdqc_2.0.2.bb} (91%) diff --git a/meta-oe/recipes-security/passwdqc/passwdqc/makefile-add-ldflags.patch b/meta-oe/recipes-security/passwdqc/passwdqc/makefile-add-ldflags.patch index e9023492e0..6e4803f4f3 100644 --- a/meta-oe/recipes-security/passwdqc/passwdqc/makefile-add-ldflags.patch +++ b/meta-oe/recipes-security/passwdqc/passwdqc/makefile-add-ldflags.patch @@ -4,19 +4,17 @@ Upstream-Status: Pending Signed-off-by: Yi Zhao -diff --git a/Makefile b/Makefile -index 49d622d..cd17334 100644 --- a/Makefile +++ b/Makefile -@@ -48,18 +48,17 @@ CFLAGS = -Wall -W -O2 - CFLAGS_lib = $(CFLAGS) -fPIC - CFLAGS_bin = $(CFLAGS) -fomit-frame-pointer +@@ -68,18 +68,17 @@ XGETTEXT = xgettext + XGETTEXT_OPTS = --keyword=_ --keyword=P2_:1,1 --keyword=P3_:1,2 --language=C --add-comments + MSGMERGE = msgmerge -LDFLAGS = - LDFLAGS_shared = --shared - LDFLAGS_shared_LINUX = --shared - LDFLAGS_shared_SUN = -G - LDFLAGS_shared_HP = -b + LDFLAGS_shared = $(LDFLAGS) --shared + LDFLAGS_shared_LINUX = $(LDFLAGS) --shared + LDFLAGS_shared_SUN = $(LDFLAGS) -G + LDFLAGS_shared_HP = $(LDFLAGS) -b LDFLAGS_lib = $(LDFLAGS_shared) -LDFLAGS_lib_LINUX = $(LDFLAGS_shared_LINUX) \ +LDFLAGS_lib_LINUX = $(LDFLAGS) $(LDFLAGS_shared_LINUX) \ diff --git a/meta-oe/recipes-security/passwdqc/passwdqc_1.3.1.bb b/meta-oe/recipes-security/passwdqc/passwdqc_2.0.2.bb similarity index 91% rename from meta-oe/recipes-security/passwdqc/passwdqc_1.3.1.bb rename to meta-oe/recipes-security/passwdqc/passwdqc_2.0.2.bb index b148fdcb59..de4bff8c79 100644 --- a/meta-oe/recipes-security/passwdqc/passwdqc_1.3.1.bb +++ b/meta-oe/recipes-security/passwdqc/passwdqc_2.0.2.bb @@ -25,13 +25,12 @@ inherit features_check REQUIRED_DISTRO_FEATURES = "pam" LICENSE = "BSD-1-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=1b4af6f3d4ee079a38107366e93b334d" +LIC_FILES_CHKSUM = "file://LICENSE;md5=ac99c8678577a1c2f9f04cccee411d5d" SRC_URI = "http://www.openwall.com/${BPN}/${BP}.tar.gz \ file://makefile-add-ldflags.patch \ " -SRC_URI[md5sum] = "3878b57bcd3fdbcf3d4b362dbc6228b9" -SRC_URI[sha256sum] = "d1fedeaf759e8a0f32d28b5811ef11b5a5365154849190f4b7fab670a70ffb14" +SRC_URI[sha256sum] = "ff1f505764c020f6a4484b1e0cc4fdbf2e3f71b522926d90b4709104ca0604ab" # explicitly define LINUX_PAM in case DISTRO_FEATURES no pam # this package's pam_passwdqc.so needs pam From patchwork Wed Sep 7 23: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: 12484 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 F1BEAC38145 for ; Wed, 7 Sep 2022 23:41:25 +0000 (UTC) Received: from mail-pf1-f178.google.com (mail-pf1-f178.google.com [209.85.210.178]) by mx.groups.io with SMTP id smtpd.web08.2769.1662594069926655663 for ; Wed, 07 Sep 2022 16:41:15 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=m8jGItwQ; spf=pass (domain: gmail.com, ip: 209.85.210.178, mailfrom: raj.khem@gmail.com) Received: by mail-pf1-f178.google.com with SMTP id 65so5925712pfx.0 for ; Wed, 07 Sep 2022 16:41:15 -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:subject:date; bh=5/QQNPqc6nPXVeAa1S95H1tXh4OVxnwOAZ6/j7gilOw=; b=m8jGItwQW1nlAZL6JeiQdJJUL38jkt3iry6aF4INNc7vL0FzrzoqXE/h34RXGSzUMO LUq0ZMoRyiaoa59Ol3ujmdWblgQYxZymTyAXmi1uVpZ82FuLhRD5gj43r7S+8jfc1w0d Zqq7eX0Ot+YBFyWNZJ+eaMvXjJAYO8b5odwZUtLnAJYE5M1fuDo/pywAvP7tdDaOBctX O7Q0vJt+N6FFbERjJNvViUJHCV7nCFude2dBmqxO3b/lZDftIwAHE4sLAwq4J2HGnrIO vUz9PZs5KH5hr6KX6WfZ0Ln2NzqDqw3oE8wgA+NBROXL9DVT5TgD0BTX7B4lWnlMFZon oS9w== 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 :subject:date; bh=5/QQNPqc6nPXVeAa1S95H1tXh4OVxnwOAZ6/j7gilOw=; b=mquHFGdDeS26LD4QHeAXAdQQmXYOjCIk/+xqpBF6mW9CfgXA06+Y6i9awweUpLK5+u uWao57Gdz/OqabmPZDkpbBMSa2HBH/zTH75504CNZRpKSXNzxUy7W/xKUkvbSaAxLM4o iU4UPKo+erWk4PmLMz7tfAj/VSmYrffcQtjmV3u8RGA+xiuY47mecWFz/YaxacNFZY1n 0EuilbxHKsJ772LObZe8/S+aXHLu5Srjd4djlWEAnNUxQJ1lLvlxyCPDjMgafciMGVdr CmCP+iO6UpvbSh+c+E3JqGLSvYUvC7J2qmg43NTlUVyFvFO85CR956N+KiFI0YNJd76R 5iBw== X-Gm-Message-State: ACgBeo2mtIQjJO2rZ0DjwZ0K8Yz+pQDOQu8gz43nktfaY7gtHbyn1Ga7 oztcg+sKJ1BpFf06Tarn2Oiz3i5g5+uF3Q== X-Google-Smtp-Source: AA6agR4ssZIh0QhZmsfOoiBEws8dB2pvMqtXyO4GDA14hiqJk/FTmo9uPtJUsWEtZZ0WYRIZcqvLtw== X-Received: by 2002:a05:6a00:21c8:b0:52e:3404:eba5 with SMTP id t8-20020a056a0021c800b0052e3404eba5mr6273240pfj.67.1662594075042; Wed, 07 Sep 2022 16:41:15 -0700 (PDT) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9200:a0f0::1761]) by smtp.gmail.com with ESMTPSA id ij5-20020a170902ab4500b0016c5306917fsm10276495plb.53.2022.09.07.16.41.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 07 Sep 2022 16:41:14 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Cc: Khem Raj Subject: [meta-oe][PATCH 13/22] lmbench: Fix build time tests and use the scripts/build Date: Wed, 7 Sep 2022 16:40:53 -0700 Message-Id: <20220907234102.3312797-13-raj.khem@gmail.com> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20220907234102.3312797-1-raj.khem@gmail.com> References: <20220907234102.3312797-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 ; Wed, 07 Sep 2022 23:41:25 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/98703 scripts/build does some configure like work before handing of compilation to make, and these tests are essential for OE builds too e.g. socklen_t differs between musl and glibc and this script can detect that well. Signed-off-by: Khem Raj --- ...efine-guard-before-redefining-sockle.patch | 27 -- ...-Fix-the-tests-to-build-with-clang15.patch | 239 ++++++++++++++++++ .../lmbench/lmbench_3.0-a9.bb | 10 +- 3 files changed, 245 insertions(+), 31 deletions(-) delete mode 100644 meta-oe/recipes-benchmark/lmbench/lmbench/0001-Check-for-musl-define-guard-before-redefining-sockle.patch create mode 100644 meta-oe/recipes-benchmark/lmbench/lmbench/0001-scripts-build-Fix-the-tests-to-build-with-clang15.patch diff --git a/meta-oe/recipes-benchmark/lmbench/lmbench/0001-Check-for-musl-define-guard-before-redefining-sockle.patch b/meta-oe/recipes-benchmark/lmbench/lmbench/0001-Check-for-musl-define-guard-before-redefining-sockle.patch deleted file mode 100644 index d7169495fa..0000000000 --- a/meta-oe/recipes-benchmark/lmbench/lmbench/0001-Check-for-musl-define-guard-before-redefining-sockle.patch +++ /dev/null @@ -1,27 +0,0 @@ -From ac1657e11cbb0545bdf4d1124def8c013958ed7e Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Wed, 12 Jul 2017 18:08:51 -0700 -Subject: [PATCH] Check for musl define guard before redefining socklen_t - -musl uses __DEFINED_socklen_t so check for that as well -along with HAVE_socklen_t - -Signed-off-by: Khem Raj - ---- - src/bench.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/bench.h b/src/bench.h -index 597d068..2ebdf5a 100644 ---- a/src/bench.h -+++ b/src/bench.h -@@ -77,7 +77,7 @@ typedef long long int64; - #endif /* HAVE_int64_t */ - #endif /* HAVE_int64 */ - --#ifndef HAVE_socklen_t -+#if !defined(HAVE_socklen_t) && !defined(__DEFINED_socklen_t) - typedef int socklen_t; - #endif - diff --git a/meta-oe/recipes-benchmark/lmbench/lmbench/0001-scripts-build-Fix-the-tests-to-build-with-clang15.patch b/meta-oe/recipes-benchmark/lmbench/lmbench/0001-scripts-build-Fix-the-tests-to-build-with-clang15.patch new file mode 100644 index 0000000000..f07cef6b38 --- /dev/null +++ b/meta-oe/recipes-benchmark/lmbench/lmbench/0001-scripts-build-Fix-the-tests-to-build-with-clang15.patch @@ -0,0 +1,239 @@ +From bcc6816b92ecf409357865589069a82883d589f7 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Tue, 6 Sep 2022 22:53:51 -0700 +Subject: [PATCH] scripts/build: Fix the tests to build with clang15 + +Upstream-Status: Pending +Signed-off-by: Khem Raj +--- + scripts/build | 50 +++++++++++++++++++++++++------------------------- + 1 file changed, 25 insertions(+), 25 deletions(-) + +--- a/scripts/build ++++ b/scripts/build +@@ -21,7 +21,7 @@ trap 'rm -f ${BASE}$$.s ${BASE}$$.c ${BA + LDLIBS="$LDLIBS -lm" + + # check for HP-UX's ANSI compiler +-echo "main(int ac, char *av[]) { int i; }" > ${BASE}$$.c ++echo "int main(int ac, char *av[]) { int i; }" > ${BASE}$$.c + if ${CC} ${CFLAGS} -o ${BASE}$$ ${BASE}$$.c 1>${NULL} 2>${NULL} + then + true; +@@ -39,7 +39,7 @@ arch=`echo $OS | awk -F- '{print $1;}'` + if [ "X$CC" = "Xcc" -a "X$arch" = "Xia64" ] + then + echo "#include " > ${BASE}$$.c +- echo "main(int ac, char *av[])" >> ${BASE}$$.c ++ echo "int main(int ac, char *av[])" >> ${BASE}$$.c + echo "{ long* p = (long*)malloc(sizeof(long));" >> ${BASE}$$.c + echo "*p = 0; exit((int)*p); }" >> ${BASE}$$.c + ${CC} ${CFLAGS} +DD64 -o ${BASE}$$ ${BASE}$$.c 1>${NULL} 2>${NULL} \ +@@ -51,14 +51,14 @@ fi + + # check for bcopy (optionally set the SYS5 flag) + echo "#include " > ${BASE}$$.c +-echo "main() { char a[256], b[256]; bcopy(a, b, 256); }" >> ${BASE}$$.c ++echo "int main() { char a[256], b[256]; bcopy(a, b, 256); }" >> ${BASE}$$.c + ${CC} ${CFLAGS} -o ${BASE}$$ ${BASE}$$.c ${LDLIBS} 1>${NULL} 2>${NULL} \ + || CFLAGS="${CFLAGS} -DSYS5" + rm -f ${BASE}$$ ${BASE}$$.o ${BASE}$$.c + + # check for valloc + echo "#include " > ${BASE}$$.c +-echo "main() { char* buf = valloc(123); }" >> ${BASE}$$.c ++echo "int main() { char* buf = valloc(123); }" >> ${BASE}$$.c + ${CC} ${CFLAGS} -o ${BASE}$$ ${BASE}$$.c ${LDLIBS} 1>${NULL} 2>${NULL} \ + || CFLAGS="${CFLAGS} -Dvalloc=malloc" + rm -f ${BASE}$$ ${BASE}$$.o ${BASE}$$.c +@@ -67,7 +67,7 @@ rm -f ${BASE}$$ ${BASE}$$.o ${BASE}$$.c + echo "#include " > ${BASE}$$.c + echo "#include " >> ${BASE}$$.c + echo "#include " >> ${BASE}$$.c +-echo "main() { off64_t off; }" >> ${BASE}$$.c ++echo "int main() { off64_t off; }" >> ${BASE}$$.c + ${CC} ${CFLAGS} -o ${BASE}$$ ${BASE}$$.c ${LDLIBS} 1>${NULL} 2>${NULL} \ + && CFLAGS="${CFLAGS} -DHAVE_off64_t" + rm -f ${BASE}$$ ${BASE}$$.o ${BASE}$$.c +@@ -76,7 +76,7 @@ rm -f ${BASE}$$ ${BASE}$$.o ${BASE}$$.c + echo "#include " > ${BASE}$$.c + echo "#include " >> ${BASE}$$.c + echo "#include " >> ${BASE}$$.c +-echo "main() { int fd = 0; off64_t off = 0; off = lseek64(fd, off, SEEK_SET); }" >> ${BASE}$$.c ++echo "int main() { int fd = 0; off64_t off = 0; off = lseek64(fd, off, SEEK_SET); }" >> ${BASE}$$.c + ${CC} ${CFLAGS} -o ${BASE}$$ ${BASE}$$.c ${LDLIBS} 1>${NULL} 2>${NULL} \ + && CFLAGS="${CFLAGS} -DHAVE_lseek64" + rm -f ${BASE}$$ ${BASE}$$.o ${BASE}$$.c +@@ -88,7 +88,7 @@ echo "#include " >> ${BA + echo "#ifndef RUSAGE_SELF" >> ${BASE}$$.c + echo "#define RUSAGE_SELF 0" >> ${BASE}$$.c + echo "#endif /* RUSAGE_SELF */" >> ${BASE}$$.c +-echo "main() { struct rusage ru; getrusage(RUSAGE_SELF, &ru); }" >> ${BASE}$$.c ++echo "int main() { struct rusage ru; getrusage(RUSAGE_SELF, &ru); }" >> ${BASE}$$.c + ${CC} ${CFLAGS} -o ${BASE}$$ ${BASE}$$.c ${LDLIBS} 1>${NULL} 2>${NULL} \ + && CFLAGS="${CFLAGS} -DRUSAGE" + rm -f ${BASE}$$ ${BASE}$$.o ${BASE}$$.c +@@ -125,24 +125,24 @@ fi + rm -f ${BASE}$$ ${BASE}$$.o ${BASE}$$.c + + # check for -lrpc (cygwin/Windows) +-echo "extern int pmap_set(); main() { pmap_set(); }" >${BASE}$$.c ++echo "extern int pmap_set(void); int main() { pmap_set(); }" >${BASE}$$.c + if ${CC} ${CFLAGS} -o ${BASE}$$ ${BASE}$$.c ${LDLIBS} 1>${NULL} 2>${NULL}; then + true; +-else +- ${CC} ${CFLAGS} -o ${BASE}$$ ${BASE}$$.c ${LDLIBS} -lrpc 1>${NULL} 2>${NULL} \ +- && LDLIBS="${LDLIBS} -lrpc" ++elif ${CC} ${CFLAGS} -o ${BASE}$$ ${BASE}$$.c ${LDLIBS} -lrpc 1>${NULL} 2>${NULL}; then ++ LDLIBS="${LDLIBS} -lrpc" ++else ${CC} ${CFLAGS} -o ${BASE}$$ ${BASE}$$.c ${LDLIBS} -ltirpc 1>${NULL} 2>${NULL} && LDLIBS="${LDLIBS} -ltirpc" + fi + rm -f ${BASE}$$ ${BASE}$$.o ${BASE}$$.c + + # check for OSs that have S_IFFIFO instead of S_IFIFO + echo "#include " > ${BASE}$$.c +-echo "main() { return (S_IFIFO); }" >> ${BASE}$$.c ++echo "int main() { return (S_IFIFO); }" >> ${BASE}$$.c + if ${CC} ${CFLAGS} -o ${BASE}$$ ${BASE}$$.c ${LDLIBS} 1>${NULL} 2>${NULL}; then + true; + else + rm -f ${BASE}$$ ${BASE}$$.o ${BASE}$$.c + echo "#include " > ${BASE}$$.c +- echo "main() { return (S_IFFIFO); }" >> ${BASE}$$.c ++ echo "int main() { return (S_IFFIFO); }" >> ${BASE}$$.c + ${CC} ${CFLAGS} -o ${BASE}$$ ${BASE}$$.c ${LDLIBS} 1>${NULL} 2>${NULL} \ + || CFLAGS="${CFLAGS} -DS_IFIFO=S_IFFIFO" + fi +@@ -151,7 +151,7 @@ rm -f ${BASE}$$ ${BASE}$$.o ${BASE}$$.c + # check that we have uint + echo "#include " > ${BASE}$$.c + echo "#include " >> ${BASE}$$.c +-echo "main() { uint i = 0; return (i); }" >> ${BASE}$$.c ++echo "int main() { uint i = 0; return (i); }" >> ${BASE}$$.c + ${CC} ${CFLAGS} -o ${BASE}$$ ${BASE}$$.c ${LDLIBS} 1>${NULL} 2>${NULL} \ + && CFLAGS="${CFLAGS} -DHAVE_uint=1"; + rm -f ${BASE}$$ ${BASE}$$.o ${BASE}$$.c +@@ -161,7 +161,7 @@ HAVE_uint64=0 + echo "#include " > ${BASE}$$.c + echo "#include " >> ${BASE}$$.c + echo "#include " >> ${BASE}$$.c +-echo "main() { uint64 i = 0; return (int)(i); }" >> ${BASE}$$.c ++echo "int main() { uint64 i = 0; return (int)(i); }" >> ${BASE}$$.c + ${CC} ${CFLAGS} -o ${BASE}$$ ${BASE}$$.c ${LDLIBS} 1>${NULL} 2>${NULL} \ + && CFLAGS="${CFLAGS} -DHAVE_uint64=1" && HAVE_uint64=1; + rm -f ${BASE}$$ ${BASE}$$.o ${BASE}$$.c +@@ -170,7 +170,7 @@ rm -f ${BASE}$$ ${BASE}$$.o ${BASE}$$.c + if [ ${HAVE_uint64} = 0 ]; then + echo "#include " > ${BASE}$$.c + echo "#include " >> ${BASE}$$.c +- echo "main() { uint64_t i = 0; return (int)(i); }" >> ${BASE}$$.c ++ echo "int main() { uint64_t i = 0; return (int)(i); }" >> ${BASE}$$.c + ${CC} ${CFLAGS} -o ${BASE}$$ ${BASE}$$.c ${LDLIBS} 1>${NULL} 2>${NULL} \ + && CFLAGS="${CFLAGS} -DHAVE_uint64_t=1"; + rm -f ${BASE}$$ ${BASE}$$.o ${BASE}$$.c +@@ -181,7 +181,7 @@ HAVE_int64=0 + echo "#include " > ${BASE}$$.c + echo "#include " >> ${BASE}$$.c + echo "#include " >> ${BASE}$$.c +-echo "main() { int64 i = 0; return (int)(i); }" >> ${BASE}$$.c ++echo "int main() { int64 i = 0; return (int)(i); }" >> ${BASE}$$.c + ${CC} ${CFLAGS} -o ${BASE}$$ ${BASE}$$.c ${LDLIBS} 1>${NULL} 2>${NULL} \ + && CFLAGS="${CFLAGS} -DHAVE_int64=1" && HAVE_int64=1; + rm -f ${BASE}$$ ${BASE}$$.o ${BASE}$$.c +@@ -190,7 +190,7 @@ rm -f ${BASE}$$ ${BASE}$$.o ${BASE}$$.c + if [ ${HAVE_int64} = 0 ]; then + echo "#include " > ${BASE}$$.c + echo "#include " >> ${BASE}$$.c +- echo "main() { int64_t i = 0; return (int)(i); }" >> ${BASE}$$.c ++ echo "int main() { int64_t i = 0; return (int)(i); }" >> ${BASE}$$.c + ${CC} ${CFLAGS} -o ${BASE}$$ ${BASE}$$.c ${LDLIBS} 1>${NULL} 2>${NULL} \ + && CFLAGS="${CFLAGS} -DHAVE_int64_t=1"; + rm -f ${BASE}$$ ${BASE}$$.o ${BASE}$$.c +@@ -209,7 +209,7 @@ rm -f ${BASE}$$ ${BASE}$$.o ${BASE}$$.c + echo "#include " > ${BASE}$$.c + echo "#include " >> ${BASE}$$.c + echo "#include " >> ${BASE}$$.c +-echo "main() { int s; struct sockaddr dest; socklen_t len; getsockname(s, &dest, &len); }" >> ${BASE}$$.c ++echo "int main() { int s; struct sockaddr dest; socklen_t len; getsockname(s, &dest, &len); }" >> ${BASE}$$.c + ${CC} ${CFLAGS} -o ${BASE}$$ ${BASE}$$.c ${LDLIBS} 1>${NULL} 2>${NULL} \ + && CFLAGS="${CFLAGS} -DHAVE_socklen_t" + rm -f ${BASE}$$ ${BASE}$$.o ${BASE}$$.c +@@ -217,7 +217,7 @@ rm -f ${BASE}$$ ${BASE}$$.o ${BASE}$$.c + # check that we have drand48 and srand48 + HAVE_RANDOM=0 + echo "#include " > ${BASE}$$.c +-echo "main() { srand48(973); return (int)(1.0E9 * drand48()); }" >> ${BASE}$$.c ++echo "int main() { srand48(973); return (int)(1.0E9 * drand48()); }" >> ${BASE}$$.c + if ${CC} ${CFLAGS} -o ${BASE}$$ ${BASE}$$.c ${LDLIBS} 1>${NULL} 2>${NULL}; then + CFLAGS="${CFLAGS} -DHAVE_DRAND48" + HAVE_RANDOM=1 +@@ -226,7 +226,7 @@ rm -f ${BASE}$$ ${BASE}$$.o ${BASE}$$.c + + if [ ${HAVE_RANDOM} -eq 0 ]; then + echo "#include " > ${BASE}$$.c +- echo "main() { srand(973); return (10 * rand()) / RAND_MAX; }" >> ${BASE}$$.c ++ echo "int main() { srand(973); return (10 * rand()) / RAND_MAX; }" >> ${BASE}$$.c + if ${CC} ${CFLAGS} -o ${BASE}$$ ${BASE}$$.c ${LDLIBS} 1>${NULL} 2>${NULL}; then + CFLAGS="${CFLAGS} -DHAVE_RAND" + HAVE_RANDOM=1 +@@ -236,7 +236,7 @@ fi + + if [ ${HAVE_RANDOM} -eq 0 ]; then + echo "#include " > ${BASE}$$.c +- echo "main() { srandom(973); return (10 * random()) / RAND_MAX; }" >> ${BASE}$$.c ++ echo "int main() { srandom(973); return (10 * random()) / RAND_MAX; }" >> ${BASE}$$.c + if ${CC} ${CFLAGS} -o ${BASE}$$ ${BASE}$$.c ${LDLIBS} 1>${NULL} 2>${NULL}; then + CFLAGS="${CFLAGS} -DHAVE_RANDOM" + HAVE_RANDOM=1 +@@ -247,7 +247,7 @@ fi + # check that we have sysmp + echo "#include " > ${BASE}$$.c + echo "#include " >> ${BASE}$$.c +-echo "main() { return (int)sysmp(MP_NPROCS); }" >> ${BASE}$$.c ++echo "int main() { return (int)sysmp(MP_NPROCS); }" >> ${BASE}$$.c + ${CC} ${CFLAGS} -o ${BASE}$$ ${BASE}$$.c ${LDLIBS} 1>${NULL} 2>${NULL} \ + && CFLAGS="${CFLAGS} -DHAVE_SYSMP=1"; + rm -f ${BASE}$$ ${BASE}$$.o ${BASE}$$.c +@@ -257,7 +257,7 @@ echo "#include " > ${BASE}$$.c + echo "#include " >> ${BASE}$$.c + echo "#include " >> ${BASE}$$.c + echo "#include " >> ${BASE}$$.c +-echo "main() { return bindprocessor(BINDPROCESS, getpid(), 0); }" >> ${BASE}$$.c ++echo "int main() { return bindprocessor(BINDPROCESS, getpid(), 0); }" >> ${BASE}$$.c + ${CC} ${CFLAGS} -o ${BASE}$$ ${BASE}$$.c ${LDLIBS} 1>${NULL} 2>${NULL} \ + && CFLAGS="${CFLAGS} -DHAVE_BINDPROCESSOR=1"; + rm -f ${BASE}$$ ${BASE}$$.o ${BASE}$$.c +@@ -267,16 +267,17 @@ echo "#include " > ${BASE}$$.c + echo "#include " >> ${BASE}$$.c + echo "#include " >> ${BASE}$$.c + echo "#include " >> ${BASE}$$.c +-echo "main() { return processor(P_PID, P_MYPID, 0, NULL); }" >> ${BASE}$$.c ++echo "int main() { return processor(P_PID, P_MYPID, 0, NULL); }" >> ${BASE}$$.c + ${CC} ${CFLAGS} -o ${BASE}$$ ${BASE}$$.c ${LDLIBS} 1>${NULL} 2>${NULL} \ + && CFLAGS="${CFLAGS} -DHAVE_BINDPROCESSOR=1"; + rm -f ${BASE}$$ ${BASE}$$.o ${BASE}$$.c + + # check that we have sched_setaffinity +-echo "#include " > ${BASE}$$.c ++echo "#define _GNU_SOURCE" > ${BASE}$$.c ++echo "#include " >> ${BASE}$$.c + echo "#include " >> ${BASE}$$.c + echo "#include " >> ${BASE}$$.c +-echo "main() { unsigned long mask = 1; return sched_setaffinity(0, sizeof(unsigned long), &mask); }" >> ${BASE}$$.c ++echo "int main() { unsigned long mask = 1; return sched_setaffinity(0, sizeof(unsigned long), &mask); }" >> ${BASE}$$.c + ${CC} ${CFLAGS} -o ${BASE}$$ ${BASE}$$.c ${LDLIBS} 1>${NULL} 2>${NULL} \ + && CFLAGS="${CFLAGS} -DHAVE_SCHED_SETAFFINITY=1"; + rm -f ${BASE}$$ ${BASE}$$.o ${BASE}$$.c +@@ -285,4 +286,4 @@ rm -f ${BASE}$$ ${BASE}$$.o ${BASE}$$.c + if [ ! -d ${BINDIR} ]; then mkdir -p ${BINDIR}; fi + + # now go ahead and build everything! +-${MAKE} OS="${OS}" CC="${CC}" CFLAGS="${CFLAGS}" LDLIBS="${LDLIBS}" O="${BINDIR}" $* ++${MAKE} OS="${OS}" CC="${CC}" CFLAGS="${CFLAGS}" LDLIBS="${LDLIBS}" O="${BINDIR}" ${EXTRA_OEMAKE} $* +--- a/src/lib_sched.c ++++ b/src/lib_sched.c +@@ -1,3 +1,4 @@ ++#define _GNU_SOURCE + #include "bench.h" + + /* #define _DEBUG */ diff --git a/meta-oe/recipes-benchmark/lmbench/lmbench_3.0-a9.bb b/meta-oe/recipes-benchmark/lmbench/lmbench_3.0-a9.bb index 492ea4b10b..d74c28f3f6 100644 --- a/meta-oe/recipes-benchmark/lmbench/lmbench_3.0-a9.bb +++ b/meta-oe/recipes-benchmark/lmbench/lmbench_3.0-a9.bb @@ -9,7 +9,6 @@ inherit autotools-brokensep update-alternatives DEPENDS += "libtirpc" CFLAGS += "-I${STAGING_INCDIR}/tirpc" -LDLIBS += " -ltirpc " PR = "r2" @@ -23,7 +22,6 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/lmbench/lmbench-${PV}.tgz \ file://fix-lmbench-memory-check-failure.patch \ file://0001-avoid-gcc-optimize-away-the-loops.patch \ file://0001-lat_http.c-Add-printf-format.patch \ - file://0001-Check-for-musl-define-guard-before-redefining-sockle.patch \ file://0002-build-Adjust-CFLAGS-LDFLAGS-to-append-values-passed-.patch \ file://0001-src-Makefile-use-libdir-instead-of-hardcoded-lib.patch \ file://0001-lmbench-Point-webpage-lm-to-target-directory.patch \ @@ -31,6 +29,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/lmbench/lmbench-${PV}.tgz \ file://0001-lat_fifo-Fix-cleanup-sequence.patch \ file://0001-doc-Fix-typos-in-lat_unix_connect-manual-page.patch \ file://0001-bench.h-Fix-typo-in-specifying-string.h.patch \ + file://0001-scripts-build-Fix-the-tests-to-build-with-clang15.patch \ " SRC_URI[md5sum] = "b3351a3294db66a72e2864a199d37cbf" SRC_URI[sha256sum] = "cbd5777d15f44eab7666dcac418054c3c09df99826961a397d9acf43d8a2a551" @@ -38,8 +37,11 @@ SRC_URI[sha256sum] = "cbd5777d15f44eab7666dcac418054c3c09df99826961a397d9acf43d8 UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/lmbench/files/development/" UPSTREAM_CHECK_REGEX = "lmbench-(?P\d+(\.\d+)+-[a-z]+\d+)" +export OS = "${TARGET_SYS}" +export TARGET = "${TARGET_OS}" + EXTRA_OEMAKE = 'CC="${CC}" AR="${AR}" RANLIB="${RANLIB}" CFLAGS="${CFLAGS}" \ - LDFLAGS="${LDFLAGS}" LDLIBS="${LDLIBS}" LD="${LD}" OS="${TARGET_SYS}" \ + LDFLAGS="${LDFLAGS}" LD="${LD}" OS="${TARGET_SYS}" \ TARGET="${TARGET_OS}" BASE="${prefix}" MANDIR="${mandir}"' do_configure() { @@ -54,7 +56,7 @@ do_compile () { CFLAGS="${CFLAGS} -DHAVE_uint" fi install -d ${S}/bin/${TARGET_SYS} - oe_runmake -C src + ${S}/scripts/build } do_install () { From patchwork Wed Sep 7 23: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: 12482 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 2D7BDC6FA8E for ; Wed, 7 Sep 2022 23:41:26 +0000 (UTC) Received: from mail-pl1-f178.google.com (mail-pl1-f178.google.com [209.85.214.178]) by mx.groups.io with SMTP id smtpd.web09.2844.1662594070794028296 for ; Wed, 07 Sep 2022 16:41:16 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=RiT2c/0R; spf=pass (domain: gmail.com, ip: 209.85.214.178, mailfrom: raj.khem@gmail.com) Received: by mail-pl1-f178.google.com with SMTP id d12so16113314plr.6 for ; Wed, 07 Sep 2022 16:41:16 -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:subject:date; bh=1uNrUmhozEbvX9Zgp7WiHqFhJweGKgvS/k5Mkzbe6pI=; b=RiT2c/0ReT4Uzmd6J1Dculs2DCm3dwJDMdh6rPRBTWfYRkfMcGPN6cfyHdiCAVTXTH 2oUr8wvWYRyvu1JPBQMcaWLgOeke0S9VwTdYaL8zxGJHXrurPQFhTGyf0DrUglhkPFnp R1qwN+iXOyODr1qHYfmPYm0QzBJuEx57l1FtLWIvNZGhEl+/3oiH+SxMe3dczDwUkSnR iAy2Lw/zor2rcE/JZxgQpT1ZQZO86EnKXyyrh7OtLyP1mqy0RN02XPbi+upc8yB5Sk+E pJ3ZQ/7WNRqyR8L1zfceAQnRB/sQGQ3G2khJIpYxNerf+8T5ViHeOorM+rMfkoJE10Hi mh/w== 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 :subject:date; bh=1uNrUmhozEbvX9Zgp7WiHqFhJweGKgvS/k5Mkzbe6pI=; b=7zrqyNv3c72nLKneDSs+2S7Rw3VKnZbldmr535Q2epo4DdaO4D61AX3jLxwqZpwnON qm4b4kHIqQS0lyTN2pxhdOc2U6JLJO81GJRSLCG68x0/MgprCt+Czp7KQDwiQSy3gyIv OnhKFjs8mctnANkZyDdoPuazx+2IHt2zDDOyUJrVYQRJxyWHjpB1YL7aZw30mpIfMvGt J6+dHrLIru7PxXJWksRKJYgOdj3CzKRL++kKPr4ERIkoCxQtztx2Ahz4oE3hycZW0KKo +SkOnssG1wDRXWEvLx/VC/rdkV763MIDzC5UjrHN9Urzdp988LozhAwLeyzf+9ZGkqqY 5ZCw== X-Gm-Message-State: ACgBeo3pPfZ1UUXRzZHzJyTmyyJ4meZos7FlKaCF/UrMsYq6Pw2L8AX6 PoRNjSgQS6LJOQ7Df7H38bUB6D+T54MCNg== X-Google-Smtp-Source: AA6agR7HWO2rZSpXEund0fZSMfLxDcKwjiD64n5BcXDoKCD1yoJ4DqzmKgGyBVySdzoJSrP2QeG20Q== X-Received: by 2002:a17:90a:7088:b0:200:4e9f:a206 with SMTP id g8-20020a17090a708800b002004e9fa206mr951717pjk.173.1662594076000; Wed, 07 Sep 2022 16:41:16 -0700 (PDT) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9200:a0f0::1761]) by smtp.gmail.com with ESMTPSA id ij5-20020a170902ab4500b0016c5306917fsm10276495plb.53.2022.09.07.16.41.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 07 Sep 2022 16:41:15 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Cc: Khem Raj Subject: [meta-oe][PATCH 14/22] mcpp: Fix build with clang Date: Wed, 7 Sep 2022 16:40:54 -0700 Message-Id: <20220907234102.3312797-14-raj.khem@gmail.com> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20220907234102.3312797-1-raj.khem@gmail.com> References: <20220907234102.3312797-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 ; Wed, 07 Sep 2022 23:41:26 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/98704 Signed-off-by: Khem Raj --- ...figure-Fix-checks-for-system-headers.patch | 44 +++++++++++++++++++ meta-oe/recipes-devtools/mcpp/mcpp_2.7.2.bb | 1 + 2 files changed, 45 insertions(+) create mode 100644 meta-oe/recipes-devtools/mcpp/files/0001-configure-Fix-checks-for-system-headers.patch diff --git a/meta-oe/recipes-devtools/mcpp/files/0001-configure-Fix-checks-for-system-headers.patch b/meta-oe/recipes-devtools/mcpp/files/0001-configure-Fix-checks-for-system-headers.patch new file mode 100644 index 0000000000..d9bdc01ca1 --- /dev/null +++ b/meta-oe/recipes-devtools/mcpp/files/0001-configure-Fix-checks-for-system-headers.patch @@ -0,0 +1,44 @@ +From c1e9f2f3d086e0df3c10a2468fd7b37fd0c5038c Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Wed, 7 Sep 2022 00:02:08 -0700 +Subject: [PATCH] configure: Fix checks for system headers + +Define _DEFAULT_SOURCE in system.c so unistd.h can expose readlink API + +Upstream-Status: Pending + +Signed-off-by: Khem Raj +--- + configure.ac | 2 +- + src/system.c | 2 ++ + 2 files changed, 3 insertions(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index cdf1eba..6fc81e6 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -152,7 +152,7 @@ fi + + dnl Checks for header files. + +-AC_CHECK_HEADERS( [unistd.h, stdint.h, inttypes.h]) ++AC_CHECK_HEADERS( [unistd.h stdint.h inttypes.h]) + + dnl Checks for typedefs, and compiler characteristics. + +diff --git a/src/system.c b/src/system.c +index 4e008fa..98631a6 100644 +--- a/src/system.c ++++ b/src/system.c +@@ -36,6 +36,8 @@ + * 1. specify the constants in "configed.H" or "noconfig.H", + * 2. append the system-dependent routines in this file. + */ ++ ++#define _DEFAULT_SOURCE + #if PREPROCESSED + #include "mcpp.H" + #else +-- +2.37.3 + diff --git a/meta-oe/recipes-devtools/mcpp/mcpp_2.7.2.bb b/meta-oe/recipes-devtools/mcpp/mcpp_2.7.2.bb index f8125f72d9..9445856730 100644 --- a/meta-oe/recipes-devtools/mcpp/mcpp_2.7.2.bb +++ b/meta-oe/recipes-devtools/mcpp/mcpp_2.7.2.bb @@ -5,6 +5,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=5ca370b75ec890321888a00cea9bc1d5" SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BPN}-${PV}.tar.gz \ file://ice-mcpp.patch \ + file://0001-configure-Fix-checks-for-system-headers.patch \ file://CVE-2019-14274.patch" SRC_URI[md5sum] = "512de48c87ab023a69250edc7a0c7b05" SRC_URI[sha256sum] = "3b9b4421888519876c4fc68ade324a3bbd81ceeb7092ecdbbc2055099fcb8864" From patchwork Wed Sep 7 23:40:55 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 12479 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 1BC73C6FA8B for ; Wed, 7 Sep 2022 23:41:26 +0000 (UTC) Received: from mail-pf1-f169.google.com (mail-pf1-f169.google.com [209.85.210.169]) by mx.groups.io with SMTP id smtpd.web12.2743.1662594077757868600 for ; Wed, 07 Sep 2022 16:41:17 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=JaZr1h+U; spf=pass (domain: gmail.com, ip: 209.85.210.169, mailfrom: raj.khem@gmail.com) Received: by mail-pf1-f169.google.com with SMTP id 145so16176299pfw.4 for ; Wed, 07 Sep 2022 16:41:17 -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:subject:date; bh=0an/TEEP3Ywx0IBH9cLWovJyQh39ruRtU87NEqdn3H0=; b=JaZr1h+ULctxFdy9gnnW/u5KMlNiKi3RCAC63SkZIDYrETVChzkzD/yWi3tYRFTO6I x8l7tGgW+cbd/61CDnLEMVUrdsl0QbjZjzbY/kyD9yVhMN/p57WITz2mcHgtWXNtGIGE nIU9tG6SG5kxBUyqpnZiy0CRLlokhvrnwV1O4rkc2cikl5dE3/oxatTRfSBdtqPws96V vLH4nrvW7Zo3d9S4KzzLKtYghhAhq5d/ADbKDgtl4ziJqlDUd9fkrykTSfz0nEZD84BP /9eT2e4oZ5/GcBSqQKqUa0rs/agrXPpkZ2vy309AnvUz63UfP5PMuUjRAt8+ovBKbt6g uwNg== 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 :subject:date; bh=0an/TEEP3Ywx0IBH9cLWovJyQh39ruRtU87NEqdn3H0=; b=pPbYn2Ol4YYkeWLVXEoFQLvzbEpjfNuAsB1eUIK3hz8y1s6MAewvXwE7Pbt8V9HeOg edXZ+E/aplVseztLy+FjwW+Kzk6EPIzpubAwwONhfIdy09wMUrQSiCcNC/KuDGO7Nbw8 aStyd8oRlObGWThiLbmntmPq2Gg0JiGNMu7uVgPIJXmzmdaHSG5+MVyg6SRk9x/ifEmM LfaBHfuvy6iOWwRzoKwDnXx9uOzc6QlTDA+H/x/tOwJGu9Xf5DDx17NBIzGs13z5SjY4 pwnexn2+ONffp1dgPo8HkWwjd5BvT40yYxQzXCehQ+cC0a6MCuAQprLOYMYNNiz9NTXW 1udg== X-Gm-Message-State: ACgBeo1YMEQqcM3IVH247eInh9iezpSUhgMu8/EYdtkRjASkjzv75Sbs Nhbygz1TaLkvlhw37EDzpIUiaV9rEZ75ow== X-Google-Smtp-Source: AA6agR6Wh4A1Yyme+kT7HHafFIQ/hxVyM2skx4S/J9lA4FoxMoUG0vnU3rusXUh2jPB2j2o7T9G/Qw== X-Received: by 2002:a05:6a00:1149:b0:53e:62c8:10bc with SMTP id b9-20020a056a00114900b0053e62c810bcmr5991650pfm.49.1662594076927; Wed, 07 Sep 2022 16:41:16 -0700 (PDT) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9200:a0f0::1761]) by smtp.gmail.com with ESMTPSA id ij5-20020a170902ab4500b0016c5306917fsm10276495plb.53.2022.09.07.16.41.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 07 Sep 2022 16:41:16 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Cc: Khem Raj Subject: [meta-networking][PATCH 15/22] ot-br-posix: Fix unused variable error Date: Wed, 7 Sep 2022 16:40:55 -0700 Message-Id: <20220907234102.3312797-15-raj.khem@gmail.com> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20220907234102.3312797-1-raj.khem@gmail.com> References: <20220907234102.3312797-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 ; Wed, 07 Sep 2022 23:41:26 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/98705 Fixes r: variable 'i' set but not used [-Wunused-but-set-variable] | for (uint8_t i = 0;; i++) | ^ | 1 error generated. Signed-off-by: Khem Raj --- .../openthread/ot-br-posix/unused_var.patch | 10 ++++++++++ .../recipes-connectivity/openthread/ot-br-posix_git.bb | 1 + 2 files changed, 11 insertions(+) create mode 100644 meta-networking/recipes-connectivity/openthread/ot-br-posix/unused_var.patch diff --git a/meta-networking/recipes-connectivity/openthread/ot-br-posix/unused_var.patch b/meta-networking/recipes-connectivity/openthread/ot-br-posix/unused_var.patch new file mode 100644 index 0000000000..9727cbafd8 --- /dev/null +++ b/meta-networking/recipes-connectivity/openthread/ot-br-posix/unused_var.patch @@ -0,0 +1,10 @@ +--- a/third_party/openthread/repo/src/cli/cli.cpp ++++ b/third_party/openthread/repo/src/cli/cli.cpp +@@ -1785,6 +1785,7 @@ template <> otError Interpreter::Process + + for (uint8_t i = 0;; i++) + { ++ OT_UNUSED_VARIABLE(i); + SuccessOrExit(otThreadGetNextCacheEntry(GetInstancePtr(), &entry, &iterator)); + OutputEidCacheEntry(entry); + } diff --git a/meta-networking/recipes-connectivity/openthread/ot-br-posix_git.bb b/meta-networking/recipes-connectivity/openthread/ot-br-posix_git.bb index bbec81c27e..ca763d01fa 100644 --- a/meta-networking/recipes-connectivity/openthread/ot-br-posix_git.bb +++ b/meta-networking/recipes-connectivity/openthread/ot-br-posix_git.bb @@ -19,6 +19,7 @@ SRC_URI = "gitsm://github.com/openthread/ot-br-posix.git;protocol=https;branch=m file://0001-cmake-Disable-nonnull-compare-warning-on-gcc.patch \ file://0001-bn_mul.h-fix-x86-PIC-inline-ASM-compilation-with-GCC.patch \ file://mbedtls.patch \ + file://unused_var.patch \ " S = "${WORKDIR}/git" From patchwork Wed Sep 7 23:40:56 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 12481 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 1DE33C6FA90 for ; Wed, 7 Sep 2022 23:41:26 +0000 (UTC) Received: from mail-pl1-f174.google.com (mail-pl1-f174.google.com [209.85.214.174]) by mx.groups.io with SMTP id smtpd.web12.2744.1662594078498214432 for ; Wed, 07 Sep 2022 16:41:18 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=MJR8Grjg; spf=pass (domain: gmail.com, ip: 209.85.214.174, mailfrom: raj.khem@gmail.com) Received: by mail-pl1-f174.google.com with SMTP id p18so16105304plr.8 for ; Wed, 07 Sep 2022 16:41:18 -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:subject:date; bh=ywNrDPDSO4wSjSUFTIhYVl4FmKicM6OG76Te0FYqsqs=; b=MJR8GrjgwYmsq2KkQy86kz+F7OTi0ouMHBvAlgONcGwUTjDgxUvaCbEN4rVzGWHShS mG5UqbyGaSpLrRAkqSMCyiCOUT0qfc++7xngr0ZNQywmNN9tU+1/fmoQAvm5HMUYL8OY Rx/XXWv6XIN6louJwJltGxA9iqzs6yPdBUPrlQ46nhRHY6C7xVfytIsU+5fThwiQPvzJ xDlvAmUkzt9FXnNDADBIulPrtE54gSkAH65gmGz2G7ZNTinFOGItR7GbaahTI8VoVn2V uBDgK39KNxeOeyJ3dy8kYizxPm268OIl9Gy7SbMJaB2rOVoyQUqDMz/Vakm0l2zUwun0 uf2A== 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 :subject:date; bh=ywNrDPDSO4wSjSUFTIhYVl4FmKicM6OG76Te0FYqsqs=; b=EnMvG03JRqB5wtqM+gf+DvpxC/hi8XjyCrV00rWHVn3YcA559eZlwEG1op8Jqx68qJ cy1v0wMLPSn3NZxOcA/2vLzguVsKkilCGBvMBFUN39b2slFAogJKL+dEGrx2x+Y/aOR1 Xtxxsevgl+nX95y5wy/OGalnilQ1YjPhs9iliKKoCC93N3tLfgNQM8OpRcZS17DjZYpl 0iFKbJpmhVmOGK/ANO70G8OFVhu/ra49BblzccPLrICKMMLzDANshABzmn0l7b7++7+v XW6RfFXkSFIDVcaF/lhgvYrHcTWYRSQCY+OkRGhOSvoqE8VLNAYIwSMIl9y3CyYn/HnR XxPQ== X-Gm-Message-State: ACgBeo3cNra6PvQBJMiYgAuJzvisAZVh55AUYByaqT+1FEm/r0CjDF0D wUB3ns0HlzT8auTHt4iulSLYWEMb3sQXig== X-Google-Smtp-Source: AA6agR5HssPuEse2VAA5uvNH3lTdCzu8pAeIiBeX857PNp5ttU7B/ad4EiqUNHEowMgU8n2CdoonXg== X-Received: by 2002:a17:90b:3e86:b0:1f5:2b4f:7460 with SMTP id rj6-20020a17090b3e8600b001f52b4f7460mr997271pjb.97.1662594077740; Wed, 07 Sep 2022 16:41:17 -0700 (PDT) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9200:a0f0::1761]) by smtp.gmail.com with ESMTPSA id ij5-20020a170902ab4500b0016c5306917fsm10276495plb.53.2022.09.07.16.41.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 07 Sep 2022 16:41:17 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Cc: Khem Raj Subject: [meta-webserver][PATCH 16/22] sthttpd: Define _GNU_SOURCE if HAVE_SIGSET is set Date: Wed, 7 Sep 2022 16:40:56 -0700 Message-Id: <20220907234102.3312797-16-raj.khem@gmail.com> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20220907234102.3312797-1-raj.khem@gmail.com> References: <20220907234102.3312797-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 ; Wed, 07 Sep 2022 23:41:26 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/98706 Signed-off-by: Khem Raj --- ...ne-_GNU_SOURCE-if-HAVE_SIGSET-is-set.patch | 51 +++++++++++++++++++ .../recipes-httpd/sthttpd/sthttpd_2.27.1.bb | 1 + 2 files changed, 52 insertions(+) create mode 100644 meta-webserver/recipes-httpd/sthttpd/sthttpd/0001-Define-_GNU_SOURCE-if-HAVE_SIGSET-is-set.patch diff --git a/meta-webserver/recipes-httpd/sthttpd/sthttpd/0001-Define-_GNU_SOURCE-if-HAVE_SIGSET-is-set.patch b/meta-webserver/recipes-httpd/sthttpd/sthttpd/0001-Define-_GNU_SOURCE-if-HAVE_SIGSET-is-set.patch new file mode 100644 index 0000000000..a1783a7adb --- /dev/null +++ b/meta-webserver/recipes-httpd/sthttpd/sthttpd/0001-Define-_GNU_SOURCE-if-HAVE_SIGSET-is-set.patch @@ -0,0 +1,51 @@ +From f3889e5870e9761ee6113fac7f38aa44cc43e46c Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Wed, 7 Sep 2022 00:30:52 -0700 +Subject: [PATCH] Define _GNU_SOURCE if HAVE_SIGSET is set + +This enforces using sigset() API which needs _GNU_SOURCE macro to be +defined + +Upstream-Status: Submitted [https://github.com/blueness/sthttpd/pull/16] +Signed-off-by: Khem Raj +--- + src/libhttpd.c | 5 ++++- + src/thttpd.c | 4 ++++ + 2 files changed, 8 insertions(+), 1 deletion(-) + +diff --git a/src/libhttpd.c b/src/libhttpd.c +index fa42c10..669be11 100644 +--- a/src/libhttpd.c ++++ b/src/libhttpd.c +@@ -25,9 +25,12 @@ + ** SUCH DAMAGE. + */ + +- + #include + ++#ifdef HAVE_SIGSET ++#define _GNU_SOURCE ++#endif ++ + //system headers + #include + #include +diff --git a/src/thttpd.c b/src/thttpd.c +index ad97188..3c7a449 100644 +--- a/src/thttpd.c ++++ b/src/thttpd.c +@@ -28,6 +28,10 @@ + + #include + ++#ifdef HAVE_SIGSET ++#define _GNU_SOURCE ++#endif ++ + //system headers + #include + #include +-- +2.37.3 + diff --git a/meta-webserver/recipes-httpd/sthttpd/sthttpd_2.27.1.bb b/meta-webserver/recipes-httpd/sthttpd/sthttpd_2.27.1.bb index 4134a0e524..b40b148512 100644 --- a/meta-webserver/recipes-httpd/sthttpd/sthttpd_2.27.1.bb +++ b/meta-webserver/recipes-httpd/sthttpd/sthttpd_2.27.1.bb @@ -8,6 +8,7 @@ DEPENDS += "base-passwd virtual/crypt" SRCREV = "2845bf5bff2b820d2336c8c8061cbfc5f271e720" SRC_URI = "git://github.com/blueness/${BPN};branch=master;protocol=https \ + file://0001-Define-_GNU_SOURCE-if-HAVE_SIGSET-is-set.patch \ file://thttpd.service \ file://thttpd.conf \ file://init" From patchwork Wed Sep 7 23:40:57 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 12478 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 1DAEDC6FA8D for ; Wed, 7 Sep 2022 23:41:26 +0000 (UTC) Received: from mail-pj1-f50.google.com (mail-pj1-f50.google.com [209.85.216.50]) by mx.groups.io with SMTP id smtpd.web12.2745.1662594079248947157 for ; Wed, 07 Sep 2022 16:41:19 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=can7ah1A; spf=pass (domain: gmail.com, ip: 209.85.216.50, mailfrom: raj.khem@gmail.com) Received: by mail-pj1-f50.google.com with SMTP id a5-20020a17090aa50500b002008eeb040eso2046366pjq.1 for ; Wed, 07 Sep 2022 16:41:19 -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:subject:date; bh=0DsEnUWWCYY0ZxAu2gUI+Xn/R04PTWXVPIv+ikW8SKk=; b=can7ah1Aq11jaevHu2kkZ4jsUIZQKLH9ycjS+PCMHltEoe4I5rhmYiJb76c8UgvJQH 9OJD4x1t0CoyFqXwPfqpRBpczNgtuXIqpR6WlXLsVOnm4iUManRAjSdEuLVslzLxus00 yESlAHu2MtMTxB4esQ/hBOuucL0sXwpGsz5hHdirWmvNq/IHStGmHiKXTodHxsBtlzQX kNk9KwSgbB9snkc1xRpugrRe5sRR31vw8pcUDHEDmsLogPPo2zCQzcmUrT12UE+Sq3K/ Sqb6QcY5RJBNNl4vYlSnBrfG8aijxlR5zMOLQHBWD7jHr55OiFe8ly7sQfra9bWmK2EY elEA== 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 :subject:date; bh=0DsEnUWWCYY0ZxAu2gUI+Xn/R04PTWXVPIv+ikW8SKk=; b=nHWlF39k65jyaKK306nInLo7wQ3hu4ZohDS2QBZt6Fh0HjJCALZjGG/vyNkEFF4j0+ FI4g4w5RMNpxsfIuitC1rvQPO7e4xq/q/6OW5Dl6YuR7wm6edgb7Tolxl63mYWWELpst unjFocunzR4sMZsSb6tgOwADGSKAuvndWGAEONy+wOFqdgdtH2vbRyBpyDZbqr2kwJcZ vmlo7vCEb2rb1aqPUNX0uSJ852k55jFUsBzpNEBz7SezAVI20BvO2HFzq/YLTXssfEEp 2iSupDBYTb0IqV6A2Zp+L6HvmhGGP5GlQ2wGpz0vdwBMaw1X1umFE/zY+VaYsTnTzTv0 jbkg== X-Gm-Message-State: ACgBeo0bdGYs/hqNJOV9nFWWjk2yKa3KeQbj1G2addycHakR4RUqaQDx 5da4P4p7NyMXpgG00Iw1h2y4e3Vp+wgdsw== X-Google-Smtp-Source: AA6agR6kVA/b40vJBX/w9tUE6HF6e/12wQtmw4lOz51PEK1YaLWvy1VK7zHv/e4aJu04rlnJ3+1euw== X-Received: by 2002:a17:90a:c402:b0:1f7:75ce:1206 with SMTP id i2-20020a17090ac40200b001f775ce1206mr1030654pjt.68.1662594078519; Wed, 07 Sep 2022 16:41:18 -0700 (PDT) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9200:a0f0::1761]) by smtp.gmail.com with ESMTPSA id ij5-20020a170902ab4500b0016c5306917fsm10276495plb.53.2022.09.07.16.41.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 07 Sep 2022 16:41:18 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Cc: Khem Raj Subject: [meta-networking][PATCH 17/22] libesmtp: Enable gnu strerror_r on glibc Date: Wed, 7 Sep 2022 16:40:57 -0700 Message-Id: <20220907234102.3312797-17-raj.khem@gmail.com> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20220907234102.3312797-1-raj.khem@gmail.com> References: <20220907234102.3312797-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 ; Wed, 07 Sep 2022 23:41:26 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/98707 Signed-off-by: Khem Raj --- meta-networking/recipes-support/libesmtp/libesmtp_1.1.0.bb | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/meta-networking/recipes-support/libesmtp/libesmtp_1.1.0.bb b/meta-networking/recipes-support/libesmtp/libesmtp_1.1.0.bb index 164c8c2612..3d0764a3b9 100644 --- a/meta-networking/recipes-support/libesmtp/libesmtp_1.1.0.bb +++ b/meta-networking/recipes-support/libesmtp/libesmtp_1.1.0.bb @@ -32,5 +32,9 @@ EXTRA_OEMESON = " \ CFLAGS += "-D_GNU_SOURCE" +do_configure:prepend:libc-glibc() { + sed -i -e "s/conf.set('HAVE_WORKING_STRERROR_R', 0)/conf.set('HAVE_WORKING_STRERROR_R', 1)/g" ${S}/meson.build +} + FILES:${PN} = "${libdir}/lib*${SOLIBS} \ ${libdir}/esmtp-plugins-6.2.0/*${SOLIBSDEV}" From patchwork Wed Sep 7 23:40:58 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 12483 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 0B397C6FA82 for ; Wed, 7 Sep 2022 23:41:26 +0000 (UTC) Received: from mail-pj1-f44.google.com (mail-pj1-f44.google.com [209.85.216.44]) by mx.groups.io with SMTP id smtpd.web11.2763.1662594079947148040 for ; Wed, 07 Sep 2022 16:41:20 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=gqvp2Lm0; spf=pass (domain: gmail.com, ip: 209.85.216.44, mailfrom: raj.khem@gmail.com) Received: by mail-pj1-f44.google.com with SMTP id x1-20020a17090ab00100b001fda21bbc90so524855pjq.3 for ; Wed, 07 Sep 2022 16:41:19 -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:subject:date; bh=bPUr1HXlkQDOR1ItbL+h3D68z4qOFbrFsJHCKYIVqgo=; b=gqvp2Lm0ArGUccKLLSy1w5ILDx4OoAjyR8lApA2CGZC5cZ6pe+ieZQ/wBDTgCRZyy2 adKqo/43lt/6wcgtrG+QE/efZqaSttg8JZaALM+kXAb+kZXBGIV6NTgazvqsigEKmL6A MKeTo6rrTzATW57i0PnLRruu/HA6Xwwqtuif9h8XDlIg/IT8ITQmsslkf3qrfPu0lncG 83P5m2gdsTTrN0qY1AYgwYeKRkYdMe+IylPIhN/ZXuIkt4ijuxZc2v6lhdNesrPAwOUT PHf3+y9O9y1NIJRZCObNSUE3JXzjpz0tqTuSWyOCYXQLVlPTE1YOZAQq1SN0Fx/lyn5U 5JYA== 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 :subject:date; bh=bPUr1HXlkQDOR1ItbL+h3D68z4qOFbrFsJHCKYIVqgo=; b=qV8I6L3NZMNCe/TvMQq+sisEWR2HjjmQwm/Rxc3H10WAlz8WrTByg41/qXe+YWpBf1 OujJDMEeYtSQ0U0Pnoc9LyyHCeKycY44pIfrsP016rx6DlzuxxQm3Lvn64B5aDsYH/sP fq8CVkNZg8DY/vnlsoRt7U6drWQsNVpxVmRCDQl2cBXe2xUCHiOmye6XB7o8PjUDrlZv h8eAHcSSBEdYJ7WQRzvrP0/etxmIMSiOGqLz/sIMZ1xftm4saNG35mmCivm5hIS7R6yF B3GTtZhvE1+/huApSvRmJH5EAH4i1gez2xqGZGg9gbNImBubzBlVGZado5YT/YYDgUX1 SDxg== X-Gm-Message-State: ACgBeo2wZBXunrnnPwQu/yiMKEsnjX5oU38yDaCmZ+eyhtNiRjl6Qr/r PvUZ7esAqKChpfZwcUXIaMDwbc3q5H7dDw== X-Google-Smtp-Source: AA6agR7mPtLvO/Hln6ZaQLl9b85+8RwnBs74GO79hKVcKkFlbExCBVenDJyH2i4+9XMSWlAOiGJchA== X-Received: by 2002:a17:902:f54b:b0:174:f4a3:767c with SMTP id h11-20020a170902f54b00b00174f4a3767cmr6357497plf.4.1662594079223; Wed, 07 Sep 2022 16:41:19 -0700 (PDT) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9200:a0f0::1761]) by smtp.gmail.com with ESMTPSA id ij5-20020a170902ab4500b0016c5306917fsm10276495plb.53.2022.09.07.16.41.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 07 Sep 2022 16:41:18 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Cc: Khem Raj Subject: [meta-oe][PATCH 18/22] android-tools: Use local strlcpy implementation on glibc Date: Wed, 7 Sep 2022 16:40:58 -0700 Message-Id: <20220907234102.3312797-18-raj.khem@gmail.com> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20220907234102.3312797-1-raj.khem@gmail.com> References: <20220907234102.3312797-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 ; Wed, 07 Sep 2022 23:41:26 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/98708 Signed-off-by: Khem Raj --- ...define-strlcpy-for-glibc-based-syste.patch | 35 +++++++++++++++++++ .../android-tools/android-tools_5.1.1.r37.bb | 1 + 2 files changed, 36 insertions(+) create mode 100644 meta-oe/recipes-devtools/android-tools/android-tools/core/0001-memory.h-Always-define-strlcpy-for-glibc-based-syste.patch diff --git a/meta-oe/recipes-devtools/android-tools/android-tools/core/0001-memory.h-Always-define-strlcpy-for-glibc-based-syste.patch b/meta-oe/recipes-devtools/android-tools/android-tools/core/0001-memory.h-Always-define-strlcpy-for-glibc-based-syste.patch new file mode 100644 index 0000000000..82e97152be --- /dev/null +++ b/meta-oe/recipes-devtools/android-tools/android-tools/core/0001-memory.h-Always-define-strlcpy-for-glibc-based-syste.patch @@ -0,0 +1,35 @@ +From db3a3714be07c8ab51b9ae7b035e4afe9f39c645 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Wed, 7 Sep 2022 13:20:22 -0700 +Subject: [PATCH] memory.h: Always define strlcpy for glibc based systems + +android-config.h file includes on compiler cmdline sets HAVE_STRLCPY +unconditionally, since bionic supports it, its no big deal on android +and also no problem when using musl since implementation exists for musl +too, but glibc does not provide this. So either we include libbsd or use +the implementation provided by android-tools here. We are currently +using the in tree implementation for systems which do not provide it + +Upstream-Status: Pending + +Signed-off-by: Khem Raj +--- + include/cutils/memory.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/include/cutils/memory.h b/include/cutils/memory.h +index e725cdd032..9e99353c58 100644 +--- a/include/cutils/memory.h ++++ b/include/cutils/memory.h +@@ -30,7 +30,7 @@ void android_memset16(uint16_t* dst, uint16_t value, size_t size); + /* size is given in bytes and must be multiple of 4 */ + void android_memset32(uint32_t* dst, uint32_t value, size_t size); + +-#if !HAVE_STRLCPY ++#if !HAVE_STRLCPY || defined(__GLIBC__) + /* Declaration of strlcpy() for platforms that don't already have it. */ + size_t strlcpy(char *dst, const char *src, size_t size); + #endif +-- +2.37.3 + diff --git a/meta-oe/recipes-devtools/android-tools/android-tools_5.1.1.r37.bb b/meta-oe/recipes-devtools/android-tools/android-tools_5.1.1.r37.bb index 37e72de2a6..abd140c7b8 100644 --- a/meta-oe/recipes-devtools/android-tools/android-tools_5.1.1.r37.bb +++ b/meta-oe/recipes-devtools/android-tools/android-tools_5.1.1.r37.bb @@ -45,6 +45,7 @@ SRC_URI = " \ file://core/0015-libsparse-Split-off-most-of-sparse_file_read_normal-.patch;patchdir=system/core \ file://core/0016-libsparse-Add-hole-mode-to-sparse_file_read.patch;patchdir=system/core \ file://core/0017-img2simg-Add-support-for-converting-holes-to-don-t-c.patch;patchdir=system/core \ + file://core/0001-memory.h-Always-define-strlcpy-for-glibc-based-syste.patch;patchdir=system/core \ file://extras/0001-ext4_utils-remove-selinux-extensions.patch;patchdir=system/extras \ file://extras/0002-ext4_utils-add-o-argument-to-preserve-ownership.patch;patchdir=system/extras \ file://libselinux/0001-Remove-bionic-specific-calls.patch;patchdir=external/libselinux \ From patchwork Wed Sep 7 23:40:59 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 12476 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 0C17EC6FA8A for ; Wed, 7 Sep 2022 23:41:26 +0000 (UTC) Received: from mail-pj1-f44.google.com (mail-pj1-f44.google.com [209.85.216.44]) by mx.groups.io with SMTP id smtpd.web11.2764.1662594080793894962 for ; Wed, 07 Sep 2022 16:41:20 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=OdF9JKe9; spf=pass (domain: gmail.com, ip: 209.85.216.44, mailfrom: raj.khem@gmail.com) Received: by mail-pj1-f44.google.com with SMTP id q9-20020a17090a178900b0020265d92ae3so516364pja.5 for ; Wed, 07 Sep 2022 16:41:20 -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:subject:date; bh=PwCkHw6rct9qeHcS7jgXMLw2WRDtaOVDBApdszqpUpE=; b=OdF9JKe9rGUgoQLGBS0wTTzDMJzm0oKLLt7UaFFuDpzihVLEEczHGBspg+lCkfsfkZ ebxS/5HjRuYzJsJpO/MUdVVfIfCrvQS8j4YX6tSd5neL6IvhnikN1Cc223mLNy/Ny5W4 /gt8KwouLNN61g3HghXnPSwh/qGe+H2hnBUYDI6apaL4lBZysYdTA8Q+iLPutCQG71fv pOORcaIDaladsiLGtOh5r+nW7xRS5Wz+o+FnixfhP7nPzlYFZmlO0TnvW2Lr5Gjhjcea ILUGESHN2Zattz74BAbwtvnzrDnzRyqUsyKtstj11J0cLFfqrfBHSenlqzAIdIQXzAx3 LzPg== 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 :subject:date; bh=PwCkHw6rct9qeHcS7jgXMLw2WRDtaOVDBApdszqpUpE=; b=WNPHWRKywzyFjIk9rudbhLjUdfq7VCugq5md4Tg/+HT4nCZ3SSsYQwRzRaUxLUR2QT iqfRF2YOJ4edByqHjJxfWS6rh4nrzd2BHKP6MvCuOd0GtazWIExsIRpRf64cv3hZdp+Q hEGJjYQ4IUJ/gUFlGHzcNDfT2DGYSc09zn5BknSmNzUhnPWcmTgxDXRXN4q2c6/grkxC wjLuDXjdxubC5UTv5MZP1B9wUrJG5pLFVJDM/NTZ6ndR9MsIZYBII5pz65t40kM6Zvh2 YuQtZWOAsPJ+pIahC4SKN5KM1s/uaQFdc0FzKv94sWDWFrUtuhr+UQGUGJ7Pl+rKTpNz 7nfw== X-Gm-Message-State: ACgBeo1JeREWOkAdW4OPcjJSL/lG4/fCBjqoa9U6lLXbFta5rOi07+UH 91ShyAc8ijUAmnOwKJ0WUFTWTl88JihwUA== X-Google-Smtp-Source: AA6agR5bmcJwedaGhxsiF38vGd1CEM3HvpF7L9UUziNxGpBIymbwZnK4JRvNyNdmOVIGPk9WHadAsw== X-Received: by 2002:a17:90b:514:b0:1f5:59b2:fceb with SMTP id r20-20020a17090b051400b001f559b2fcebmr1032216pjz.82.1662594080025; Wed, 07 Sep 2022 16:41:20 -0700 (PDT) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9200:a0f0::1761]) by smtp.gmail.com with ESMTPSA id ij5-20020a170902ab4500b0016c5306917fsm10276495plb.53.2022.09.07.16.41.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 07 Sep 2022 16:41:19 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Cc: Khem Raj Subject: [meta-oe][PATCH 19/22] uw-imap: Avoid programs using gets() Date: Wed, 7 Sep 2022 16:40:59 -0700 Message-Id: <20220907234102.3312797-19-raj.khem@gmail.com> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20220907234102.3312797-1-raj.khem@gmail.com> References: <20220907234102.3312797-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 ; Wed, 07 Sep 2022 23:41:26 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/98709 Included needed header for isdigit() Signed-off-by: Khem Raj --- .../uw-imap/0001-Do-not-build-mtest.patch | 38 +++++++++++++++++++ ...02-tmail-Include-ctype.h-for-isdigit.patch | 26 +++++++++++++ .../recipes-devtools/uw-imap/uw-imap_2007f.bb | 2 + 3 files changed, 66 insertions(+) create mode 100644 meta-oe/recipes-devtools/uw-imap/uw-imap/0001-Do-not-build-mtest.patch create mode 100644 meta-oe/recipes-devtools/uw-imap/uw-imap/0002-tmail-Include-ctype.h-for-isdigit.patch diff --git a/meta-oe/recipes-devtools/uw-imap/uw-imap/0001-Do-not-build-mtest.patch b/meta-oe/recipes-devtools/uw-imap/uw-imap/0001-Do-not-build-mtest.patch new file mode 100644 index 0000000000..fd2f30cd14 --- /dev/null +++ b/meta-oe/recipes-devtools/uw-imap/uw-imap/0001-Do-not-build-mtest.patch @@ -0,0 +1,38 @@ +From f92becaf97be16a28013693cd99bac92c54074f2 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Wed, 7 Sep 2022 13:54:58 -0700 +Subject: [PATCH 1/2] Do not build mtest + +its a test utility which is not generally used. We need to disable it +because it uses gets() function which is not available in glibc, if we +want to use it then port it to use something like fgets + +Upstream-Status: Pending +Signed-off-by: Khem Raj +--- + Makefile | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/Makefile b/Makefile +index cf6d405..1e2d0fb 100644 +--- a/Makefile ++++ b/Makefile +@@ -669,7 +669,6 @@ an ua: + $(TOOLS)/$@ "$(LN)" src/ansilib c-client + $(TOOLS)/$@ "$(LN)" src/charset c-client + $(TOOLS)/$@ "$(LN)" src/osdep/$(SYSTEM) c-client +- $(TOOLS)/$@ "$(LN)" src/mtest mtest + $(TOOLS)/$@ "$(LN)" src/ipopd ipopd + $(TOOLS)/$@ "$(LN)" src/imapd imapd + $(TOOLS)/$@ "$(LN)" src/mailutil mailutil +@@ -706,7 +705,6 @@ rebuildclean: + + bundled: + @echo Building bundled tools... +- $(CD) mtest;$(MAKE) + $(CD) ipopd;$(MAKE) + $(CD) imapd;$(MAKE) + $(CD) mailutil;$(MAKE) +-- +2.37.3 + diff --git a/meta-oe/recipes-devtools/uw-imap/uw-imap/0002-tmail-Include-ctype.h-for-isdigit.patch b/meta-oe/recipes-devtools/uw-imap/uw-imap/0002-tmail-Include-ctype.h-for-isdigit.patch new file mode 100644 index 0000000000..5778a00346 --- /dev/null +++ b/meta-oe/recipes-devtools/uw-imap/uw-imap/0002-tmail-Include-ctype.h-for-isdigit.patch @@ -0,0 +1,26 @@ +From fbd00d93cc07fa5da20414b355fffe628dcd37b3 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Wed, 7 Sep 2022 13:57:19 -0700 +Subject: [PATCH 2/2] tmail: Include ctype.h for isdigit + +Upstream-Status: Pending +Signed-off-by: Khem Raj +--- + src/tmail/tmail.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/tmail/tmail.c b/src/tmail/tmail.c +index ed5fc58..a9e3645 100644 +--- a/src/tmail/tmail.c ++++ b/src/tmail/tmail.c +@@ -26,6 +26,7 @@ + * Last Edited: 30 October 2008 + */ + ++#include /* for isdigit */ + #include + #include + #include +-- +2.37.3 + diff --git a/meta-oe/recipes-devtools/uw-imap/uw-imap_2007f.bb b/meta-oe/recipes-devtools/uw-imap/uw-imap_2007f.bb index 3f2c9a2237..9fb12b26e4 100644 --- a/meta-oe/recipes-devtools/uw-imap/uw-imap_2007f.bb +++ b/meta-oe/recipes-devtools/uw-imap/uw-imap_2007f.bb @@ -12,6 +12,8 @@ SRC_URI = "https://fossies.org/linux/misc/old/imap-${PV}.tar.gz \ file://imap-2007f-format-security.patch \ file://0001-Support-OpenSSL-1.1.patch \ file://0001-Define-prototype-for-safe_flock.patch \ + file://0001-Do-not-build-mtest.patch \ + file://0002-tmail-Include-ctype.h-for-isdigit.patch \ " SRC_URI[md5sum] = "2126fd125ea26b73b20f01fcd5940369" From patchwork Wed Sep 7 23:41:00 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 12480 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 0CB36C6FA89 for ; Wed, 7 Sep 2022 23:41:26 +0000 (UTC) Received: from mail-pj1-f49.google.com (mail-pj1-f49.google.com [209.85.216.49]) by mx.groups.io with SMTP id smtpd.web09.2850.1662594081597338627 for ; Wed, 07 Sep 2022 16:41:21 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=G9M2GG7w; spf=pass (domain: gmail.com, ip: 209.85.216.49, mailfrom: raj.khem@gmail.com) Received: by mail-pj1-f49.google.com with SMTP id o4so16038153pjp.4 for ; Wed, 07 Sep 2022 16:41:21 -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:subject:date; bh=PTRcDS7eXYl5px7byg6q8lcYHfTsQ20vgSLsDDRlyEQ=; b=G9M2GG7wN8DHNrAo/6KnURHRNLO0+0mqBEPjec2CDiBTGx09mwIPMG+b03xI2m1C9a xddwOiA3nRwDj6Dvc5Qli+vJKAk4g5YqERgKlT5E+P32qn0lNjSGxMeAcpITgWWqDqUi Cm36xkrfvSHx+6iijLqmXHvmAdiZzA9N2cc3e7jJyN4mSqc2USWQ9WP0iVs706ulsMF5 LQ+4b6GcTnqO5wAL8/1RYGHkMxc8sEostlAPcFCKydqvL9XiDNzk7aGFYVhuyB4DXrnS T3273CyYNwJeBDQG1L44A2l2iflhpTW3QCgraVQL/YIZg36V5MxP0c2vIIYmvwpaYxjZ CGpg== 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 :subject:date; bh=PTRcDS7eXYl5px7byg6q8lcYHfTsQ20vgSLsDDRlyEQ=; b=ew6qj7JP5nE0cG9u2vFB6rDTZuYIs7RU2CTpR9QGThhNKV0MaH+wkXle6fd9Rf6sDj 89H9p97tlgDbyEEAicMklYItJry69WNmw9gR5RFMLvDeP7deim4R15TbQ5aCfY7uDYz/ M6SkifpyX+EUJX1IsVPomzbwhlbGBaPfwixYGFqMuI4wtXdA2lfKtgGHhK8mGegdRo3q +ormuv5z46sgLmjXMrVeEbfGMwoZvMENpBenz7esJvlkuur0h8P2xwSA0IzMv17HNFta SaJXHlroZ0/pxaVBJm2bIJ5ON5B/kM9SRWRAq+0ToXmroX5b6NqKvrSQLjlYKHLUMeNW /K+Q== X-Gm-Message-State: ACgBeo17miD5boP4un66AADRg/k/4JQY5ZPWnkS/dMnWi3FuXjzRhFee Yc5MXMuWCFX8Ww4YaUK4gG69bjbcywMIEg== X-Google-Smtp-Source: AA6agR6EF1TNrODAermVhOOy+64A5++psykTOu/Kv1aZ2o6Ra4pgMzA/P9Ozkvi51U4Ge46Jij2CoA== X-Received: by 2002:a17:903:24c:b0:172:7090:64a4 with SMTP id j12-20020a170903024c00b00172709064a4mr6054853plh.124.1662594080870; Wed, 07 Sep 2022 16:41:20 -0700 (PDT) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9200:a0f0::1761]) by smtp.gmail.com with ESMTPSA id ij5-20020a170902ab4500b0016c5306917fsm10276495plb.53.2022.09.07.16.41.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 07 Sep 2022 16:41:20 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Cc: Khem Raj Subject: [meta-python][PATCH 20/22] matplotlib: Upgrade to 3.5.3 Date: Wed, 7 Sep 2022 16:41:00 -0700 Message-Id: <20220907234102.3312797-20-raj.khem@gmail.com> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20220907234102.3312797-1-raj.khem@gmail.com> References: <20220907234102.3312797-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 ; Wed, 07 Sep 2022 23:41:26 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/98710 Signed-off-by: Khem Raj --- .../python3-matplotlib/matplotlib-disable-download.patch | 5 +++-- ...hon3-matplotlib_3.5.2.bb => python3-matplotlib_3.5.3.bb} | 6 +++--- 2 files changed, 6 insertions(+), 5 deletions(-) rename meta-python/recipes-devtools/python/{python3-matplotlib_3.5.2.bb => python3-matplotlib_3.5.3.bb} (94%) diff --git a/meta-python/recipes-devtools/python/python3-matplotlib/matplotlib-disable-download.patch b/meta-python/recipes-devtools/python/python3-matplotlib/matplotlib-disable-download.patch index 42ffeb8970..25c49afb97 100644 --- a/meta-python/recipes-devtools/python/python3-matplotlib/matplotlib-disable-download.patch +++ b/meta-python/recipes-devtools/python/python3-matplotlib/matplotlib-disable-download.patch @@ -6,10 +6,11 @@ Signed-off-by: Mark Hatle --- a/setup.py +++ b/setup.py -@@ -317,7 +317,6 @@ setup( # Finally, pass this all along t +@@ -316,8 +316,6 @@ setup( # Finally, pass this all along t + setup_requires=[ "certifi>=2020.06.20", "numpy>=1.17", - "setuptools_scm>=4", +- "setuptools_scm>=4,<7", - "setuptools_scm_git_archive", ], install_requires=[ diff --git a/meta-python/recipes-devtools/python/python3-matplotlib_3.5.2.bb b/meta-python/recipes-devtools/python/python3-matplotlib_3.5.3.bb similarity index 94% rename from meta-python/recipes-devtools/python/python3-matplotlib_3.5.2.bb rename to meta-python/recipes-devtools/python/python3-matplotlib_3.5.3.bb index eaa144719b..1a0b93b030 100644 --- a/meta-python/recipes-devtools/python/python3-matplotlib_3.5.2.bb +++ b/meta-python/recipes-devtools/python/python3-matplotlib_3.5.3.bb @@ -19,9 +19,9 @@ DEPENDS = "\ python3-dateutil-native \ python3-pytz-native \ python3-certifi-native \ + python3-setuptools-scm-native \ " - -SRC_URI[sha256sum] = "48cf850ce14fa18067f2d9e0d646763681948487a8080ec0af2686468b4607a2" +SRC_URI[sha256sum] = "339cac48b80ddbc8bfd05daae0a3a73414651a8596904c2a881cfd1edb65f26c" inherit pypi setuptools3 pkgconfig @@ -40,7 +40,6 @@ SRC_URI[qhull.sha256sum] = "b5c2d7eb833278881b952c8a52d20179eab87766b00b86500046 # LTO with clang needs lld LDFLAGS:append:toolchain-clang = " -fuse-ld=lld" LDFLAGS:remove:toolchain-clang:mips = "-fuse-ld=lld" - RDEPENDS:${PN} = "\ freetype \ libpng \ @@ -57,6 +56,7 @@ RDEPENDS:${PN} = "\ ENABLELTO:toolchain-clang:riscv64 = "echo enable_lto = False >> ${S}/mplsetup.cfg" ENABLELTO:toolchain-clang:riscv32 = "echo enable_lto = False >> ${S}/mplsetup.cfg" ENABLELTO:toolchain-clang:mips = "echo enable_lto = False >> ${S}/mplsetup.cfg" + do_compile:prepend() { echo [libs] > ${S}/mplsetup.cfg echo system_freetype = True >> ${S}/mplsetup.cfg From patchwork Wed Sep 7 23:41:01 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 12477 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 EB33BC54EE9 for ; Wed, 7 Sep 2022 23:41:25 +0000 (UTC) Received: from mail-pl1-f169.google.com (mail-pl1-f169.google.com [209.85.214.169]) by mx.groups.io with SMTP id smtpd.web08.2773.1662594082402824289 for ; Wed, 07 Sep 2022 16:41:22 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=kmDbMMxw; spf=pass (domain: gmail.com, ip: 209.85.214.169, mailfrom: raj.khem@gmail.com) Received: by mail-pl1-f169.google.com with SMTP id t3so11043532ply.2 for ; Wed, 07 Sep 2022 16:41:22 -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:subject:date; bh=KVX8wEk+ghKU9U5YkTXDfIpN0Ezk/84fRZqKffgOmTI=; b=kmDbMMxwgf0XPlJ6bSTV6Zg59/xzXgmn4hLAc5IESTJVZcyM1RZAKc8mYgK0Lw4Nkw gakdj5w8LWEH3Hczi4tpjg7TPei4jd5C8hdOTKxxFTpz4zrsjUOWP5PZX8nrXJLw0c5z ucwbkHt2s+ui/9GleRLLz4p/vsk2DLohMvgBrVTL75ExKrHPV1L4FZaCzmvhLF+PQM7R xuxVtwXZgiC8TVDVatV2X3oJ0xCbUNh/VMseGUZBNgnXzUsnFdzzEtIcMNAZvKBOnCEP VPgyPFBx/i11MUJLR3j1D0eVsJKajTG09+1WMV+s7YO24ZpSdB+eUxe+1AoqA4L/CZGm UtdQ== 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 :subject:date; bh=KVX8wEk+ghKU9U5YkTXDfIpN0Ezk/84fRZqKffgOmTI=; b=ByVDERiWOYqlrSJNCiSKAOq3oWf5T+2FYj2EKdw/EvAdf7HKgfAdi0BEZ0UF3r8exz ZELXLKZiZGhGVHlm/f8GJ1bxkNEYaT9yj7Ah1EzO4x3PFwHaqIYc96a5X8SACMEr+rIL awpJAXobrLYjHnNWKC0TuaJTBMsBhE05K7ZykUnw9AmZhBWs9oeDAr9tRRshLWTIzqvM gZElROc8GNb/kjMYAbmV1KHAN7j++0Un+FBOL3FuUv4UUV6BdhqJrr6+OJmeTnr4mV91 nClvMsWikCAH8iaATBpz1FVWwdlbeTYOvLmt6t5mIwcax7KnNTOeycyTtoWsEDfkx3Fq yh4w== X-Gm-Message-State: ACgBeo0bYYssEclRnPgOWYQacBT/iVWvXXi9fD5yCdZGYMYxNG0maYCj MXQtXXh6nGNcNK6C07SnZZBoYn27ixbNKQ== X-Google-Smtp-Source: AA6agR5sN35d2Y9cQGvQNqDtYBQ2ys3ZMCF92a6ki2PcLkY091cSbS4s02ThtAls0GdgaeGQm1bAlw== X-Received: by 2002:a17:90b:1803:b0:1fb:45e2:5d85 with SMTP id lw3-20020a17090b180300b001fb45e25d85mr997803pjb.163.1662594081654; Wed, 07 Sep 2022 16:41:21 -0700 (PDT) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9200:a0f0::1761]) by smtp.gmail.com with ESMTPSA id ij5-20020a170902ab4500b0016c5306917fsm10276495plb.53.2022.09.07.16.41.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 07 Sep 2022 16:41:21 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Cc: Khem Raj Subject: [meta-webserver][PATCH 21/22] cockpit: Update to 276 Date: Wed, 7 Sep 2022 16:41:01 -0700 Message-Id: <20220907234102.3312797-21-raj.khem@gmail.com> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20220907234102.3312797-1-raj.khem@gmail.com> References: <20220907234102.3312797-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 ; Wed, 07 Sep 2022 23:41:25 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/98711 Specify --with-admin-group and no error on xsltproc Signed-off-by: Khem Raj --- .../{cockpit_220.bb => cockpit_276.bb} | 7 +- ...n-not-error-if-xsltproc-is-not-found.patch | 27 +++++++ ...01-remove-tests-dep-on-gobject-intro.patch | 77 +++++++------------ ...e-use-copy-rule-for-unmodified-files.patch | 12 ++- 4 files changed, 66 insertions(+), 57 deletions(-) rename meta-webserver/recipes-webadmin/cockpit/{cockpit_220.bb => cockpit_276.bb} (95%) create mode 100644 meta-webserver/recipes-webadmin/cockpit/files/0001-Warn-not-error-if-xsltproc-is-not-found.patch diff --git a/meta-webserver/recipes-webadmin/cockpit/cockpit_220.bb b/meta-webserver/recipes-webadmin/cockpit/cockpit_276.bb similarity index 95% rename from meta-webserver/recipes-webadmin/cockpit/cockpit_220.bb rename to meta-webserver/recipes-webadmin/cockpit/cockpit_276.bb index c08de89316..93198e3569 100644 --- a/meta-webserver/recipes-webadmin/cockpit/cockpit_220.bb +++ b/meta-webserver/recipes-webadmin/cockpit/cockpit_276.bb @@ -8,10 +8,10 @@ SRC_URI += " \ https://github.com/cockpit-project/cockpit/releases/download/${PV}/cockpit-${PV}.tar.xz \ file://0001-remove-tests-dep-on-gobject-intro.patch \ file://0002-fix-makefile-use-copy-rule-for-unmodified-files.patch \ + file://0001-Warn-not-error-if-xsltproc-is-not-found.patch \ file://cockpit.pam \ " -SRC_URI[md5sum] = "beb88d8e70ee1da6ebd917c956217803" -SRC_URI[sha256sum] = "afc82acc8ef9d51e0f34265a07a2f059f5b71a1df721b299e657a40a098cbb7f" +SRC_URI[sha256sum] = "dde91a157ee8514112334653fa2775a99d71bd1b604067a48eaf7411114d19de" inherit gettext pkgconfig autotools systemd features_check @@ -30,6 +30,7 @@ EXTRA_AUTORECONF = "-I tools" EXTRA_OECONF = " \ --with-cockpit-user=${COCKPIT_USER_GROUP} \ --with-cockpit-group=${COCKPIT_USER_GROUP} \ + --with-admin-group=${COCKPIT_USER_GROUP} \ --with-cockpit-ws-instance-user=${COCKPIT_WS_USER_GROUP} \ --with-cockpit-ws-instance-group=${COCKPIT_WS_USER_GROUP} \ --disable-doc \ @@ -170,6 +171,8 @@ FILES:${PN} += " \ ${nonarch_libdir}/firewalld \ " RDEPENDS:${PN} += "${PN}-bridge" +# Needs bash for /usr/libexec/cockpit-certificate-helper +RDEPENDS:${PN} += "bash" do_install:append() { pkgdatadir=${datadir}/cockpit diff --git a/meta-webserver/recipes-webadmin/cockpit/files/0001-Warn-not-error-if-xsltproc-is-not-found.patch b/meta-webserver/recipes-webadmin/cockpit/files/0001-Warn-not-error-if-xsltproc-is-not-found.patch new file mode 100644 index 0000000000..b3b0988b12 --- /dev/null +++ b/meta-webserver/recipes-webadmin/cockpit/files/0001-Warn-not-error-if-xsltproc-is-not-found.patch @@ -0,0 +1,27 @@ +From 588bb5cb248aaeaf0fea33084229c99ad1574291 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Wed, 7 Sep 2022 11:12:28 -0700 +Subject: [PATCH] Warn not error if xsltproc is not found + +Upstream-Status: Inappropriate [oe-core specific] +Signed-off-by: Khem Raj +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 7659f41..537203e 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -177,7 +177,7 @@ AC_SUBST([systemdunitdir], [$systemdunitdir]) + # package as xgettext, and we find them by PATH, so just check for the one. + AC_PATH_PROG([XGETTEXT], [xsltproc], [no]) + if test "$XGETTEXT" = "no"; then +- AC_MSG_ERROR([Please install gettext tools]) ++ AC_MSG_WARN([Please install gettext tools]) + fi + + # ssh-add +-- +2.37.3 + diff --git a/meta-webserver/recipes-webadmin/cockpit/files/0001-remove-tests-dep-on-gobject-intro.patch b/meta-webserver/recipes-webadmin/cockpit/files/0001-remove-tests-dep-on-gobject-intro.patch index 2242190a38..8f70fe9434 100644 --- a/meta-webserver/recipes-webadmin/cockpit/files/0001-remove-tests-dep-on-gobject-intro.patch +++ b/meta-webserver/recipes-webadmin/cockpit/files/0001-remove-tests-dep-on-gobject-intro.patch @@ -7,71 +7,52 @@ Subject: [PATCH] remove tests dep on gobject-intro src/ws/Makefile-ws.am | 54 --------------------------------------------------- 1 file changed, 54 deletions(-) -diff --git a/src/ws/Makefile-ws.am b/src/ws/Makefile-ws.am -index 009130941..34e13d7fe 100644 --- a/src/ws/Makefile-ws.am +++ b/src/ws/Makefile-ws.am -@@ -246,60 +246,6 @@ EXTRA_DIST += \ +@@ -58,46 +58,6 @@ pam_cockpit_cert_so_LDFLAGS = -shared + pam_cockpit_cert_so_SOURCES = src/ws/pam_cockpit_cert.c - # ---------------------------------------------------------------------------------------------------- - --noinst_PROGRAMS += test-server + # ----------------------------------------------------------------------------- +-# test-server: server for running the html/browser unit tests against +- -check_PROGRAMS += test-server - --GDBUS_CODEGEN_XML = $(srcdir)/src/ws/com.redhat.Cockpit.DBusTests.xml +-test_server_CPPFLAGS = $(libcockpit_ws_a_CPPFLAGS) $(TEST_CPP) +-test_server_LDADD = $(libcockpit_ws_a_LIBS) $(TEST_LIBS) +- +-test_server_SOURCES = \ +- src/ws/mock-service.c \ +- src/ws/mock-service.h \ +- src/ws/test-server.c \ +- $(NULL) - +-test_server_CPPFLAGS += -I$(top_builddir)/src/ws +-nodist_test_server_SOURCES = $(GDBUS_CODEGEN_GENERATED) +- +-BUILT_SOURCES += $(GDBUS_CODEGEN_GENERATED) +-CLEANFILES += $(GDBUS_CODEGEN_GENERATED) -GDBUS_CODEGEN_GENERATED = \ - src/ws/mock-dbus-tests.h \ - src/ws/mock-dbus-tests.c \ - $(NULL) - --# FIXME: --header/--body and --output are only available from GLib 2.56. --# just use --generate-c-code and a bit of dependency ugliness for now +-EXTRA_DIST += $(GDBUS_CODEGEN_XML) +-GDBUS_CODEGEN_XML = $(srcdir)/src/ws/com.redhat.Cockpit.DBusTests.xml +- -GDBUS_CODEGEN_INVOCATION = \ - $(AM_V_GEN) gdbus-codegen \ - --interface-prefix com.redhat.Cockpit.DBusTests \ - --c-namespace Test \ - --c-generate-object-manager \ -- --generate-c-code src/ws/mock-dbus-tests \ -- $(GDBUS_CODEGEN_XML) -- --BUILT_SOURCES += $(GDBUS_CODEGEN_GENERATED) --CLEANFILES += $(GDBUS_CODEGEN_GENERATED) --EXTRA_DIST += $(GDBUS_CODEGEN_XML) -- --src/ws/mock-dbus-tests.h: $(GDBUS_CODEGEN_XML) -- $(GDBUS_CODEGEN_INVOCATION) -- --src/ws/mock-dbus-tests.c: $(GDBUS_CODEGEN_XML) src/ws/mock-dbus-tests.h -- $(GDBUS_CODEGEN_INVOCATION) -- --test_server_SOURCES = \ -- src/ws/mock-service.c \ -- src/ws/mock-service.h \ -- src/ws/test-server.c \ -- $(NULL) -- --nodist_test_server_SOURCES = \ -- $(GDBUS_CODEGEN_GENERATED) \ - $(NULL) - --test_server_CFLAGS = \ -- -I$(builddir)/src/ws \ -- -I$(top_srcdir)/src/ws \ -- -DG_LOG_DOMAIN=\"test-server\" \ -- $(GIO_CFLAGS) \ -- $(COCKPIT_WS_CFLAGS) \ -- $(NULL) +-src/ws/mock-dbus-tests.h: $(GDBUS_CODEGEN_XML) +- $(GDBUS_CODEGEN_INVOCATION) --header --output $@ $< - --test_server_LDADD = \ -- $(libcockpit_ws_LIBS) \ -- $(GIO_LIBS) \ -- -lpam \ -- $(NULL) +-src/ws/mock-dbus-tests.c: $(GDBUS_CODEGEN_XML) +- $(GDBUS_CODEGEN_INVOCATION) --body --output $@ $< - - WS_CHECKS = \ - test-base64 \ - test-creds \ --- -2.11.0 - +-# ----------------------------------------------------------------------------- + # Unit tests + + check_SCRIPTS += src/ws/mock-cat-with-init diff --git a/meta-webserver/recipes-webadmin/cockpit/files/0002-fix-makefile-use-copy-rule-for-unmodified-files.patch b/meta-webserver/recipes-webadmin/cockpit/files/0002-fix-makefile-use-copy-rule-for-unmodified-files.patch index a1ea9bcfdc..48702c3d1e 100644 --- a/meta-webserver/recipes-webadmin/cockpit/files/0002-fix-makefile-use-copy-rule-for-unmodified-files.patch +++ b/meta-webserver/recipes-webadmin/cockpit/files/0002-fix-makefile-use-copy-rule-for-unmodified-files.patch @@ -7,13 +7,11 @@ Subject: [PATCH] fix(makefile): use copy rule for unmodified files pkg/Makefile.am | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) -diff --git a/pkg/Makefile.am b/pkg/Makefile.am -index 192b785..03b9787 100644 --- a/pkg/Makefile.am +++ b/pkg/Makefile.am -@@ -13,6 +13,33 @@ playground_DATA = \ - dist/playground/extra.de.po: pkg/playground/extra.de.po - $(COPY_RULE) +@@ -7,6 +7,33 @@ TESTS += $(pkg_TESTS) + %.metainfo.xml: %.metainfo.xml.in + $(AM_V_GEN) mkdir -p $(dir $@) && msgfmt --xml -d $(top_srcdir)/po --template $< --output $@ +dist/playground/hammer.gif: pkg/playground/hammer.gif + $(COPY_RULE) @@ -43,5 +41,5 @@ index 192b785..03b9787 100644 + $(COPY_RULE) + metainfodir = ${datarootdir}/metainfo - metainfo_DATA = pkg/sosreport/org.cockpit-project.cockpit-sosreport.metainfo.xml \ - pkg/kdump/org.cockpit-project.cockpit-kdump.metainfo.xml \ + nodist_metainfo_DATA = \ + pkg/sosreport/org.cockpit-project.cockpit-sosreport.metainfo.xml \ From patchwork Wed Sep 7 23:41:02 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 12475 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 E7A96ECAAD3 for ; Wed, 7 Sep 2022 23:41:25 +0000 (UTC) Received: from mail-pg1-f174.google.com (mail-pg1-f174.google.com [209.85.215.174]) by mx.groups.io with SMTP id smtpd.web10.2659.1662594083272462970 for ; Wed, 07 Sep 2022 16:41:23 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=W04FrLro; spf=pass (domain: gmail.com, ip: 209.85.215.174, mailfrom: raj.khem@gmail.com) Received: by mail-pg1-f174.google.com with SMTP id r17so2612105pgr.7 for ; Wed, 07 Sep 2022 16:41:23 -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:subject:date; bh=b8xIBPBySPcCTK98uPdUSmK7NyJvP4bjoMfrvK4lVT8=; b=W04FrLrocLourYd/9ULL9qE1fWe1EpPG8myaXlm7/GBw0P7pbmHsotcE8bpDqFzMPF LnSxcLzj4t/s+PLDjWEzdPfsqIWO84mewx4gnQVz7XY95pTgtJE5NGf6/opOeIK5rzrG 7Vrgq0W2rwN8yEO7DrvF1EKH/TOLKCw4d3eqbFMF8NvjoVFmtVYkvjD+b6eytXfWtl4B WO4U1cwtD1tuAygECTR0fGX0zjJoTrlxhTDIoKqviA81LAMphFrt+GSA9IyPLoWDECHY FV3gZ9FmjKGROq0NpsyZ+vEJjsKOnqbzj38n9G98jgOKxDEqYzsUYriUc8AK3TqYeOIw gBRg== 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 :subject:date; bh=b8xIBPBySPcCTK98uPdUSmK7NyJvP4bjoMfrvK4lVT8=; b=3oElxR8ymvC01uyHxtescdjvKNQa/YDft16YT21Sz5dxEzNGHPktsibR3zt0fpihky gL4XPNZ52+il47z+KNUGk9e/qHEdYLqXPuKH6QIyaeSv/qzJKjXGRpcm9LNjopp5NHj3 OdC2XbpDsTzqWiCILcvxDxEzZ1W7l5DOI29gMAm5tbkSsA039vr5JqQUoxVZeEo8ivmQ J42c+LNJDgqZq8pMGRhZSZKl6UCEzozoISx8XTB09R9FP1lRp8yQfEMzkIxA9zrapo8j 4FRBVd6cu+oNFfncR+4vcKQyinTjvv6JbyfzWp+LQHBYHyqShRtv3tNOh8QDbTPRA7o1 sBmQ== X-Gm-Message-State: ACgBeo0y59+FrPpAQCi8MouSRdQg8R+7y6B1KmxaIGGw+bDWnNXN37xS DNZscX0Vbj0MzgjysJmkffRkgblQxKDvIA== X-Google-Smtp-Source: AA6agR670W8JL5UvWVyTRA66ifUoAVJoe8en6RGKSzeJ19z17OCHi66PTFq0FJ8HSurPUqv/2Tf8tQ== X-Received: by 2002:a63:5d46:0:b0:434:a7e8:a14d with SMTP id o6-20020a635d46000000b00434a7e8a14dmr5447646pgm.366.1662594082456; Wed, 07 Sep 2022 16:41:22 -0700 (PDT) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9200:a0f0::1761]) by smtp.gmail.com with ESMTPSA id ij5-20020a170902ab4500b0016c5306917fsm10276495plb.53.2022.09.07.16.41.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 07 Sep 2022 16:41:22 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Cc: Khem Raj Subject: [meta-gnome][PATCH 22/22] geary: Fix build with clang Date: Wed, 7 Sep 2022 16:41:02 -0700 Message-Id: <20220907234102.3312797-22-raj.khem@gmail.com> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20220907234102.3312797-1-raj.khem@gmail.com> References: <20220907234102.3312797-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 ; Wed, 07 Sep 2022 23:41:25 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/98712 Disable Wint-conversion as error Signed-off-by: Khem Raj --- meta-gnome/recipes-connectivity/geary/geary_40.0.bb | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/meta-gnome/recipes-connectivity/geary/geary_40.0.bb b/meta-gnome/recipes-connectivity/geary/geary_40.0.bb index 4b454dc02d..3ff0a412e2 100644 --- a/meta-gnome/recipes-connectivity/geary/geary_40.0.bb +++ b/meta-gnome/recipes-connectivity/geary/geary_40.0.bb @@ -52,6 +52,10 @@ PACKAGECONFIG[tnef] = "-Dtnef=enabled,-Dtnef=disabled,libytnef" PACKAGECONFIG[valadoc] = "-Dvaladoc=enabled,-Dvaladoc=disabled" PACKAGECONFIG ??= "" +# rfc822/rfc822-message.c:2097:12: error: incompatible pointer to integer conversion returning 'void *' from a function with result type 'gboolean' (aka 'int') [-Wint-conversion] +#| return NULL; +#| ^~~~ +CFLAGS:append:toolchain-clang = " -Wno-error=int-conversion" FILES:${PN} += "${datadir}"