From patchwork Wed Aug 31 05:41:35 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 12134 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 4992FECAAD3 for ; Wed, 31 Aug 2022 05:41:49 +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.web09.22140.1661924504270755763 for ; Tue, 30 Aug 2022 22:41:44 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=NdsUsEX7; 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 76so13437136pfy.3 for ; Tue, 30 Aug 2022 22:41:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc; bh=ciWEDn3bGkuVCCLYY0GRPfwOcG/woUCAecr2WYpfI50=; b=NdsUsEX7FJOVfluw0QTLtlX2nnqwRMX73fGLMEjvA8SLEDN0JONP9L8QO/FiGBdT1L c2u5vEZr/qdiAu8cm5gXowTVyJwebPPG9SPtK7dftMeBXCAsCyQJ1ZUQUaKVrq8d8Zwc J2a3V+3b0dVvBFljkGABTCXHnuw10tqIjxHG8d/XMGsHF65DF1XRYQdND9GGQSbsem7S gD8pcyLgzvmoK1BdBmxyufwBQ3A6sFm1y+bSkxX/atfyxuUtdDA/iPZkI7Mq0gvrhTfw VNMBZ0xpwmJIBX+kan2a0VIZb9VSpBD/Fym+TE3moMBnkUv4Gt8hinUbsYkjk7YVoc0C 1myw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc; bh=ciWEDn3bGkuVCCLYY0GRPfwOcG/woUCAecr2WYpfI50=; b=KE2I440ge+tEkcmNd1J+vvrkzOLCZo5iI/tnKdzerZV6OYOYdhvYziZidTFYkJI5tq 2Pm1mojM1Kar2JR0/xUwRvyhYFFHn6CzupfoX5LRi0PnDIGh5ZlBJLEJd3Axd/TEOpDQ a/01X0SeC6j+nbxGAXBrD5EBulaJUIiSe+NkR7KuGAqJ3XE5dq+bUfe7okG3ZfPEmsB9 HrRSJBx2Az/tcbEZa9JQ2pNXFCAl+m4BvVukI+ub7PqWlRYvoD0jqn3xlC1+9mGi3d/N Gqu1+Cu/NpTGMsNTdbIJZsUY/VSKiukJc8NPzYcZpRA2bCrL5dBXb4CZrm812KKBBOc5 B1iw== X-Gm-Message-State: ACgBeo1k0jpCFJzjj/4+M7WWPUZS//GsOOvC4f+VFY4y9fly/4D2nN8C s5dmiyr4ixPQIjBHCHJOVyEHu4QU1NVBNA== X-Google-Smtp-Source: AA6agR6ydzFc3KZGQc62IVtzbRxsv2LDchAK/dJXJu8e/2ahXI+Jb/XTMZkZoVMv1GK/NzsNURiEoQ== X-Received: by 2002:a65:4941:0:b0:42a:8c1b:6b6c with SMTP id q1-20020a654941000000b0042a8c1b6b6cmr21175944pgs.375.1661924503201; Tue, 30 Aug 2022 22:41:43 -0700 (PDT) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9200:a0f0::24e6]) by smtp.gmail.com with ESMTPSA id u4-20020a170902e80400b001733c13cc81sm7275181plg.169.2022.08.30.22.41.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Aug 2022 22:41:42 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Cc: Khem Raj Subject: [meta-oe][PATCH 1/5] rasdaemon: Upgrade to 0.6.8 Date: Tue, 30 Aug 2022 22:41:35 -0700 Message-Id: <20220831054139.3493726-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, 31 Aug 2022 05:41:49 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/98570 Fix build on musl while here Drop unneeded header include patch which is fixed upstream Signed-off-by: Khem Raj --- .../0001-Fix-system-header-includes.patch | 44 ------------------- ...-version-of-strerror_r-on-non-glibc-.patch | 35 +++++++++++++++ ...{rasdaemon_0.6.7.bb => rasdaemon_0.6.8.bb} | 8 +--- 3 files changed, 37 insertions(+), 50 deletions(-) delete mode 100644 meta-oe/dynamic-layers/perl-layer/recipes-support/rasdaemon/files/0001-Fix-system-header-includes.patch create mode 100644 meta-oe/dynamic-layers/perl-layer/recipes-support/rasdaemon/files/0001-libtrace-Use-XSI-version-of-strerror_r-on-non-glibc-.patch rename meta-oe/dynamic-layers/perl-layer/recipes-support/rasdaemon/{rasdaemon_0.6.7.bb => rasdaemon_0.6.8.bb} (92%) diff --git a/meta-oe/dynamic-layers/perl-layer/recipes-support/rasdaemon/files/0001-Fix-system-header-includes.patch b/meta-oe/dynamic-layers/perl-layer/recipes-support/rasdaemon/files/0001-Fix-system-header-includes.patch deleted file mode 100644 index 0164321312..0000000000 --- a/meta-oe/dynamic-layers/perl-layer/recipes-support/rasdaemon/files/0001-Fix-system-header-includes.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 18786db1ad03716267927d983c83275469a1478a Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Fri, 8 May 2020 12:27:19 -0700 -Subject: [PATCH] Fix system header includes - -Use poll.h instead of sys/poll.h -Fixes -warning: #warning redirecting incorrect #include to [-Wcpp] - -Include limits.h for PATH_MAX - -Fixes -ras-events.c:359:16: error: 'PATH_MAX' undeclared (first use in this function) - 359 | char pipe_raw[PATH_MAX]; - | ^~~~~~~~ - -Signed-off-by: Khem Raj ---- - ras-events.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/ras-events.c b/ras-events.c -index 511c93d..400e740 100644 ---- a/ras-events.c -+++ b/ras-events.c -@@ -18,13 +18,14 @@ - #include - #include - #include -+#include -+#include - #include - #include - #include - #include - #include - #include --#include - #include - #include - #include "libtrace/kbuffer.h" --- -2.26.2 - diff --git a/meta-oe/dynamic-layers/perl-layer/recipes-support/rasdaemon/files/0001-libtrace-Use-XSI-version-of-strerror_r-on-non-glibc-.patch b/meta-oe/dynamic-layers/perl-layer/recipes-support/rasdaemon/files/0001-libtrace-Use-XSI-version-of-strerror_r-on-non-glibc-.patch new file mode 100644 index 0000000000..fef71afde5 --- /dev/null +++ b/meta-oe/dynamic-layers/perl-layer/recipes-support/rasdaemon/files/0001-libtrace-Use-XSI-version-of-strerror_r-on-non-glibc-.patch @@ -0,0 +1,35 @@ +From e415152b51eacab8705b6b3274cc0d1a274772e0 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Tue, 30 Aug 2022 19:54:35 -0700 +Subject: [PATCH] libtrace: Use XSI version of strerror_r on non glibc systems + +The version used is glibc specific therefore make it so +and provide a fallback for non-glibc systems + +Upstream-Status: Submitted [https://github.com/mchehab/rasdaemon/pull/70] +Signed-off-by: Khem Raj +--- + libtrace/event-parse.c | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/libtrace/event-parse.c b/libtrace/event-parse.c +index 6c705c3..6b651d5 100644 +--- a/libtrace/event-parse.c ++++ b/libtrace/event-parse.c +@@ -5071,7 +5071,13 @@ int pevent_strerror(struct pevent *pevent, enum pevent_errno errnum, + const char *msg; + + if (errnum >= 0) { ++#if defined(__GLIBC__) + msg = strerror_r(errnum, buf, buflen); ++#else ++ if (strerror_r(errnum, buf, buflen) != 0) ++ snprintf(buf, buflen, "unknown error %i", errnum); ++ msg = buf; ++#endif + if (msg != buf) { + size_t len = strlen(msg); + memcpy(buf, msg, min(buflen - 1, len)); +-- +2.37.3 + diff --git a/meta-oe/dynamic-layers/perl-layer/recipes-support/rasdaemon/rasdaemon_0.6.7.bb b/meta-oe/dynamic-layers/perl-layer/recipes-support/rasdaemon/rasdaemon_0.6.8.bb similarity index 92% rename from meta-oe/dynamic-layers/perl-layer/recipes-support/rasdaemon/rasdaemon_0.6.7.bb rename to meta-oe/dynamic-layers/perl-layer/recipes-support/rasdaemon/rasdaemon_0.6.8.bb index f30822b06e..3a525e8a15 100644 --- a/meta-oe/dynamic-layers/perl-layer/recipes-support/rasdaemon/rasdaemon_0.6.7.bb +++ b/meta-oe/dynamic-layers/perl-layer/recipes-support/rasdaemon/rasdaemon_0.6.8.bb @@ -4,11 +4,11 @@ LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=d3070efe0afa3dc41608bd82c00bb0dc" SRC_URI = "git://github.com/mchehab/rasdaemon.git;branch=master;protocol=https \ - file://0001-Fix-system-header-includes.patch \ + file://0001-libtrace-Use-XSI-version-of-strerror_r-on-non-glibc-.patch \ file://rasdaemon.service \ file://init" -SRCREV = "aa96737648d867a3d73e4151d05b54bbab494605" +SRCREV = "c2255178a49f62c53009a456bc37dd5e37332f09" S = "${WORKDIR}/git" @@ -32,10 +32,6 @@ PACKAGECONFIG[abrt-report] = "--enable-abrt-report,--disable-abrt-report" DEPENDS:append:libc-musl = " argp-standalone" LDFLAGS:append:libc-musl = " -largp" -do_configure:prepend () { - ( cd ${S}; autoreconf -vfi ) -} - do_install:append() { install -d ${D}${sysconfdir}/init.d install -m 755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/rasdaemon From patchwork Wed Aug 31 05:41:36 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 12136 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 55F56C0502C for ; Wed, 31 Aug 2022 05:41:49 +0000 (UTC) Received: from mail-pl1-f172.google.com (mail-pl1-f172.google.com [209.85.214.172]) by mx.groups.io with SMTP id smtpd.web09.22142.1661924505250613616 for ; Tue, 30 Aug 2022 22:41:45 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=JBKqAybZ; spf=pass (domain: gmail.com, ip: 209.85.214.172, mailfrom: raj.khem@gmail.com) Received: by mail-pl1-f172.google.com with SMTP id jm11so13154303plb.13 for ; Tue, 30 Aug 2022 22:41:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc; bh=2Xb+97G3XMcYHjjlH0m9eaITWd9lGGd4H1EFvwOGpyc=; b=JBKqAybZkDtE9IxhAfAVvKzuPVJHWJAyHbk6ycb1B7QBipjyBQH03gtdkU0LnEpFCj YoFULqWEAXiF5P9ln1eL6r1VvN9IB2z50Z/AY2QSzMvvPMkSn5R0jGawi7Zbjd4VoKiv axQYOpIe0KrCg6hFctr+h12EzC5vKePbTuuJVQQyHAiY9rWN8s+0mSEFTPyDhCIePc5r 2ANtTbqS+r1vQBq2t+kwfeS5ZUAKuI9eGJKrwQzhxGjjWJkro9cTRLjiPujm4I9rZUAZ WyVyWLWtzvXvRB6uIOehV7/fNFGMQQ33RIfr7dq4Gc/6jDNyFYRDR0gktUndq2NPkyIV 69xg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc; bh=2Xb+97G3XMcYHjjlH0m9eaITWd9lGGd4H1EFvwOGpyc=; b=s/myl6/5rswOqwiOmqlviy53pcC2u38WiSB3jTL6OA0P9WRM/dv06LqyD86yQd9Sz7 8gfjgh38Z83wGxqf2T6CNbAE2xyX2Dr41zCgY/SdFKvY9p81z9tvEg3F6Hx6u+KXGCZE J9fUHDxP/oYTEi6njOKw5OQwegcenUpQkFU+35OyPbYPpQbn7SZDUs3rPhHil0LLagoH i0bdQY9v0C59Hic5NAwsBZ8hJkKXvT8pMaWV+isxjjxDBmr1UTYNLzeuXUNWrAljw0DE xq5LNZ4DR9aA+IHgyZr/OWvAL5Js2oe8i9rZeK/Mw03aAWdyEHlAnpxQq+HApNNOKY7W i94Q== X-Gm-Message-State: ACgBeo0wPBew8v1TnZxZglQkjBS/NDZpgOPaHNDNrRLLyEnGUtMpO0WP qHWRXNE8kAjnqniD15Ce+bnoUukX31c9Ng== X-Google-Smtp-Source: AA6agR51JyLFd/2SgdCB2e/0X1h+L30dfnBXjf9WBzyG1CIqStfQjuZjYem95emnRTzMN3jh4pHkgQ== X-Received: by 2002:a17:903:2003:b0:175:24eb:62b0 with SMTP id s3-20020a170903200300b0017524eb62b0mr5454704pla.60.1661924504198; Tue, 30 Aug 2022 22:41:44 -0700 (PDT) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9200:a0f0::24e6]) by smtp.gmail.com with ESMTPSA id u4-20020a170902e80400b001733c13cc81sm7275181plg.169.2022.08.30.22.41.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Aug 2022 22:41:43 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Cc: Khem Raj Subject: [meta-oe][PATCH 2/5] psqlodbc: Upgrade to 13.02.0000 Date: Tue, 30 Aug 2022 22:41:36 -0700 Message-Id: <20220831054139.3493726-2-raj.khem@gmail.com> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20220831054139.3493726-1-raj.khem@gmail.com> References: <20220831054139.3493726-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, 31 Aug 2022 05:41:49 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/98571 Forward port patches Merged .inc into .bb for easing out devtool use Signed-off-by: Khem Raj --- ...qlodbc-donot-use-the-hardcode-libdir.patch | 17 ++++--- .../psqlodbc-fix-for-ptest-support.patch | 51 ++++++------------- ...move-some-checks-for-cross-compiling.patch | 42 ++++++++++----- .../psqlodbc/psqlodbc_09.05.0300.bb | 14 ----- .../{psqlodbc.inc => psqlodbc_13.02.0000.bb} | 16 +++++- 5 files changed, 68 insertions(+), 72 deletions(-) delete mode 100644 meta-oe/recipes-dbs/psqlodbc/psqlodbc_09.05.0300.bb rename meta-oe/recipes-dbs/psqlodbc/{psqlodbc.inc => psqlodbc_13.02.0000.bb} (77%) diff --git a/meta-oe/recipes-dbs/psqlodbc/files/psqlodbc-donot-use-the-hardcode-libdir.patch b/meta-oe/recipes-dbs/psqlodbc/files/psqlodbc-donot-use-the-hardcode-libdir.patch index 7eda038756..acfaa3f6be 100644 --- a/meta-oe/recipes-dbs/psqlodbc/files/psqlodbc-donot-use-the-hardcode-libdir.patch +++ b/meta-oe/recipes-dbs/psqlodbc/files/psqlodbc-donot-use-the-hardcode-libdir.patch @@ -1,26 +1,27 @@ -[PATCH] do not use the hardcode libdir +From 8f3ed8df4721991958a5becf75a69493d67e7514 Mon Sep 17 00:00:00 2001 +From: "Roy.Li" +Date: Tue, 5 Sep 2017 10:24:10 +0800 +Subject: [PATCH] [PATCH] do not use the hardcode libdir Upstream-status: Pending Signed-off-by: Roy.Li Signed-off-by: Jackie Huang + --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac -index 9b88d4c..df5ad7a 100644 +index 00b359e..ba50e6f 100644 --- a/configure.ac +++ b/configure.ac -@@ -140,7 +140,7 @@ if test "$with_libpq" != yes; then +@@ -114,7 +114,7 @@ if test "$with_libpq" != yes; then if test -d "$with_libpq"; then - PATH="$PATH:$with_libpq/bin" - CPPFLAGS="$CPPFLAGS -I$with_libpq/include" + PATH="$with_libpq/bin:$PATH" + CPPFLAGS="$CPPFLAGS -I$with_libpq/include -I$with_libpq/include/postgresql/internal" - LDFLAGS="$LDFLAGS -L$with_libpq/lib" + LDFLAGS="$LDFLAGS -L$with_libpq/${base_libdir}" else if test -x "$with_libpq"; then PG_CONFIG=$with_libpq --- -2.8.1 - diff --git a/meta-oe/recipes-dbs/psqlodbc/files/psqlodbc-fix-for-ptest-support.patch b/meta-oe/recipes-dbs/psqlodbc/files/psqlodbc-fix-for-ptest-support.patch index a8f14e7689..30e67b7dfb 100644 --- a/meta-oe/recipes-dbs/psqlodbc/files/psqlodbc-fix-for-ptest-support.patch +++ b/meta-oe/recipes-dbs/psqlodbc/files/psqlodbc-fix-for-ptest-support.patch @@ -1,3 +1,6 @@ +From 96896b88776d0080609ec830cf9538d2babe665a Mon Sep 17 00:00:00 2001 +From: Jackie Huang +Date: Tue, 5 Sep 2017 10:24:10 +0800 Subject: [PATCH] psqlodbc: fixes for ptest support * Fix the LIBODBC since we don't use ODBC_CONFIG. @@ -9,27 +12,28 @@ Subject: [PATCH] psqlodbc: fixes for ptest support Upstream-Status: Inappropriate [OE ptest specific] Signed-off-by: Jackie Huang + --- test/Makefile.in | 2 +- test/odbcini-gen.sh | 8 ++++---- - test/runsuite.c | 26 +++++++++++++------------- - 3 files changed, 18 insertions(+), 18 deletions(-) + test/runsuite.c | 20 ++++++++++---------- + 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/test/Makefile.in b/test/Makefile.in -index 8710616..fcb470e 100644 +index 3f9a9af..09406ae 100644 --- a/test/Makefile.in +++ b/test/Makefile.in -@@ -18,7 +18,7 @@ CFLAGS = @CFLAGS@ +@@ -19,7 +19,7 @@ CPPFLAGS = @CPPFLAGS@ -I.. # config.h ODBC_CONFIG = @ODBC_CONFIG@ PROVE = @PROVE@ --LIBODBC := $(shell $(ODBC_CONFIG) --libs) +-LIBODBC = @LIBODBC@ +LIBODBC = -lodbc all: $(TESTBINS) runsuite reset-db diff --git a/test/odbcini-gen.sh b/test/odbcini-gen.sh -index d2c2c87..6068d9d 100755 +index 2eaba35..6555cdb 100755 --- a/test/odbcini-gen.sh +++ b/test/odbcini-gen.sh @@ -6,7 +6,7 @@ @@ -41,7 +45,7 @@ index d2c2c87..6068d9d 100755 driver=${drvr}.so if test ! -e $driver ; then driver=${drvr}.dll -@@ -33,10 +33,10 @@ Driver = psqlodbc test driver +@@ -52,10 +52,10 @@ Driver = PostgreSQL Unicode Trace = No TraceFile = Database = contrib_regression @@ -56,10 +60,10 @@ index d2c2c87..6068d9d 100755 RowVersioning = No ShowSystemTables = No diff --git a/test/runsuite.c b/test/runsuite.c -index 583cf35..fd2a90e 100644 +index 3be5732..cd842dc 100644 --- a/test/runsuite.c +++ b/test/runsuite.c -@@ -51,7 +51,7 @@ bailout(const char *fmt, ...) +@@ -55,7 +55,7 @@ bailout(const char *fmt, ...) /* Given a test program's name, get the test name */ void @@ -68,7 +72,7 @@ index 583cf35..fd2a90e 100644 { const char *basename; #ifdef WIN32 -@@ -65,7 +65,7 @@ parse_argument(const char *in, char *testname, char *binname) +@@ -69,7 +69,7 @@ parse_argument(const char *in, char *testname, char *binname) if (strchr(in, DIR_SEP) == NULL) { strcpy(testname, in); @@ -77,7 +81,7 @@ index 583cf35..fd2a90e 100644 return; } -@@ -127,7 +127,7 @@ int main(int argc, char **argv) +@@ -131,7 +131,7 @@ int main(int argc, char **argv) failures = 0; for (i = 1, j = 1; i <= numtests; i++, j++) { @@ -86,7 +90,7 @@ index 583cf35..fd2a90e 100644 if (runtest(binname, testname, i, inputdir) != 0) failures++; } -@@ -157,29 +157,29 @@ runtest(const char *binname, const char *testname, int testno, const char *input +@@ -161,29 +161,29 @@ runtest(const char *binname, const char *testname, int testno, const char *input #ifndef WIN32 snprintf(cmdline, sizeof(cmdline), "ODBCSYSINI=. ODBCINSTINI=./odbcinst.ini ODBCINI=./odbc.ini " @@ -123,26 +127,3 @@ index 583cf35..fd2a90e 100644 ret = 0; } fflush(stdout); -@@ -196,7 +196,7 @@ rundiff(const char *testname, const char *inputdir) - char *result; - size_t result_len; - -- snprintf(filename, sizeof(filename), "results/%s.out", testname); -+ snprintf(filename, sizeof(filename), "%s/results/%s.out", inputdir, testname); - result = slurpfile(filename, &result_len); - - outputno = 0; -@@ -244,8 +244,8 @@ rundiff(const char *testname, const char *inputdir) - * files and print the smallest diff? - */ - snprintf(cmdline, sizeof(cmdline), -- "diff -c %s/expected/%s.out results/%s.out >> regression.diffs", -- inputdir, testname, testname); -+ "diff -c %s/expected/%s.out %s/results/%s.out >> regression.diffs", -+ inputdir, testname, inputdir, testname); - if (system(cmdline) == -1) - printf("# diff failed\n"); - --- -2.8.2 - diff --git a/meta-oe/recipes-dbs/psqlodbc/files/psqlodbc-remove-some-checks-for-cross-compiling.patch b/meta-oe/recipes-dbs/psqlodbc/files/psqlodbc-remove-some-checks-for-cross-compiling.patch index 1d988182e7..9131d70be6 100644 --- a/meta-oe/recipes-dbs/psqlodbc/files/psqlodbc-remove-some-checks-for-cross-compiling.patch +++ b/meta-oe/recipes-dbs/psqlodbc/files/psqlodbc-remove-some-checks-for-cross-compiling.patch @@ -1,3 +1,6 @@ +From 8ca6b0c72b6b933642ec7c4ebb83734244fec46f Mon Sep 17 00:00:00 2001 +From: "Song.Li" +Date: Tue, 5 Sep 2017 10:24:10 +0800 Subject: [PATCH] remove some checks for cross-compiling some lib check is not suitable for @@ -8,15 +11,16 @@ Upstream-Status: Inappropriate [not a real bug,just for cross-compiling] Signed-off-by: Song.Li Signed-off-by: Kai Kang Signed-off-by: Jackie Huang + --- - configure.ac | 66 +++++++----------------------------------------------------- - 1 file changed, 7 insertions(+), 59 deletions(-) + configure.ac | 80 +++++----------------------------------------------- + 1 file changed, 7 insertions(+), 73 deletions(-) diff --git a/configure.ac b/configure.ac -index df5ad7a..b72bd4c 100644 +index 7f79563..00b359e 100644 --- a/configure.ac +++ b/configure.ac -@@ -46,57 +46,19 @@ AC_ARG_WITH(iodbc, [ --with-iodbc[[=DIR]] [[default=no]] DIR is the iODBC bas +@@ -57,71 +57,20 @@ AC_ARG_WITH(iodbc, [ --with-iodbc[[=DIR]] [[default=no]] DIR is the iODBC bas if test "$with_iodbc" != no; then with_unixodbc=no AC_DEFINE(WITH_IODBC, 1, [Define to 1 to build with iODBC support]) @@ -34,6 +38,7 @@ index df5ad7a..b72bd4c 100644 - fi fi + wo_odbc_config=__without_odbc_config if test "$with_unixodbc" != no; then AC_DEFINE(WITH_UNIXODBC, 1, [Define to 1 to build with unixODBC support]) @@ -42,7 +47,9 @@ index df5ad7a..b72bd4c 100644 - else - ODBC_CONFIG=$with_unixodbc - fi -- if test ! -x "${ODBC_CONFIG}/bin/odbc_config"; then +- if test "${ODBC_CONFIG}" = "${wo_odbc_config}"; then +- : +- elif test ! -x "${ODBC_CONFIG}/bin/odbc_config"; then - if test ! -x "${ODBC_CONFIG}"; then - AC_MSG_ERROR([odbc_config not found (required for unixODBC build)]) - fi @@ -62,22 +69,33 @@ index df5ad7a..b72bd4c 100644 - # Linking libiodoc is rather problematic - [ODBC_LIBDIR=`${ODBC_CONFIG} --libs | sed -e "s/^\(-L\|.*[ \t]-L\)\([^ \n\r\f\t]*\).*$/-L\2/"`] - LDFLAGS="$LDFLAGS ${ODBC_LIBDIR}" +- LIBODBC=`${ODBC_CONFIG} --libs` # for regression test +- elif test "${ODBC_CONFIG}" = "${wo_odbc_config}"; then +- ODBC_INCLUDE=/usr/include +- CPPFLAGS="$CPPFLAGS -I${ODBC_INCLUDE}" +- ODBC_LIBDiR="" +- LIBODBC="-lodbc" # for regression test - else - ODBC_INCLUDE=`${ODBC_CONFIG} --include-prefix` - CPPFLAGS="$CPPFLAGS -I${ODBC_INCLUDE}" -- # Linking libodoc is rather problematic +- # Linking libodbc is rather problematic - ODBC_LIBDIR=`${ODBC_CONFIG} --lib-prefix` -- LDFLAGS="$LDFLAGS -L${ODBC_LIBDIR}" +- if test "${ODBC_LIBDIR}" != ""; then +- LDFLAGS="$LDFLAGS -L${ODBC_LIBDIR}" +- fi +- LIBODBC=`${ODBC_CONFIG} --libs` # for regression test - fi - AC_MSG_NOTICE([using $ODBC_INCLUDE $ODBC_LIBDIR]) +- AC_MSG_NOTICE([using $LIBODBC for regression test]) -fi +-AC_SUBST(LIBODBC) +ODBC_LIBS="-lodbcinst" +LIBS="$LIBS ${ODBC_LIBS}" +AC_MSG_NOTICE([using $ODBC_INCLUDE $ODBC_LIBS]) # # SQLCOLATTRIBUTE_SQLLEN check -@@ -176,18 +138,10 @@ PGAC_ARG_BOOL(enable, pthreads, yes, +@@ -190,19 +139,10 @@ PGAC_ARG_BOOL(enable, pthreads, yes, # Find libpq headers and libraries # @@ -87,8 +105,9 @@ index df5ad7a..b72bd4c 100644 - -if test -n "$PG_CONFIG"; then - pg_includedir=`"$PG_CONFIG" --includedir` +- pg_pkg_includedir=`"$PG_CONFIG" --pkgincludedir` - pg_libdir=`"$PG_CONFIG" --libdir` -- CPPFLAGS="$CPPFLAGS -I$pg_includedir" +- CPPFLAGS="$CPPFLAGS -I$pg_includedir -I$pg_pkg_includedir/internal" - LDFLAGS="$LDFLAGS -L$pg_libdir" -fi - @@ -100,7 +119,7 @@ index df5ad7a..b72bd4c 100644 # 1. Programs -@@ -211,12 +165,6 @@ if test "$with_iodbc" != no; then +@@ -226,12 +166,6 @@ if test "$with_iodbc" != no; then [AC_MSG_ERROR([iODBC library "iodbcinst" not found])]) fi @@ -113,6 +132,3 @@ index df5ad7a..b72bd4c 100644 AC_CHECK_LIB(pq, PQsetSingleRowMode, [], [AC_MSG_ERROR([libpq library version >= 9.2 is required])]) --- -2.8.1 - diff --git a/meta-oe/recipes-dbs/psqlodbc/psqlodbc_09.05.0300.bb b/meta-oe/recipes-dbs/psqlodbc/psqlodbc_09.05.0300.bb deleted file mode 100644 index b0fc35eb97..0000000000 --- a/meta-oe/recipes-dbs/psqlodbc/psqlodbc_09.05.0300.bb +++ /dev/null @@ -1,14 +0,0 @@ -require ${PN}.inc - -LICENSE = "LGPL-2.0-only" -LIC_FILES_CHKSUM = "file://license.txt;md5=6db3822fc7512e83087ba798da013692" - -SRC_URI = "http://ftp.postgresql.org/pub/odbc/versions/src/${BPN}-${PV}.tar.gz \ - file://psqlodbc-remove-some-checks-for-cross-compiling.patch \ - file://psqlodbc-donot-use-the-hardcode-libdir.patch \ - file://psqlodbc-fix-for-ptest-support.patch \ - file://run-ptest \ -" - -SRC_URI[md5sum] = "4c6e0b22187d7bb1c998ffac89e50f6b" -SRC_URI[sha256sum] = "9521f328bf28aaaf5c8488dc89792b614f9d6271742c0baf9bb41c97537764a8" diff --git a/meta-oe/recipes-dbs/psqlodbc/psqlodbc.inc b/meta-oe/recipes-dbs/psqlodbc/psqlodbc_13.02.0000.bb similarity index 77% rename from meta-oe/recipes-dbs/psqlodbc/psqlodbc.inc rename to meta-oe/recipes-dbs/psqlodbc/psqlodbc_13.02.0000.bb index ae20a72a11..299abee000 100644 --- a/meta-oe/recipes-dbs/psqlodbc/psqlodbc.inc +++ b/meta-oe/recipes-dbs/psqlodbc/psqlodbc_13.02.0000.bb @@ -16,6 +16,18 @@ DESCRIPTION = "\ SECTION = "libs" HOMEPAGE = "http://psqlodbc.projects.postgresql.org/" +LICENSE = "LGPL-2.0-only" +LIC_FILES_CHKSUM = "file://license.txt;md5=6db3822fc7512e83087ba798da013692" + +SRC_URI = "http://ftp.postgresql.org/pub/odbc/versions/src/${BPN}-${PV}.tar.gz \ + file://psqlodbc-remove-some-checks-for-cross-compiling.patch \ + file://psqlodbc-donot-use-the-hardcode-libdir.patch \ + file://psqlodbc-fix-for-ptest-support.patch \ + file://run-ptest \ +" + +SRC_URI[sha256sum] = "b39b7e5c41fd6475c551112fa724bf57c4a446175ec4188a90e2844cc1612585" + DEPENDS += "postgresql unixodbc" EXTRA_OECONF = "\ @@ -24,8 +36,7 @@ EXTRA_OECONF = "\ --with-unixodbc=yes \ --with-libpq=${STAGING_LIBDIR}/.. \ --enable-pthreads \ - --disable-unicode \ - LIBS="-lpthread" \ + LIBS='-lpthread' \ " inherit autotools pkgconfig ptest @@ -48,3 +59,4 @@ FILES:${PN} += "${libdir}" # The tests need a local PostgreSQL server running RDEPENDS:${PN}-ptest = "postgresql" + From patchwork Wed Aug 31 05:41:37 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 12135 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 48AB3C0502A for ; Wed, 31 Aug 2022 05:41:49 +0000 (UTC) Received: from mail-pg1-f169.google.com (mail-pg1-f169.google.com [209.85.215.169]) by mx.groups.io with SMTP id smtpd.web12.22019.1661924506334041682 for ; Tue, 30 Aug 2022 22:41:46 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=OiXKPil2; spf=pass (domain: gmail.com, ip: 209.85.215.169, mailfrom: raj.khem@gmail.com) Received: by mail-pg1-f169.google.com with SMTP id q9so12613285pgq.6 for ; Tue, 30 Aug 2022 22:41:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc; bh=hNQ8q+ZZ2ybofM9DjVD5wKw9hMK/uRZMRk3kfCL+eok=; b=OiXKPil26PzVB83NyZbdwFbq0oWVBy4n/KBE+Wu5jHTfhL7IYE5Ib/7eDkp+xZB0Tk YaIdfJGoufCrQQl8syFOaWMGSMimOjSvpM41oiNkVQqjIbRgD5sw1N9tKvRtXK3jDMH+ ILQa+wMB5j1O/0yeLVQFn7Vhz3j8CrqOX/WuaFD1YLeERKJXBuDrG30JF80E/S0jqjZQ eODb0fk5PA5xZ+zfpYieRmQ8UTpLusohuQURANnVrZyJm2GeQsXG2IjHCslG/JZ46nim eyGc0LqfXZAvZDKge0BfTAN/ZQ3KEy89GmcQbFSMuvTCUZdYdIVt4KbawNsGyQSobuQK BoUA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc; bh=hNQ8q+ZZ2ybofM9DjVD5wKw9hMK/uRZMRk3kfCL+eok=; b=3HaetmHxh+d8mlVCSg/4mYUipzB8dCn0AVSLOhiRFFo7rMRNmXJe8tjgjU/kl5AlOE dTbdy9d2t3PyTSml1XNQmD3eJ71DrjaBh5o8lBL18mDKXmv/E5EbHIJUFumm3ED7/WDj ZUMKy1fYdtCUbgUUK3adB7sgpH2I8SuO2NJJpqBS5vcCbvsMijl0CAXlIY+RH3vmgr7v i9b2g/XSvh2NNW3CQ2VykzvU4h/avzmS6SSARspDspRgxYFc7WLccVQBxHWT0WCzKS0D BWRvSM2+qEEefLkb0yalHzkmoVt0bGWpbr4GugLqF1r1OKjYonmxATQ9XzRZWRD+QgyD AAXw== X-Gm-Message-State: ACgBeo17Ei0AjI+XaN5eMTDriIxUmNjnNIRzjEmD1Mg6fhuOkECSHgjl HBgzoLXCZi8NhPW6KHwP2sdv4GK4JQTS1A== X-Google-Smtp-Source: AA6agR4sZJMczkLKdtJb4WV5dEOQHFRF4ipRRl5NKyCi3TiHNxno2JJqIiXuOQTPb2qoE3TWBdtOCw== X-Received: by 2002:a63:4750:0:b0:42b:609d:538a with SMTP id w16-20020a634750000000b0042b609d538amr20944478pgk.217.1661924505491; Tue, 30 Aug 2022 22:41:45 -0700 (PDT) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9200:a0f0::24e6]) by smtp.gmail.com with ESMTPSA id u4-20020a170902e80400b001733c13cc81sm7275181plg.169.2022.08.30.22.41.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Aug 2022 22:41:44 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Cc: Khem Raj Subject: [meta-oe][PATCH 3/5] soci: Fix build with clang 15 Date: Tue, 30 Aug 2022 22:41:37 -0700 Message-Id: <20220831054139.3493726-3-raj.khem@gmail.com> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20220831054139.3493726-1-raj.khem@gmail.com> References: <20220831054139.3493726-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, 31 Aug 2022 05:41:49 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/98572 Signed-off-by: Khem Raj --- ...Do-not-use-std-shuffle-with-clang-15.patch | 32 +++++++++++++++++++ meta-oe/recipes-dbs/soci/soci_4.0.3.bb | 4 ++- 2 files changed, 35 insertions(+), 1 deletion(-) create mode 100644 meta-oe/recipes-dbs/soci/soci/0001-Do-not-use-std-shuffle-with-clang-15.patch diff --git a/meta-oe/recipes-dbs/soci/soci/0001-Do-not-use-std-shuffle-with-clang-15.patch b/meta-oe/recipes-dbs/soci/soci/0001-Do-not-use-std-shuffle-with-clang-15.patch new file mode 100644 index 0000000000..eb29627c6d --- /dev/null +++ b/meta-oe/recipes-dbs/soci/soci/0001-Do-not-use-std-shuffle-with-clang-15.patch @@ -0,0 +1,32 @@ +From e5f72c656829402c6f70e7416039bc18f0c26485 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Tue, 30 Aug 2022 22:17:14 -0700 +Subject: [PATCH] Do not use std::shuffle with clang 15 + +This fails to compile although its preferred approach for c++11 and +newer + +See +https://github.com/SOCI/soci/issues/984 + +Upstream-Status: Inappropriate [Workaround] +Signed-off-by: Khem Raj +--- + cmake/SociConfig.cmake | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/cmake/SociConfig.cmake b/cmake/SociConfig.cmake +index 492e1837..f24fd9a6 100644 +--- a/cmake/SociConfig.cmake ++++ b/cmake/SociConfig.cmake +@@ -94,6 +94,7 @@ else() + set(SOCI_CXX11 ON) + set(SOCI_CXX_VERSION_FLAGS "-std=c++11") + add_definitions(-DCATCH_CONFIG_CPP11_NO_IS_ENUM) ++ add_definitions(-DCATCH_CONFIG_CPP11_NO_SHUFFLE) + + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${SOCI_GCC_CLANG_COMMON_FLAGS} ${SOCI_CXX_VERSION_FLAGS}") + +-- +2.37.3 + diff --git a/meta-oe/recipes-dbs/soci/soci_4.0.3.bb b/meta-oe/recipes-dbs/soci/soci_4.0.3.bb index ff47e5033e..71ab80c48a 100644 --- a/meta-oe/recipes-dbs/soci/soci_4.0.3.bb +++ b/meta-oe/recipes-dbs/soci/soci_4.0.3.bb @@ -5,7 +5,9 @@ LIC_FILES_CHKSUM = "file://LICENSE_1_0.txt;md5=e4224ccaecb14d942c71d31bef20d78c" SECTION = "libs" DEPENDS = "boost" -SRC_URI = "${SOURCEFORGE_MIRROR}/project/${BPN}/${BPN}/${BP}/${BP}.tar.gz" +SRC_URI = "${SOURCEFORGE_MIRROR}/project/${BPN}/${BPN}/${BP}/${BP}.tar.gz \ + file://0001-Do-not-use-std-shuffle-with-clang-15.patch \ + " SRC_URI[sha256sum] = "615e5f7e4b52007f3a3b4050a99aadf6346b56b5098eb08b3a650836083c6a33" TESTCONFIG = '-DSOCI_TEST_EMPTY_CONNSTR="dummy" -DSOCI_TEST_SQLITE3_CONNSTR="test.db" \ From patchwork Wed Aug 31 05:41:38 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 12133 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 47CA5ECAAD8 for ; Wed, 31 Aug 2022 05:41:49 +0000 (UTC) Received: from mail-pl1-f182.google.com (mail-pl1-f182.google.com [209.85.214.182]) by mx.groups.io with SMTP id smtpd.web12.22020.1661924507819855377 for ; Tue, 30 Aug 2022 22:41:47 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=biJHjOB8; spf=pass (domain: gmail.com, ip: 209.85.214.182, mailfrom: raj.khem@gmail.com) Received: by mail-pl1-f182.google.com with SMTP id m2so13182719pls.4 for ; Tue, 30 Aug 2022 22:41:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc; bh=UhDTUHWm0LB1+G8X5S8xb3EqtKUh0+ygIR+LBDRWSCo=; b=biJHjOB8xyqs3dz2RQZxmCwwc5WFYAySdN7hfG5cYbzuppdq+torfTTxwcXB4R8qfX im0iXcgZKBDILK2ReTJQZGwnGg3mGbd0/ltrT4IQtlWUdDF5Gz84HvWUJkihKM2mASsh 0FJE8b2bfc+/+NUsH2Xl6kIhpzH1u5T49pm0OvyJC646TGXnitHgWMYaSDK2iAnTahGF ouQ59ifPicHBpbnfxwba5D4uoUYrVpoGng+I9xFioxTFIjZkBew+N+t5B+PiokLpQ2/l 840Mm9NnkE8zXah1Gxl69IFuGfR/HzHZXP4XrgST0I9flCIeUeim0zEycduwIUoq7mBf rtsg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc; bh=UhDTUHWm0LB1+G8X5S8xb3EqtKUh0+ygIR+LBDRWSCo=; b=Gl/QiilEO0QO8ooYvylHJ/7c3+B1vk84wcynnkfUzXMqd3Vp3dH4NjVMHGoR4McCsc UblUpmk/N7dq9KxJoOFWAIQmdNAOPLjQQcN+IRXcsRjOzdvnSzmJmQMJzMu2I50oDxqg UT32Te8XOnFprm1qYugUHuaxBAfe3UEsxcc49gW7fdE8ZKyB9vvoB7yLHTOyTRgSxRta doDldgmSONMO2HLAQK44moBDFSScJgw/2M7pf+OY0UVarqmoGMRFQtSfsXYFWQQ5+9q/ eBcEz84z4EtS1UkwwnK/rvc6eqgv6Ci3MsZRoCJeEVkTGEYRIBZW6CEl8rYhBpvhxZ3g jqbQ== X-Gm-Message-State: ACgBeo3Lb4WGxBbHQMAddGuncq47kolkr1byEFjbx1DZfCNGlEkqaaj2 2cq1WOejlkwU6bbwY+AWeZQiJ8JEQICQVg== X-Google-Smtp-Source: AA6agR4WpR0BgVaG5/XAOf24s+TMLidMK0x6x2eeqCF4bVp9x2gPUUBh+KVB8d3kCHEwrERJHtcbrA== X-Received: by 2002:a17:902:bd08:b0:16d:4230:cb45 with SMTP id p8-20020a170902bd0800b0016d4230cb45mr24312007pls.59.1661924507014; Tue, 30 Aug 2022 22:41:47 -0700 (PDT) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9200:a0f0::24e6]) by smtp.gmail.com with ESMTPSA id u4-20020a170902e80400b001733c13cc81sm7275181plg.169.2022.08.30.22.41.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Aug 2022 22:41:46 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Cc: Khem Raj Subject: [meta-oe][PATCH 4/5] geany-plugins: Fix type error found with clang 15 Date: Tue, 30 Aug 2022 22:41:38 -0700 Message-Id: <20220831054139.3493726-4-raj.khem@gmail.com> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20220831054139.3493726-1-raj.khem@gmail.com> References: <20220831054139.3493726-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, 31 Aug 2022 05:41:49 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/98573 Signed-off-by: Khem Raj --- ...e-Use-0-instead-of-NULL-for-gboolean.patch | 34 +++++++++++++++++++ .../geany/geany-plugins_1.38.bb | 1 + 2 files changed, 35 insertions(+) create mode 100644 meta-oe/recipes-devtools/geany/geany-plugins/0001-scope-Use-0-instead-of-NULL-for-gboolean.patch diff --git a/meta-oe/recipes-devtools/geany/geany-plugins/0001-scope-Use-0-instead-of-NULL-for-gboolean.patch b/meta-oe/recipes-devtools/geany/geany-plugins/0001-scope-Use-0-instead-of-NULL-for-gboolean.patch new file mode 100644 index 0000000000..bb03fa63de --- /dev/null +++ b/meta-oe/recipes-devtools/geany/geany-plugins/0001-scope-Use-0-instead-of-NULL-for-gboolean.patch @@ -0,0 +1,34 @@ +From 9ee9388bc66e6cf68db96b2014dca2115f745dc9 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Tue, 30 Aug 2022 22:33:46 -0700 +Subject: [PATCH] scope: Use 0 instead of NULL for gboolean + +Fixes warnings with clang 15+ + +scope/src/stack.c:168:11: error: incompatible pointer to integer conversion initializing 'gboolean' (aka 'int') with an expression of type 'void *' [-Wint-conversion] + gboolean entry = NULL; + ^ ~~~~ +1 error generated. + +Upstream-Status: Submitted [https://github.com/geany/geany-plugins/pull/1191] +Signed-off-by: Khem Raj +--- + scope/src/stack.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/scope/src/stack.c b/scope/src/stack.c +index b03909fe..041dd415 100644 +--- a/scope/src/stack.c ++++ b/scope/src/stack.c +@@ -165,7 +165,7 @@ void on_stack_follow(GArray *nodes) + gboolean stack_entry(void) + { + GtkTreeIter iter; +- gboolean entry = NULL; ++ gboolean entry = 0; + + if (gtk_tree_selection_get_selected(selection, NULL, &iter)) + { +-- +2.37.3 + diff --git a/meta-oe/recipes-devtools/geany/geany-plugins_1.38.bb b/meta-oe/recipes-devtools/geany/geany-plugins_1.38.bb index fa4cccca03..1ed2993bf0 100644 --- a/meta-oe/recipes-devtools/geany/geany-plugins_1.38.bb +++ b/meta-oe/recipes-devtools/geany/geany-plugins_1.38.bb @@ -33,6 +33,7 @@ SRC_URI = " \ file://0001-Use-pkg-config-to-find-gpgme.patch \ file://0001-git-changebar-Adjust-structs-for-libgit2-1.4.x.patch \ file://0001-geany.m4-Do-not-tinker-with-pkg-config-paths.patch \ + file://0001-scope-Use-0-instead-of-NULL-for-gboolean.patch \ " SRC_URI[sha256sum] = "1c578a7ebb390aa8882f195acd3d8da3ceb73925d291b28dec90cd3e5fd20586" From patchwork Wed Aug 31 05:41:39 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 12137 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 244AAECAAD8 for ; Wed, 31 Aug 2022 05:41:59 +0000 (UTC) Received: from mail-pf1-f182.google.com (mail-pf1-f182.google.com [209.85.210.182]) by mx.groups.io with SMTP id smtpd.web12.22021.1661924508961034100 for ; Tue, 30 Aug 2022 22:41:49 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=Gri9kCZE; spf=pass (domain: gmail.com, ip: 209.85.210.182, mailfrom: raj.khem@gmail.com) Received: by mail-pf1-f182.google.com with SMTP id z187so13407702pfb.12 for ; Tue, 30 Aug 2022 22:41:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc; bh=mAKC91FV29HIA5Ag8Vigr8KIW1A8cjYWQ6yN31KLXLI=; b=Gri9kCZEvA2NgJa5t3BtP9Zfznc70OIpZEBaP9l8VIqWQIkltveXM41WrDApDGBtUp x0RxKiBM4vpGKHTUhphqdWXz5nv6zvnWIpQWaGHpwERDZK/qxmL9p9kQqM16ktFcI0qI wtWOzrfBIpuNY1CsbSnrJzFMNXC+1Du9EC/HxmcGm7y5rPczWw7p4xu2M+sffwlOfSth FCZnQPcsjByTyzQWm5vl0o7NVHsXurDSi/tEI2ZsfmKhS4DhogfATpgJ8wb5pZuKPw5X YCpPRTz7PHicnA6FS7fvIfq8zrxjl1p6UPSt0M34kJZTieLkZ8FWHIrtTRPdujpXP1La Rb8Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc; bh=mAKC91FV29HIA5Ag8Vigr8KIW1A8cjYWQ6yN31KLXLI=; b=1w2w3IYb0mHea9X5hVk7Yy/ZP53EhHV8sjFz3CZ+roy3roMHgCxJlOw7zQpCdR1KBo qF4eOPmMEJ9HpLiQ1ZYZ6LpyxTKOL1OSZEnTLo9Rhm7k0USXee8G5pwvcOrgAtDvRpg2 rSk6BfDj76dQyCghsup4kP28f4avOust6FJGjCo8Rw6qx4tcdtGxQaeQj2F3S+xtLCiD clomjIA2AHNwLj4+Bpt/59s5/xZz/PAcdDINjc5H2HPwikupNanqlRXf8wBHQcKN3Miv YN9fNPdjJo7hv9sMLrBhotsSdul6/nnQNWOvBIqC3EzKaw9E/hAG52wnNNfNeNQkXnfb uA9Q== X-Gm-Message-State: ACgBeo1Ki9iT3f+fuHrvHgCvQR4DI4JchT6PRMkVEVms+VOhhQpTKuS/ lEmf2bV1FN4TVESElE2ZgUyYawKyHBG+kg== X-Google-Smtp-Source: AA6agR47j3xmkSKQNbtQjXH34jyCyc7RSoKckpx9dtEfKlP9mAQNre/SzyETeraBY0mIpXWiS9Fy1g== X-Received: by 2002:a63:6a48:0:b0:42a:3cab:cc36 with SMTP id f69-20020a636a48000000b0042a3cabcc36mr21033187pgc.135.1661924508117; Tue, 30 Aug 2022 22:41:48 -0700 (PDT) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9200:a0f0::24e6]) by smtp.gmail.com with ESMTPSA id u4-20020a170902e80400b001733c13cc81sm7275181plg.169.2022.08.30.22.41.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Aug 2022 22:41:47 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Cc: Khem Raj Subject: [meta-oe][PATCH 5/5] nlohmann-fifo: Update to tip of trunk Date: Tue, 30 Aug 2022 22:41:39 -0700 Message-Id: <20220831054139.3493726-5-raj.khem@gmail.com> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20220831054139.3493726-1-raj.khem@gmail.com> References: <20220831054139.3493726-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, 31 Aug 2022 05:41:59 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/98574 Signed-off-by: Khem Raj --- meta-oe/recipes-devtools/nlohmann-fifo/nlohmann-fifo_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oe/recipes-devtools/nlohmann-fifo/nlohmann-fifo_git.bb b/meta-oe/recipes-devtools/nlohmann-fifo/nlohmann-fifo_git.bb index ace3215396..5a130ebda4 100644 --- a/meta-oe/recipes-devtools/nlohmann-fifo/nlohmann-fifo_git.bb +++ b/meta-oe/recipes-devtools/nlohmann-fifo/nlohmann-fifo_git.bb @@ -8,7 +8,7 @@ SRC_URI = "git://github.com/nlohmann/fifo_map.git;branch=master;protocol=https" PV = "1.0.0+git${SRCPV}" -SRCREV = "0dfbf5dacbb15a32c43f912a7e66a54aae39d0f9" +SRCREV = "d732aaf9a315415ae8fd7eb11e3a4c1f80e42a48" UPSTREAM_CHECK_COMMITS = "1"