From patchwork Mon May 5 06:21:36 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 62426 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 E77D4C3ABAA for ; Mon, 5 May 2025 06:21:54 +0000 (UTC) Received: from mail-pf1-f174.google.com (mail-pf1-f174.google.com [209.85.210.174]) by mx.groups.io with SMTP id smtpd.web11.44487.1746426105661457299 for ; Sun, 04 May 2025 23:21:45 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=ZtuZsDM/; spf=pass (domain: gmail.com, ip: 209.85.210.174, mailfrom: raj.khem@gmail.com) Received: by mail-pf1-f174.google.com with SMTP id d2e1a72fcca58-739b3fe7ce8so3515057b3a.0 for ; Sun, 04 May 2025 23:21:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1746426105; x=1747030905; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=tL5aT6wTUs2DTfh4rbuiFxocQBZ+lHFfYfPgBo0I3tE=; b=ZtuZsDM/BV/eakF2r2IzDYcBjy+LPi+n3iHymC5kaiyuDhhUDV7jvtYlj+G7s1R4Tm Zd90qjA6NspKw5GyAIbPZ2sBUvrINmwSTuQUp8qdNvLosPxftIdyxLhI4lkFJPiklwDq JmSb3z/qKQHFJzASfR9MQpxIGCIJw5kz6Grrg1DRvo6CyctD2oiCYDYiS908cGnKEk0M ipoNorwx0WJWwRN56hzJnXX74yJmfVlOF7LAOTATiuHQkEGL55yHSK7hVqlwtT/OQ6kw 9h0cvp4kqPjmd6vIAPxF7j2rmfuXokBLI6u5KKTdq+PqDC2gDmmBOL1tgUxiV3GFd/j1 Z4Ng== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746426105; x=1747030905; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=tL5aT6wTUs2DTfh4rbuiFxocQBZ+lHFfYfPgBo0I3tE=; b=le53zptCkjvxVTRSTV5C5RrPh+/6gA70C+lFEQdgguK4YoCK7UBiAhApO+hIwJZU0v 0AdJ+nU/D4F7+XpQe3fUFb//615gB9Q2424fjEaLMT5z+r+RcROV77zjIA1RsPqs8/hT XgJeDGwnIuchLWdVe5tou+6MSI7EXWp3pdJXCXqB0uTCp/fOJnPACpfPKxguWOfeKAPm hujbsootz5HNSdua+rUi8yTxOJ1vLVVQ51attfpv4PnIIcl/lXwG98Ca/V6nApgrRU6W LFdJYTPbfipLlaAAfFHcrAfmVshJOHn4Lb/4ntnagiYGgR4/ekFd2x2kqgOq+jZcb4CG Yw2w== X-Gm-Message-State: AOJu0YxrSLVsOz8nkQ7vJL/vSybrIdExyD/HL8huVDOnCWjROwTK2Hm/ BE9WEhff8tJOaC+TYvt4U0qirEW1YFaD8y6lq6S2Fe3VqP24DTvsormJIC50 X-Gm-Gg: ASbGncuIwaQVbBsSl4mDZmzLsuM49ZT8uNgRHpNW243h8kfWj6JadC+kleqprAS7LYq bI2T8beukLh9qnKWByZkzT49jv27CI3GjZmQNljzEUsPP4E1ddgSmUragJcwZ7no7lnZOWAH1i8 hhSoAUZVnqTg7QZ1e8flEPCS2YaTluvb7itJ1XqaCiif+yG2pejQhzpsKBjIfd//cmzLY6M8YbA UC2pxn5ReVd0I6s7N396nYTfTynum6kZ3EZxzcVsYUVzvC+C5br6T3vPvbBmueu7QpAsFnqC17L jdIOKbDl11ezmj6z9sN0xFxhMw2/+EAU X-Google-Smtp-Source: AGHT+IEW7oSe/1lAcP7F/MpYBCoTRgv87e4RQYzD966AD/zq+ChTxFGvA9j4V/nAce0OqO9H5pDERg== X-Received: by 2002:a05:6a00:410d:b0:740:854:160 with SMTP id d2e1a72fcca58-7406729ec90mr11231385b3a.4.1746426104644; Sun, 04 May 2025 23:21:44 -0700 (PDT) Received: from apollo.localdomain ([2601:646:8201:fd20::5209]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-74058d7b1cdsm5952352b3a.25.2025.05.04.23.21.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 04 May 2025 23:21:44 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Cc: Khem Raj Subject: [meta-oe][PATCH 1/7] uim: Stick to C17 Date: Sun, 4 May 2025 23:21:36 -0700 Message-ID: <20250505062142.3478500-1-raj.khem@gmail.com> X-Mailer: git-send-email 2.49.0 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 ; Mon, 05 May 2025 06:21:54 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/117290 Signed-off-by: Khem Raj --- meta-oe/recipes-support/uim/uim_1.9.0.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta-oe/recipes-support/uim/uim_1.9.0.bb b/meta-oe/recipes-support/uim/uim_1.9.0.bb index 4c16ab327a..a7857b2487 100644 --- a/meta-oe/recipes-support/uim/uim_1.9.0.bb +++ b/meta-oe/recipes-support/uim/uim_1.9.0.bb @@ -31,6 +31,8 @@ REQUIRED_DISTRO_FEATURES = "x11" GTKIMMODULES_PACKAGES = "uim-gtk2.0 uim-gtk3" +CFLAGS += "-std=gnu17" + EXTRA_OECONF += "--disable-emacs \ --with-libedit=${STAGING_EXECPREFIXDIR} \ --without-scim \ From patchwork Mon May 5 06:21:37 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 62430 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 0D9C6C3ABBB for ; Mon, 5 May 2025 06:21:55 +0000 (UTC) Received: from mail-pl1-f175.google.com (mail-pl1-f175.google.com [209.85.214.175]) by mx.groups.io with SMTP id smtpd.web10.44202.1746426106809253916 for ; Sun, 04 May 2025 23:21:46 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=iLUMGddX; spf=pass (domain: gmail.com, ip: 209.85.214.175, mailfrom: raj.khem@gmail.com) Received: by mail-pl1-f175.google.com with SMTP id d9443c01a7336-22e16234307so18593925ad.0 for ; Sun, 04 May 2025 23:21:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1746426106; x=1747030906; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=hZMLlMVXDhLg1g8g+wp08eYB18LYRmZwOZAehW4vPK4=; b=iLUMGddXQUXuwW+kExeuICqCXx9H13yuG25z+FYq0SSW3K4EwUWOcpa9Ggp/uwtNsF nHJYt6Xqa3ej3rhre9VKy3fHib6VVWo7hnLlKhdlSI2ph9n4THbzO+waWwfCCdVNmEx0 zW57mS3A5o9Q+yGZEHpo+eYvb4Uz32r9i98ceq0MwutWtvvhjLVr+60tmDPSBI/OJI5G z4+ljHydD2Ky91C3wc55FkcLPr/AKArQAubt27LvUz7gFax1CUjZFC493A7jOlV8/wgp wWeCO7w3O3SRLKoEZQ8nnK33eVEPpgDo3zN6fnQuPBkZAAz7P6t91BYkAYn/6Opd2gNz eUBQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746426106; x=1747030906; 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:message-id:reply-to; bh=hZMLlMVXDhLg1g8g+wp08eYB18LYRmZwOZAehW4vPK4=; b=tiDJWYDir7gGk/w9JDqfdOG6pMP+r8QL7xTQ+yHQMOo8/S5ftXcSqhMktK8SMU36bi pLILHNYyOhkWbY+jLirowcDDoBn9cR1xNZL5+3DYh5P2dUJgoOk50cS4IDvl5pLxEsF0 1CEbYFETrZwkhg9fGALaUW0xYHTIFqTbCphs/xoQ35V5e+6AXUTfJSVvMPu7zj36ZbeP aucg8kmnEM9fUKPyTBgMqHsYumdyYnfmfPKNuHM8YHbSeLPVHDeBYz8tZZpWOHpUeJLh gHiXgbycP5QDcMrzsq14Ty4IUvSvYI3C5J0QjSQAMtmTbJ2zgrxT8W6dueJgJ9oKfD9z +yMQ== X-Gm-Message-State: AOJu0YxDV9nG+ARov8aKMVjfLGjIxC4R280WWCRV2W0z7vsbmeqnivu7 Qt4FX5/djwEoJEGe8X8Z92voIHC7G9qJnN7yUM3tWPHf0yqxfxV0xBIAda/r X-Gm-Gg: ASbGnctBCZ00H5pP+OqaSnBHwUQTcyY853snWHmy5dAkZdJaDC8aB+MlCZ6kRNTNzXe Zjs4JMo9gdw9EpB+2zcAz/FuvY/2WdYvtOj8GfgaHqru5CdKm/+agEi1TDE3wjarqghALcEJQl9 Dn3tZjMcznI6+o7NDK5EsntXBFFy1KnlacK8uxKgL8B3IlOpld54Vlg37/HT83WbcnbclEK5sAc ffNqLXCSr5TKx7GKqk8vHlTe9OiRM5hc87793ZIzTuGt9N/G7OVbQsrGl3dvrxHYl67kwEAYlXE pnankr3K5dXbI5gKQm5XVtKHt2vuXMGQ X-Google-Smtp-Source: AGHT+IFZCiLB0k4LUfK0azQapbH8tPCWB767uxiE94fNo1mVvg1K7rWRBXPTl90dXfa+DdKC2r3UAw== X-Received: by 2002:a17:902:e541:b0:21f:5063:d3ca with SMTP id d9443c01a7336-22e0863a1cbmr221206905ad.16.1746426105681; Sun, 04 May 2025 23:21:45 -0700 (PDT) Received: from apollo.localdomain ([2601:646:8201:fd20::5209]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-74058d7b1cdsm5952352b3a.25.2025.05.04.23.21.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 04 May 2025 23:21:45 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Cc: Khem Raj Subject: [meta-oe][PATCH 2/7] fluent-bit: Upgrade to 4.0.1 release Date: Sun, 4 May 2025 23:21:37 -0700 Message-ID: <20250505062142.3478500-2-raj.khem@gmail.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250505062142.3478500-1-raj.khem@gmail.com> References: <20250505062142.3478500-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 ; Mon, 05 May 2025 06:21:55 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/117291 Refresh and forward port patches Add -std=gnu17 to fix build with GCC-15 Signed-off-by: Khem Raj --- ...rivate-makefile-targets-in-CMakelist.patch | 16 ++++--------- ...-not-hardcode-compilation-directorie.patch | 2 -- ...ts.txt-Revise-init-manager-deduction.patch | 18 +++++++-------- ...{fluentbit_3.2.8.bb => fluentbit_4.0.1.bb} | 23 +++++++++++-------- 4 files changed, 26 insertions(+), 33 deletions(-) rename meta-oe/recipes-extended/fluentbit/{fluentbit_3.2.8.bb => fluentbit_4.0.1.bb} (90%) diff --git a/meta-oe/recipes-extended/fluentbit/fluentbit/0001-lib-Do-not-use-private-makefile-targets-in-CMakelist.patch b/meta-oe/recipes-extended/fluentbit/fluentbit/0001-lib-Do-not-use-private-makefile-targets-in-CMakelist.patch index fae98f1f5d..32f4fdec51 100644 --- a/meta-oe/recipes-extended/fluentbit/fluentbit/0001-lib-Do-not-use-private-makefile-targets-in-CMakelist.patch +++ b/meta-oe/recipes-extended/fluentbit/fluentbit/0001-lib-Do-not-use-private-makefile-targets-in-CMakelist.patch @@ -28,8 +28,6 @@ Upstream-Status: Submitted [https://github.com/fluent/fluent-bit/pull/9450] lib/monkey/CMakeLists.txt | 4 +--- 4 files changed, 7 insertions(+), 21 deletions(-) -diff --git a/lib/cfl/CMakeLists.txt b/lib/cfl/CMakeLists.txt -index 2193cb29c..e2a5cba37 100644 --- a/lib/cfl/CMakeLists.txt +++ b/lib/cfl/CMakeLists.txt @@ -40,12 +40,8 @@ if(NOT MSVC) @@ -47,8 +45,6 @@ index 2193cb29c..e2a5cba37 100644 -diff --git a/lib/cmetrics/CMakeLists.txt b/lib/cmetrics/CMakeLists.txt -index 18582997d..8f7176dd6 100644 --- a/lib/cmetrics/CMakeLists.txt +++ b/lib/cmetrics/CMakeLists.txt @@ -60,12 +60,8 @@ if(NOT MSVC) @@ -66,12 +62,10 @@ index 18582997d..8f7176dd6 100644 # Configuration options option(CMT_DEV "Enable development mode" No) -diff --git a/lib/ctraces/CMakeLists.txt b/lib/ctraces/CMakeLists.txt -index e47ba022d..0ddfd5f97 100644 --- a/lib/ctraces/CMakeLists.txt +++ b/lib/ctraces/CMakeLists.txt @@ -30,12 +30,8 @@ set(CTR_VERSION_MINOR 6) - set(CTR_VERSION_PATCH 0) + set(CTR_VERSION_PATCH 4) set(CTR_VERSION_STR "${CTR_VERSION_MAJOR}.${CTR_VERSION_MINOR}.${CTR_VERSION_PATCH}") -# Define __FILENAME__ consistently across Operating Systems @@ -85,8 +79,6 @@ index e47ba022d..0ddfd5f97 100644 # Configuration options option(CTR_DEV "Enable development mode" No) -diff --git a/lib/monkey/CMakeLists.txt b/lib/monkey/CMakeLists.txt -index 028240bcc..b386cb726 100644 --- a/lib/monkey/CMakeLists.txt +++ b/lib/monkey/CMakeLists.txt @@ -15,10 +15,8 @@ include(GNUInstallDirs) @@ -95,9 +87,9 @@ index 028240bcc..b386cb726 100644 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99 -Wall -Wextra") -set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D__FILENAME__='\"$$(subst ${CMAKE_SOURCE_DIR}/,,$$(abspath \$$<))\"'") -else() -+endif() - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D__FILENAME__=__FILE__") --endif() +-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D__FILENAME__=__FILE__") + endif() ++set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D__FILENAME__=__FILE__") # Monkey Version set(MK_VERSION_MAJOR 1) diff --git a/meta-oe/recipes-extended/fluentbit/fluentbit/0002-flb_info.h.in-Do-not-hardcode-compilation-directorie.patch b/meta-oe/recipes-extended/fluentbit/fluentbit/0002-flb_info.h.in-Do-not-hardcode-compilation-directorie.patch index 01a11e3be7..025f8729ea 100644 --- a/meta-oe/recipes-extended/fluentbit/fluentbit/0002-flb_info.h.in-Do-not-hardcode-compilation-directorie.patch +++ b/meta-oe/recipes-extended/fluentbit/fluentbit/0002-flb_info.h.in-Do-not-hardcode-compilation-directorie.patch @@ -13,8 +13,6 @@ Upstream-Status: Pending include/fluent-bit/flb_info.h.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/include/fluent-bit/flb_info.h.in b/include/fluent-bit/flb_info.h.in -index 3a08f8051..aa6a48f29 100644 --- a/include/fluent-bit/flb_info.h.in +++ b/include/fluent-bit/flb_info.h.in @@ -23,7 +23,7 @@ diff --git a/meta-oe/recipes-extended/fluentbit/fluentbit/0003-CMakeLists.txt-Revise-init-manager-deduction.patch b/meta-oe/recipes-extended/fluentbit/fluentbit/0003-CMakeLists.txt-Revise-init-manager-deduction.patch index 8dd4da47ec..909d1be28d 100644 --- a/meta-oe/recipes-extended/fluentbit/fluentbit/0003-CMakeLists.txt-Revise-init-manager-deduction.patch +++ b/meta-oe/recipes-extended/fluentbit/fluentbit/0003-CMakeLists.txt-Revise-init-manager-deduction.patch @@ -14,23 +14,21 @@ Upstream-Status: Inappropriate [configuration] src/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 8404b65c1..0c7876058 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt -@@ -546,7 +546,7 @@ if(FLB_BINARY) +@@ -569,7 +569,7 @@ if(FLB_BINARY) set(SYSTEMD_UNITDIR /lib/systemd/system) endif() - if(SYSTEMD_UNITDIR) + if(@INIT_MANAGER_IS_SYSTEMD@) - set(FLB_SYSTEMD_SCRIPT "${PROJECT_SOURCE_DIR}/init/${FLB_OUT_NAME}.service") - configure_file( - "${PROJECT_SOURCE_DIR}/init/systemd.in" -@@ -554,7 +554,7 @@ if(FLB_BINARY) - ) - install(FILES ${FLB_SYSTEMD_SCRIPT} COMPONENT binary DESTINATION ${SYSTEMD_UNITDIR}) - install(DIRECTORY DESTINATION ${FLB_INSTALL_CONFDIR} COMPONENT binary) + if (FLB_AMAZON_LINUX2) + set(FLB_SYSTEMD_SCRIPT "${PROJECT_SOURCE_DIR}/init/${FLB_OUT_NAME}.service") + configure_file( +@@ -594,7 +594,7 @@ if(FLB_BINARY) + install(FILES ${FLB_SYSTEMD_SCRIPT} COMPONENT binary DESTINATION ${SYSTEMD_UNITDIR}) + install(DIRECTORY DESTINATION ${FLB_INSTALL_CONFDIR} COMPONENT binary) + endif() - elseif(IS_DIRECTORY /usr/share/upstart) + elseif(@INIT_MANAGER_IS_UPSTART@) set(FLB_UPSTART_SCRIPT "${PROJECT_SOURCE_DIR}/init/${FLB_OUT_NAME}.conf") diff --git a/meta-oe/recipes-extended/fluentbit/fluentbit_3.2.8.bb b/meta-oe/recipes-extended/fluentbit/fluentbit_4.0.1.bb similarity index 90% rename from meta-oe/recipes-extended/fluentbit/fluentbit_3.2.8.bb rename to meta-oe/recipes-extended/fluentbit/fluentbit_4.0.1.bb index 59e23567b1..4d82abc783 100644 --- a/meta-oe/recipes-extended/fluentbit/fluentbit_3.2.8.bb +++ b/meta-oe/recipes-extended/fluentbit/fluentbit_4.0.1.bb @@ -17,9 +17,9 @@ DEPENDS = "\ " DEPENDS:append:libc-musl = " fts" -SRCREV = "d13e8e4ab2029fa92600b7d1d0da28f8dcc350eb" +SRCREV = "b12e507090273576d1156342780c7c6d358fa579" SRC_URI = "\ - git://github.com/fluent/fluent-bit.git;branch=3.2;protocol=https \ + git://github.com/fluent/fluent-bit.git;branch=master;protocol=https \ file://0001-lib-Do-not-use-private-makefile-targets-in-CMakelist.patch \ file://0002-flb_info.h.in-Do-not-hardcode-compilation-directorie.patch \ file://0003-CMakeLists.txt-Revise-init-manager-deduction.patch \ @@ -109,8 +109,8 @@ PACKAGECONFIG[windows-defaults] = "-DFLB_WINDOWS_DEFAULTS=Yes,-DFLB_WINDOWS_DEFA # individual plugins then to enable (e.g. using EXTRA_OECMAKE:append = " -DFLB_FOOBAR=ON") PACKAGECONFIG[minimal] = "-DFLB_MINIMAL=Yes,-DFLB_MINIMAL=No" -PACKAGECONFIG[in-kafka] = "-DFLB_IN_KAFKA=ON,-DFLB_IN_KAFKA=OFF,librdkafka curl" -PACKAGECONFIG[out-kafka] = "-DFLB_OUT_KAFKA=ON,-DFLB_OUT_KAFKA=OFF,librdkafka curl" +PACKAGECONFIG[in-kafka] = "-DFLB_KAFKA=ON -DFLB_IN_KAFKA=ON,-DFLB_KAFKA=OFF -DFLB_IN_KAFKA=OFF,librdkafka curl" +PACKAGECONFIG[out-kafka] = "-DFLB_KAFKA=ON -DFLB_OUT_KAFKA=ON,-DFLB_KAFKA=OFF -DFLB_OUT_KAFKA=OFF,librdkafka curl" SYSTEMD_SERVICE:${PN} = "fluent-bit.service" @@ -124,13 +124,18 @@ FULL_OPTIMIZATION:remove = "${@'-O2' if bb.data.inherits_class('clang', d) else TARGET_CC_ARCH += "${SELECTED_OPTIMIZATION}" TARGET_CC_ARCH:remove = "-D_FORTIFY_SOURCE=2" EXTRA_OECMAKE += "-DCMAKE_DEBUG_SRCDIR=${TARGET_DBGSRC_DIR}/" -EXTRA_OECMAKE:append:mips = " -DCMAKE_C_STANDARD_LIBRARIES=-latomic" -EXTRA_OECMAKE:append:powerpc = " -DCMAKE_C_STANDARD_LIBRARIES=-latomic" -EXTRA_OECMAKE:append:riscv32 = " -DCMAKE_C_STANDARD_LIBRARIES=-latomic" -EXTRA_OECMAKE:append:riscv64 = " -DCMAKE_C_STANDARD_LIBRARIES=-latomic" -EXTRA_OECMAKE:append:x86 = " -DCMAKE_C_STANDARD_LIBRARIES=-latomic" + SECURITY_STRINGFORMAT:remove = "${@bb.utils.contains('PACKAGECONFIG', 'aws-error-reporter', '-Werror=format-security', '', d)}" +# GCC-15 uses C23 std and it does not yet compile with C23 +CFLAGS += "-std=gnu17" +# 64bit atomics builtins do not exist in compiler on these arches +LDFLAGS:append:mips = " -latomic" +LDFLAGS:append:powerpc = " -latomic" +LDFLAGS:append:riscv32 = " -latomic" +LDFLAGS:append:riscv64 = " -latomic" +LDFLAGS:append:x86 = " -latomic" + do_configure:prepend() { sed -i \ -e 's#@INIT_MANAGER_IS_SYSTEMD@#'${@'TRUE' if d.getVar('INIT_MANAGER') == 'systemd' else 'FALSE'}'#' \ From patchwork Mon May 5 06:21:38 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 62427 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 0D202C3ABBA for ; Mon, 5 May 2025 06:21:55 +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.web11.44488.1746426107648239476 for ; Sun, 04 May 2025 23:21:47 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=lMbJSyaK; 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 d2e1a72fcca58-736a72220edso4479137b3a.3 for ; Sun, 04 May 2025 23:21:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1746426107; x=1747030907; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=S7EpboEoWoOVowL0YyRX4g7rD2NxZ9Suom1WlfNwqQY=; b=lMbJSyaKY7CheJo8zNlwviwtUlLqDK2jgC9hIgN0YOV7O32aSvfV3TOJ/nT0cu8pcl kgw0O20+6u1QtNn4PuAlTIKeSkHyo5/NyN+11dia4S+4UFVeEe5ECqMKYM7a0Q16DC0N +SaP6Ov46FlQ5Dzz09SrHSdTOlSaKzfe5xY7SFHGtiRM5v5vUAg9iazH4WuLjvhShhf4 YrOFUPkxHmFCoWFsDK5TxQXviz1kRNgAJ0iKXbLlNCXD8XIGW6BjzvrPuy7OFilclXeV ZloEtopUTReEgQoKTZirfi6OJ2wSAv3ec/TibMHI6lkW3o0iy7OS9hzljRnlOrT5iEh3 NkEw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746426107; x=1747030907; 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:message-id:reply-to; bh=S7EpboEoWoOVowL0YyRX4g7rD2NxZ9Suom1WlfNwqQY=; b=jnG39Txb3sANWjov8H9GB/UxQzeb4dU//bMSPMSbEf0piZlubqoNGnvnqF/pyL9lQL qwJT9ZkgmbEQWc4/CgOfFSxPf8ks65NkDFxHXOZGd1VX8dKsPU4TxGdImzZW4rMz0/32 gYBxSuA7Sc3qcOCinSqgYaSPYX7nLAaubPwlD8dWTXqd3OhUQujTuuOF1n8+uWZ5H2VE QrLCGLi+GEO66RYxgAFDb0r4lxR9jGHDZM83szg6Fhwu7VlzDH1VwVj+/BFajxeTf9Ym 1M3Pp9su/xSPtJg4nFecQqoEFzJ0Lcrk8yHaDTCJGEjNvgFt+XdpnvwcBDa+0/pbCYj3 uPUw== X-Gm-Message-State: AOJu0YxdirU/FKcDX1W5UGro1QS4Q7Dg+L1u0x10GQ0pldBqgT9zmXjH 5x9NkhBidA4a0OVlZ/f+niEdrzxx5v3C/khgFGtAvth+pQ34DPLKlb/rBLdk X-Gm-Gg: ASbGncsvfEIqKBeSRZBeXLJv5/cCIgLczVhOeXt4jw6CliKtRo3lzhJkNtRGHceIBJF F5Ai+p0SW4/Z0+aBxM3AqUzsVkzfeKdhZQiWztJLlWgVkrYYjKSgW6Cf844Q4jm58A1+mx/i6pD c4izcOBeio0UFw+6rYLTDcxlPwmp3gZ3X03jqhWydSI5QkhpmIvBxKEKRdouEUxY+6c5VRGm+jc RrVynk2yhq8qhA8ZaA1OzSeK3X3J1pH1ko6jX05hxzoPvBN/erhMhx8geXNCP6EuTrpBoT2J0L+ 5gGIKjq55jNLgT7gdpoWWV6YKbVF6Gzup9YqdIUKgF4= X-Google-Smtp-Source: AGHT+IFFCSsqnrOHErT46lHoIhCOxDdM6GdMBUF+VdjWPRINe4MXcVnvPhN/14Qo+zhcp6vEUikflQ== X-Received: by 2002:a05:6a00:ac86:b0:736:3e50:bfec with SMTP id d2e1a72fcca58-7406730af42mr12675627b3a.8.1746426106736; Sun, 04 May 2025 23:21:46 -0700 (PDT) Received: from apollo.localdomain ([2601:646:8201:fd20::5209]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-74058d7b1cdsm5952352b3a.25.2025.05.04.23.21.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 04 May 2025 23:21:46 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Cc: Khem Raj Subject: [meta-oe][PATCH 3/7] renderdoc: Upgrade to 1.38 Date: Sun, 4 May 2025 23:21:38 -0700 Message-ID: <20250505062142.3478500-3-raj.khem@gmail.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250505062142.3478500-1-raj.khem@gmail.com> References: <20250505062142.3478500-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 ; Mon, 05 May 2025 06:21:55 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/117292 License-Upgrade: Copyright year changed Drop the upstream denied patch, its not needed with clang-20 either Signed-off-by: Khem Raj --- ...sor-Reorder-stdio.h-include-location.patch | 43 ------------------- .../{renderdoc_1.33.bb => renderdoc_1.38.bb} | 5 +-- 2 files changed, 2 insertions(+), 46 deletions(-) delete mode 100644 meta-oe/recipes-graphics/renderdoc/renderdoc/0001-jpeg-compressor-Reorder-stdio.h-include-location.patch rename meta-oe/recipes-graphics/renderdoc/{renderdoc_1.33.bb => renderdoc_1.38.bb} (83%) diff --git a/meta-oe/recipes-graphics/renderdoc/renderdoc/0001-jpeg-compressor-Reorder-stdio.h-include-location.patch b/meta-oe/recipes-graphics/renderdoc/renderdoc/0001-jpeg-compressor-Reorder-stdio.h-include-location.patch deleted file mode 100644 index 1c714f84dc..0000000000 --- a/meta-oe/recipes-graphics/renderdoc/renderdoc/0001-jpeg-compressor-Reorder-stdio.h-include-location.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 4eb26927eebebfc4df8789ba69f60f3c28b8ba33 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Tue, 2 Jul 2024 23:36:23 -0700 -Subject: [PATCH] jpeg-compressor: Reorder stdio.h include location - -Current, location ends up with compile errors with clang and glibc 2.40 -fortified headers - -| /mnt/b/yoe/master/build/tmp/work/core2-64-yoe-linux/renderdoc/1.33/recipe-sysroot/usr/include/bits/stdio2.h:128:13: error: use of undeclared identifier '__builtin___vfprintf_chk'; did you mean '__builtin___sprintf_chk'? -| 128 | int __r = __builtin___vfprintf_chk (__stream, __USE_FORTIFY_LEVEL - 1, -| | ^ -| /mnt/b/yoe/master/build/tmp/work/core2-64-yoe-linux/renderdoc/1.33/recipe-sysroot/usr/include/bits/stdio2.h:128:39: error: cannot initialize a parameter of type 'char *' with an lvalue of type 'FILE *const __restrict' (aka 'jpge::_IO_FILE *const __restrict') -| 128 | int __r = __builtin___vfprintf_chk (__stream, __USE_FORTIFY_LEVEL - 1, -| | ^~~~~~~~ - -This re-ordering ensures that fortified function prototypes are used correctly. - -Upstream-Status: Submitted [https://github.com/baldurk/renderdoc/pull/3369] -Signed-off-by: Khem Raj ---- - renderdoc/3rdparty/jpeg-compressor/jpge.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/renderdoc/3rdparty/jpeg-compressor/jpge.cpp b/renderdoc/3rdparty/jpeg-compressor/jpge.cpp -index 74d9d1006..d58e41664 100644 ---- a/renderdoc/3rdparty/jpeg-compressor/jpge.cpp -+++ b/renderdoc/3rdparty/jpeg-compressor/jpge.cpp -@@ -10,6 +10,7 @@ - - #include "jpge.h" - -+#include - #include - #include - -@@ -897,7 +898,6 @@ bool jpeg_encoder::process_scanline(const void* pScanline) - } - - // Higher level wrappers/examples (optional). --#include - - class cfile_stream : public output_stream - { diff --git a/meta-oe/recipes-graphics/renderdoc/renderdoc_1.33.bb b/meta-oe/recipes-graphics/renderdoc/renderdoc_1.38.bb similarity index 83% rename from meta-oe/recipes-graphics/renderdoc/renderdoc_1.33.bb rename to meta-oe/recipes-graphics/renderdoc/renderdoc_1.38.bb index 833845b5a3..8aab26c824 100644 --- a/meta-oe/recipes-graphics/renderdoc/renderdoc_1.33.bb +++ b/meta-oe/recipes-graphics/renderdoc/renderdoc_1.38.bb @@ -2,12 +2,11 @@ SUMMARY = "RenderDoc recipe providing renderdoccmd" DESCRIPTION = "RenderDoc is a frame-capture based graphics debugger" HOMEPAGE = "https://github.com/baldurk/renderdoc" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE.md;md5=5536c2b72eeed14bafaf4d2a6c032b87" +LIC_FILES_CHKSUM = "file://LICENSE.md;md5=963d134bd809d24547253120513346d3" -SRCREV = "cae289323847ce0a84a0deca4958183567eee17e" +SRCREV = "34c3c40787f440da9c2947cd63a41e6c4d1f95b9" SRC_URI = " \ git://github.com/baldurk/${BPN}.git;protocol=https;branch=v1.x \ - file://0001-jpeg-compressor-Reorder-stdio.h-include-location.patch \ " S = "${WORKDIR}/git" From patchwork Mon May 5 06:21:39 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 62428 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 0F0BEC3DA4A for ; Mon, 5 May 2025 06:21:55 +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.web11.44490.1746426108598491336 for ; Sun, 04 May 2025 23:21:48 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=AVNqQuEp; 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 d2e1a72fcca58-736aa9d0f2aso5338123b3a.0 for ; Sun, 04 May 2025 23:21:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1746426108; x=1747030908; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=NBUOs9msIN/oplGMQZRBq/ODuwg3trwgcFTk/Z/HMHg=; b=AVNqQuEp3uQ3CL86S/h4vYjCTeE8GoxLSBIivsydvqxNgkzTxSJqC+hxm5Uh0hXX7f Nk4Wfthtrf/w/4Q4X4ikbb6INpc09CqNIobwrWX5v39h1EsS8jc5s/20qkW8Jcb7a0IK YfS2znNsyyOVE7YKwTzcbCw9PlfGioYCsmRWQ51BP2X4/SrYfAYWRVbnOsVOck5yl47c OfvWp7MYiSeoRMJJJ4b+rcmUa7JdOcWnfc6+36cxzIK6ke9GkHEqsalvYeSgw0hiBMLo R5NHa1l/+ltuJ15vJ5+ehHteT5/Whu+HDNqi5kSQTOPMOy93euOxqu5zc+gywFBCg4lm rFvw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746426108; x=1747030908; 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:message-id:reply-to; bh=NBUOs9msIN/oplGMQZRBq/ODuwg3trwgcFTk/Z/HMHg=; b=iLeOWUtNB8H5eqkLA+eyyH3HY8xH3z52PyeM2K6iF1kiDfYzjzraTeVN0eH8gHPK/U 8BKAXfstzm/urLqwQRw0bSSISi4qQ7LY11/DF3fkxJRje8L2Mm4WAYhe53IXClYAOFfb kYnHGeVE8LT8kNnzczUswNKBud/qOzruDEkBFm31Cwe/4VS7WG6uY550iWQ9Puu+7AlY tj7KUeF/oBXDesPNSkONj3FPQNVquWSe1NrqQGQgNyvFHSfjeKZelHGGTI5qErbBvtlh Y6bQfkH8EvZrgUzPavDnp5U3VvsJfX2MI6Df3BNbS/daqVM/TQh8fvj/3eqAvEPHnDmL Q3SQ== X-Gm-Message-State: AOJu0YzuOUcE0VDMEbNZMBAz1vYBpbPi2rNN/RWdbVjKG3Cgts936UaF 9TGyDaBY8SUIMRuDys75RZMVeYzbyiziV0oOq1cJ3qAiY8NuT/kASPqgi06I X-Gm-Gg: ASbGncvHs1pEoVvbxrq981bnCGRyt1isxaJzvHfNBzYitTjTwOHqeApPjBXPtLayG09 Bg7rWIuDHs24bk98Q5Y/YnsrtG7yC50HsLu9dAyfzRtX0p+fmxtE8G6l0J77uKS2lu8ezV9PFYD //wJQCh7V1ULj0H57oPxto20SWEEmrAXNzPgeOwIk7pdkHJ3mTGoc7XrjO99wjAvlADpbSwTpVf YJJKYqsQQAl0unRymj2uxR5MH38gY30SL5+k41VkiJb82dRvHcsQjrbJoIXFZcIKCUzFK3twKUp Mtb8jRQw6Yb+ik7JDKy8O1Lj2gz/VSRgqxIHqCiexNk= X-Google-Smtp-Source: AGHT+IETwjWNNTBx7Bmbq3oGbOr2djN/XElpjYioyF7gRR4W9hMq66n3ij4EK/S/Az5lan8K6jvkDA== X-Received: by 2002:a05:6a00:ac86:b0:736:3e50:bfec with SMTP id d2e1a72fcca58-7406730af42mr12675678b3a.8.1746426107552; Sun, 04 May 2025 23:21:47 -0700 (PDT) Received: from apollo.localdomain ([2601:646:8201:fd20::5209]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-74058d7b1cdsm5952352b3a.25.2025.05.04.23.21.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 04 May 2025 23:21:47 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Cc: Khem Raj Subject: [meta-oe][PATCH 4/7] geany: Upgrade to 2.0 release Date: Sun, 4 May 2025 23:21:39 -0700 Message-ID: <20250505062142.3478500-4-raj.khem@gmail.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250505062142.3478500-1-raj.khem@gmail.com> References: <20250505062142.3478500-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 ; Mon, 05 May 2025 06:21:55 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/117293 Signed-off-by: Khem Raj --- ...onfigure-Upgrade-to-a-modern-Gettext.patch | 11 +- .../geany/geany/geany-2.0-gcc15.patch | 146 ++++++++++++++++++ .../geany/{geany_1.38.bb => geany_2.0.bb} | 3 +- 3 files changed, 153 insertions(+), 7 deletions(-) create mode 100644 meta-oe/recipes-devtools/geany/geany/geany-2.0-gcc15.patch rename meta-oe/recipes-devtools/geany/{geany_1.38.bb => geany_2.0.bb} (82%) diff --git a/meta-oe/recipes-devtools/geany/geany/0001-configure-Upgrade-to-a-modern-Gettext.patch b/meta-oe/recipes-devtools/geany/geany/0001-configure-Upgrade-to-a-modern-Gettext.patch index b966847195..e6db688974 100644 --- a/meta-oe/recipes-devtools/geany/geany/0001-configure-Upgrade-to-a-modern-Gettext.patch +++ b/meta-oe/recipes-devtools/geany/geany/0001-configure-Upgrade-to-a-modern-Gettext.patch @@ -11,12 +11,11 @@ Signed-off-by: Khem Raj --- a/configure.ac +++ b/configure.ac -@@ -8,7 +8,7 @@ AC_CONFIG_AUX_DIR([build-aux]) - AC_CONFIG_MACRO_DIR([m4]) +@@ -9,6 +9,7 @@ AC_CONFIG_MACRO_DIR([m4]) AM_INIT_AUTOMAKE([1.11 -Wall parallel-tests subdir-objects]) AC_CONFIG_HEADERS([config.h]) -- -+AC_PROG_INTLTOOL - m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])]) - GEANY_PREFIX ++AC_PROG_INTLTOOL + # Silence "AC_LINK_IFELSE before AC_USE_SYSTEM_EXTENSIONS" warnings + # Note: Enables _GNU_SOURCE on Linux + AC_USE_SYSTEM_EXTENSIONS diff --git a/meta-oe/recipes-devtools/geany/geany/geany-2.0-gcc15.patch b/meta-oe/recipes-devtools/geany/geany/geany-2.0-gcc15.patch new file mode 100644 index 0000000000..2886b73d22 --- /dev/null +++ b/meta-oe/recipes-devtools/geany/geany/geany-2.0-gcc15.patch @@ -0,0 +1,146 @@ +Fix build with GCC-15 + +Upstream-Status: Backport [https://sourceforge.net/p/scintilla/code/ci/c7ffad21b23dfad4e8e9f36bb587acc2f6e84fee/] +Signed-off-by: Khem Raj + +--- a/scintilla/gtk/PlatGTK.cxx ++++ b/scintilla/gtk/PlatGTK.cxx +@@ -5,6 +5,7 @@ + + #include + #include ++#include + #include + #include + #include +--- a/scintilla/src/AutoComplete.cxx ++++ b/scintilla/src/AutoComplete.cxx +@@ -7,6 +7,7 @@ + + #include + #include ++#include + #include + #include + #include +--- a/scintilla/src/CallTip.cxx ++++ b/scintilla/src/CallTip.cxx +@@ -7,6 +7,7 @@ + + #include + #include ++#include + #include + #include + #include +--- a/scintilla/src/CellBuffer.cxx ++++ b/scintilla/src/CellBuffer.cxx +@@ -7,6 +7,7 @@ + + #include + #include ++#include + #include + #include + #include +--- a/scintilla/src/ChangeHistory.cxx ++++ b/scintilla/src/ChangeHistory.cxx +@@ -7,6 +7,7 @@ + + #include + #include ++#include + #include + + #include +--- a/scintilla/src/Decoration.cxx ++++ b/scintilla/src/Decoration.cxx +@@ -6,6 +6,7 @@ + + #include + #include ++#include + #include + #include + #include +--- a/scintilla/src/Document.cxx ++++ b/scintilla/src/Document.cxx +@@ -7,6 +7,7 @@ + + #include + #include ++#include + #include + #include + #include +--- a/scintilla/src/Indicator.cxx ++++ b/scintilla/src/Indicator.cxx +@@ -5,6 +5,7 @@ + // Copyright 1998-2001 by Neil Hodgson + // The License.txt file describes the conditions under which this software may be distributed. + ++#include + #include + + #include +--- a/scintilla/src/KeyMap.cxx ++++ b/scintilla/src/KeyMap.cxx +@@ -6,6 +6,7 @@ + // The License.txt file describes the conditions under which this software may be distributed. + + #include ++#include + + #include + #include +--- a/scintilla/src/LineMarker.cxx ++++ b/scintilla/src/LineMarker.cxx +@@ -5,6 +5,7 @@ + // Copyright 1998-2011 by Neil Hodgson + // The License.txt file describes the conditions under which this software may be distributed. + ++#include + #include + #include + +--- a/scintilla/src/PerLine.cxx ++++ b/scintilla/src/PerLine.cxx +@@ -6,6 +6,7 @@ + // The License.txt file describes the conditions under which this software may be distributed. + + #include ++#include + #include + #include + +--- a/scintilla/src/Style.cxx ++++ b/scintilla/src/Style.cxx +@@ -5,6 +5,8 @@ + // Copyright 1998-2001 by Neil Hodgson + // The License.txt file describes the conditions under which this software may be distributed. + ++#include ++ + #include + #include + #include +--- a/scintilla/src/ViewStyle.cxx ++++ b/scintilla/src/ViewStyle.cxx +@@ -6,6 +6,7 @@ + // The License.txt file describes the conditions under which this software may be distributed. + + #include ++#include + #include + #include + #include +--- a/scintilla/src/XPM.cxx ++++ b/scintilla/src/XPM.cxx +@@ -6,6 +6,7 @@ + // The License.txt file describes the conditions under which this software may be distributed. + + #include ++#include + #include + #include + diff --git a/meta-oe/recipes-devtools/geany/geany_1.38.bb b/meta-oe/recipes-devtools/geany/geany_2.0.bb similarity index 82% rename from meta-oe/recipes-devtools/geany/geany_1.38.bb rename to meta-oe/recipes-devtools/geany/geany_2.0.bb index d75e3b57fb..4b51195e08 100644 --- a/meta-oe/recipes-devtools/geany/geany_1.38.bb +++ b/meta-oe/recipes-devtools/geany/geany_2.0.bb @@ -11,8 +11,9 @@ REQUIRED_DISTRO_FEATURES = "x11" SRC_URI = "https://download.geany.org/${BP}.tar.bz2 \ file://0001-configure-Upgrade-to-a-modern-Gettext.patch \ + file://geany-2.0-gcc15.patch \ " -SRC_URI[sha256sum] = "abff176e4d48bea35ee53037c49c82f90b6d4c23e69aed6e4a5ca8ccd3aad546" +SRC_URI[sha256sum] = "565b4cd2f0311c1e3a167ec71c4a32dba642e0fe554ae5bb6b8177b7a74ccc92" FILES:${PN} += "${datadir}/icons" From patchwork Mon May 5 06:21:40 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 62429 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 00487C3ABB9 for ; Mon, 5 May 2025 06:21:54 +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.web10.44203.1746426109525845740 for ; Sun, 04 May 2025 23:21:49 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=J/loIDeM; 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 d2e1a72fcca58-736b98acaadso3676717b3a.1 for ; Sun, 04 May 2025 23:21:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1746426109; x=1747030909; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=J4blmx6sWmEPljFoOyK0K15/g1LtQKLoBxyf0uSV9rU=; b=J/loIDeMNt5GSWEzZiBoCFI6oOUScZY0aOCjzRCTBuiX2bXiwZjtyoR+uD/s+QdCCz dplhYDkExPwLe2xex1c/kfMNuEHe1QwBHoNXBcc389GBYtXqFal4Rz8ghoSF73i1/RWr s9oXCNQFASLnn6KyszKpt088aIF5hJ6rXLMrUqag5iNmmjVh65/jpaBiXdyB9qMu+VwC CHB0GmyiSfD2MSg2N7qt7yRbUc8fq2pRn4wBnFTOI/jHxQ0+9Xkzt5q7eTB85NN6QYic Eb4R6VYG/2We/kKCOVJOLxXc+aYYHcDaOuKLHZxQ6sBMasFaAOnlu0to38oHQ0GwrCCm Irzg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746426109; x=1747030909; 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:message-id:reply-to; bh=J4blmx6sWmEPljFoOyK0K15/g1LtQKLoBxyf0uSV9rU=; b=cFleO1+xizpUhGT8cdtlqrKh3wPxeQHjff7F4QC5tNG0X70ySjN1jGtda/Z+xLkTu1 oYAiMZt9U/iJGHaRJhZTtNAzzM4q1usAzUQuQcjr/FVldVLiqlSb+2+xa76OM1BlvD7Y vVqzj+8eyp9FbVwIL6oMNyRuNgePM/cbhICrOnQocFD9Iim5PjjF7SwalPBIU0Q3IffJ TDTwfuoyxd1n0QmODo1a5L1SXpp0Szt6pePurO1POOgxHDMv4PpY37LECqCpWxGuFAtN qfDYR9KV5KFKf2EKl+bOPGrEzNdwDPJHkkPFpN4iZg8J/DAdnauxPeCEURyrk1gHDsI6 NtpQ== X-Gm-Message-State: AOJu0YzIUQXk4ViE1n4t6FhFPTSsblon4qYiqXeVF+P/O5C8I/1I1AXr KrNKdILkyJhXhjFPLE/LiA8r6A3Xf5fVJoA5FH3mJDce428VV9JAUk7vMyu6 X-Gm-Gg: ASbGncuhCBq8LasrvYsPnbWXGWwPIFtBWe579l695J74rlBoRNSqhsoD9F+sAVhJVi4 0YjkgmuYDEH2F/2MZFOh5o7rcNHKh9ynsLd73ilNeWnnKat/NxZFAV3zI+MJOAOwT4WEG1qiP/3 JACXYrS+/Mj4tojz8mcz1gcHv7iw8sCKuQ42QRk6+d7he3Fdkl1F5rYKeJ7pGAT/kXa50oYGsPf tlfpHTMCqJ2A4mSipLqLaTpamz/ia08EWFOTdPIz/3favfxa/HSpMvI73uHmnnFr/BH2gI5iqvJ nOeuI7HT6KA5ncHABAsmSy8Wf3rcCfOi X-Google-Smtp-Source: AGHT+IEjj7bkeVhkczBVu0FRAh+2eHyGzBXhj7A72hwuMP3c/vmGFTbGqqmiv/lg7Js5rm1ppk0Tyg== X-Received: by 2002:a05:6a21:600e:b0:1f5:8179:4f43 with SMTP id adf61e73a8af0-20e06834e78mr11655260637.23.1746426108610; Sun, 04 May 2025 23:21:48 -0700 (PDT) Received: from apollo.localdomain ([2601:646:8201:fd20::5209]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-74058d7b1cdsm5952352b3a.25.2025.05.04.23.21.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 04 May 2025 23:21:47 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Cc: Khem Raj Subject: [meta-oe][PATCH 5/7] geany-plugins: Upgrade to 2.0 release Date: Sun, 4 May 2025 23:21:40 -0700 Message-ID: <20250505062142.3478500-5-raj.khem@gmail.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250505062142.3478500-1-raj.khem@gmail.com> References: <20250505062142.3478500-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 ; Mon, 05 May 2025 06:21:54 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/117294 Backport build fixed for gcc-15 Signed-off-by: Khem Raj --- ...anizer-fix-invalid-string-comparison.patch | 24 +++++ ...rojectorganizer-fix-various-warnings.patch | 45 ++++++++++ ...-Use-g_pattern_spec_match_string-ins.patch | 89 +++++++++++++++++++ .../geany-plugins-2.0-gcc15.patch | 30 +++++++ ...y-plugins_1.38.bb => geany-plugins_2.0.bb} | 14 ++- 5 files changed, 193 insertions(+), 9 deletions(-) create mode 100644 meta-oe/recipes-devtools/geany/geany-plugins/0001-projectorganizer-fix-invalid-string-comparison.patch create mode 100644 meta-oe/recipes-devtools/geany/geany-plugins/0002-projectorganizer-fix-various-warnings.patch create mode 100644 meta-oe/recipes-devtools/geany/geany-plugins/0003-projectorganizer-Use-g_pattern_spec_match_string-ins.patch create mode 100644 meta-oe/recipes-devtools/geany/geany-plugins/geany-plugins-2.0-gcc15.patch rename meta-oe/recipes-devtools/geany/{geany-plugins_1.38.bb => geany-plugins_2.0.bb} (94%) diff --git a/meta-oe/recipes-devtools/geany/geany-plugins/0001-projectorganizer-fix-invalid-string-comparison.patch b/meta-oe/recipes-devtools/geany/geany-plugins/0001-projectorganizer-fix-invalid-string-comparison.patch new file mode 100644 index 0000000000..5a0650aec1 --- /dev/null +++ b/meta-oe/recipes-devtools/geany/geany-plugins/0001-projectorganizer-fix-invalid-string-comparison.patch @@ -0,0 +1,24 @@ +From 8dfd7f2cba428f5eb232fbbe3427c64171bae0f4 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Ji=C5=99=C3=AD=20Techet?= +Date: Tue, 5 Mar 2024 18:36:37 +0100 +Subject: [PATCH 1/3] projectorganizer: fix invalid string comparison + +Upstream-Status: Backport [https://github.com/geany/geany-plugins/commit/8dfd7f2cba428f5eb232fbbe3427c64171bae0f4] +Signed-off-by: Khem Raj +--- + projectorganizer/src/prjorg-sidebar.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/projectorganizer/src/prjorg-sidebar.c b/projectorganizer/src/prjorg-sidebar.c +index b6422f0..0139473 100644 +--- a/projectorganizer/src/prjorg-sidebar.c ++++ b/projectorganizer/src/prjorg-sidebar.c +@@ -346,7 +346,7 @@ static gchar *get_fallback_dir_of_selection(void) + { + locale_path = g_path_get_dirname(doc->real_path); + +- if (locale_path && locale_path == '.') ++ if (locale_path && *locale_path == '.') + { + g_free(locale_path); + locale_path = NULL; diff --git a/meta-oe/recipes-devtools/geany/geany-plugins/0002-projectorganizer-fix-various-warnings.patch b/meta-oe/recipes-devtools/geany/geany-plugins/0002-projectorganizer-fix-various-warnings.patch new file mode 100644 index 0000000000..c70f4d6e15 --- /dev/null +++ b/meta-oe/recipes-devtools/geany/geany-plugins/0002-projectorganizer-fix-various-warnings.patch @@ -0,0 +1,45 @@ +From 58d47e60bdcec62fe74b4a38eaf39d16a9c80d42 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Ji=C5=99=C3=AD=20Techet?= +Date: Tue, 5 Mar 2024 18:40:10 +0100 +Subject: [PATCH 2/3] projectorganizer: fix various warnings + +Upstream-Status: Backport [https://github.com/geany/geany-plugins/commit/58d47e60bdcec62fe74b4a38eaf39d16a9c80d42] +Signed-off-by: Khem Raj +--- + projectorganizer/src/prjorg-sidebar.c | 9 +++------ + 1 file changed, 3 insertions(+), 6 deletions(-) + +diff --git a/projectorganizer/src/prjorg-sidebar.c b/projectorganizer/src/prjorg-sidebar.c +index 0139473..e67cce2 100644 +--- a/projectorganizer/src/prjorg-sidebar.c ++++ b/projectorganizer/src/prjorg-sidebar.c +@@ -382,7 +382,8 @@ void on_open_file_manager(G_GNUC_UNUSED GtkMenuItem * menuitem, G_GNUC_UNUSED gp + + if (locale_path) + { +- gchar *command, *open_command; ++ const gchar *open_command; ++ gchar *command; + + open_command = PRJORG_COMMAND_OPEN; + command = g_strconcat (open_command, " \"", locale_path, "\"", NULL); +@@ -1562,7 +1563,7 @@ gchar **prjorg_sidebar_get_expanded_paths(void) + (GtkTreeViewMappingFunc)on_map_expanded, expanded_paths); + g_ptr_array_add(expanded_paths, NULL); + +- return g_ptr_array_free(expanded_paths, FALSE); ++ return (gchar **)g_ptr_array_free(expanded_paths, FALSE); + } + + +@@ -1587,10 +1588,6 @@ void prjorg_sidebar_update_full(gboolean reload, gchar **expanded_paths) + + if (reload) + { +- GtkTreeSelection *treesel; +- GtkTreeIter iter; +- GtkTreeModel *model; +- + expand_data->expanded_paths = expanded_paths != NULL ? expanded_paths : prjorg_sidebar_get_expanded_paths(); + expand_data->selected_path = get_selected_path(); + diff --git a/meta-oe/recipes-devtools/geany/geany-plugins/0003-projectorganizer-Use-g_pattern_spec_match_string-ins.patch b/meta-oe/recipes-devtools/geany/geany-plugins/0003-projectorganizer-Use-g_pattern_spec_match_string-ins.patch new file mode 100644 index 0000000000..4c4e11c6cd --- /dev/null +++ b/meta-oe/recipes-devtools/geany/geany-plugins/0003-projectorganizer-Use-g_pattern_spec_match_string-ins.patch @@ -0,0 +1,89 @@ +From a4a7c4af7f62eb55c0bd100ed1d308e6512a66ce Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Ji=C5=99=C3=AD=20Techet?= +Date: Tue, 23 Apr 2024 18:43:51 +0200 +Subject: [PATCH 3/3] projectorganizer: Use g_pattern_spec_match_string() instead of g_pattern_match_string() + +Eliminates a warning on newer glib versions. Adds a fallback on older versions. + +Upstream-Status: Backport [https://github.com/geany/geany-plugins/commit/a4a7c4af7f62eb55c0bd100ed1d308e6512a66ce] +Signed-off-by: Khem Raj +--- + projectorganizer/src/prjorg-project.c | 2 +- + projectorganizer/src/prjorg-sidebar.c | 4 ++-- + projectorganizer/src/prjorg-utils.c | 4 ++-- + projectorganizer/src/prjorg-utils.h | 5 +++++ + 4 files changed, 10 insertions(+), 5 deletions(-) + +diff --git a/projectorganizer/src/prjorg-project.c b/projectorganizer/src/prjorg-project.c +index a767ab8..71dc6e1 100644 +--- a/projectorganizer/src/prjorg-project.c ++++ b/projectorganizer/src/prjorg-project.c +@@ -216,7 +216,7 @@ static gboolean match_basename(gconstpointer pft, gconstpointer user_data) + { + GPatternSpec *pattern = g_pattern_spec_new(ft->pattern[j]); + +- if (g_pattern_match_string(pattern, utf8_base_filename)) ++ if (g_pattern_spec_match_string(pattern, utf8_base_filename)) + { + ret = TRUE; + g_pattern_spec_free(pattern); +diff --git a/projectorganizer/src/prjorg-sidebar.c b/projectorganizer/src/prjorg-sidebar.c +index e67cce2..b7536ee 100644 +--- a/projectorganizer/src/prjorg-sidebar.c ++++ b/projectorganizer/src/prjorg-sidebar.c +@@ -657,7 +657,7 @@ static void find_file_recursive(GtkTreeIter *iter, gboolean case_sensitive, gboo + if (!case_sensitive) + SETPTR(utf8_name, g_utf8_strdown(utf8_name, -1)); + +- if (g_pattern_match_string(pattern, utf8_name)) ++ if (g_pattern_spec_match_string(pattern, utf8_name)) + { + gchar *utf8_base_path = get_project_base_path(); + gchar *utf8_path, *rel_path; +@@ -840,7 +840,7 @@ static gboolean match(TMTag *tag, const gchar *name, gboolean declaration, gbool + matches = g_strcmp0(name_case, name) == 0; + break; + case MATCH_PATTERN: +- matches = g_pattern_match_string(pspec, name_case); ++ matches = g_pattern_spec_match_string(pspec, name_case); + break; + case MATCH_PREFIX: + matches = g_str_has_prefix(name_case, name); +diff --git a/projectorganizer/src/prjorg-utils.c b/projectorganizer/src/prjorg-utils.c +index 2a8847e..0b573e5 100644 +--- a/projectorganizer/src/prjorg-utils.c ++++ b/projectorganizer/src/prjorg-utils.c +@@ -80,7 +80,7 @@ gboolean patterns_match(GSList *patterns, const gchar *str) + foreach_slist (elem, patterns) + { + GPatternSpec *pattern = elem->data; +- if (g_pattern_match_string(pattern, str)) ++ if (g_pattern_spec_match_string(pattern, str)) + return TRUE; + } + return FALSE; +@@ -269,7 +269,7 @@ gchar *try_find_header_source(gchar *utf8_file_name, gboolean is_header, GSList + full_name = elem->data; + gchar *base_name = g_path_get_basename(full_name); + +- if (g_pattern_match_string(pattern, base_name)) ++ if (g_pattern_spec_match_string(pattern, base_name)) + { + if ((is_header && patterns_match(source_patterns, base_name)) || + (!is_header && patterns_match(header_patterns, base_name))) +diff --git a/projectorganizer/src/prjorg-utils.h b/projectorganizer/src/prjorg-utils.h +index c3719a9..50ed123 100644 +--- a/projectorganizer/src/prjorg-utils.h ++++ b/projectorganizer/src/prjorg-utils.h +@@ -19,6 +19,11 @@ + #ifndef __PRJORG_UTILS_H__ + #define __PRJORG_UTILS_H__ + ++ ++ #if ! GLIB_CHECK_VERSION(2, 70, 0) ++ # define g_pattern_spec_match_string g_pattern_match_string ++ #endif ++ + gchar *get_relative_path(const gchar *utf8_parent, const gchar *utf8_descendant); + + gboolean patterns_match(GSList *patterns, const gchar *str); diff --git a/meta-oe/recipes-devtools/geany/geany-plugins/geany-plugins-2.0-gcc15.patch b/meta-oe/recipes-devtools/geany/geany-plugins/geany-plugins-2.0-gcc15.patch new file mode 100644 index 0000000000..563416bf92 --- /dev/null +++ b/meta-oe/recipes-devtools/geany/geany-plugins/geany-plugins-2.0-gcc15.patch @@ -0,0 +1,30 @@ +Fix build with GCC-15 + +Upstream-Status: Backport [https://github.com/geany/geany-plugins/pull/1389] +Signed-off-by: Khem Raj +--- a/git-changebar/src/gcb-plugin.c ++++ b/git-changebar/src/gcb-plugin.c +@@ -1410,9 +1410,9 @@ read_setting_boolean (GKeyFile *kf, + const gchar *key, + gpointer value) + { +- gboolean *bool = value; ++ gboolean *boolean = value; + +- *bool = utils_get_setting_boolean (kf, group, key, *bool); ++ *boolean = utils_get_setting_boolean (kf, group, key, *boolean); + } + + static void +@@ -1421,9 +1421,9 @@ write_setting_boolean (GKeyFile *kf, + const gchar *key, + gconstpointer value) + { +- const gboolean *bool = value; ++ const gboolean *boolean = value; + +- g_key_file_set_boolean (kf, group, key, *bool); ++ g_key_file_set_boolean (kf, group, key, *boolean); + } + + /* loads @filename in @kf and return %FALSE if failed, emitting a warning diff --git a/meta-oe/recipes-devtools/geany/geany-plugins_1.38.bb b/meta-oe/recipes-devtools/geany/geany-plugins_2.0.bb similarity index 94% rename from meta-oe/recipes-devtools/geany/geany-plugins_1.38.bb rename to meta-oe/recipes-devtools/geany/geany-plugins_2.0.bb index 1ed2993bf0..bd10c09195 100644 --- a/meta-oe/recipes-devtools/geany/geany-plugins_1.38.bb +++ b/meta-oe/recipes-devtools/geany/geany-plugins_2.0.bb @@ -30,12 +30,12 @@ REQUIRED_DISTRO_FEATURES = "x11" SRC_URI = " \ https://plugins.geany.org/${BPN}/${BP}.tar.bz2 \ - 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 \ + file://geany-plugins-2.0-gcc15.patch \ + file://0001-projectorganizer-fix-invalid-string-comparison.patch \ + file://0002-projectorganizer-fix-various-warnings.patch \ + file://0003-projectorganizer-Use-g_pattern_spec_match_string-ins.patch \ " -SRC_URI[sha256sum] = "1c578a7ebb390aa8882f195acd3d8da3ceb73925d291b28dec90cd3e5fd20586" +SRC_URI[sha256sum] = "9fc2ec5c99a74678fb9e8cdfbd245d3e2061a448d70fd110a6aefb62dd514705" do_configure:prepend() { rm -f ${S}/build/cache/glib-gettext.m4 @@ -75,8 +75,6 @@ PLUGINS += "${PN}-defineformat" LIC_FILES_CHKSUM += "file://defineformat/COPYING;md5=751419260aa954499f7abaabaa882bbe" FILES:${PN}-defineformat = "${libdir}/geany/defineformat.so" -# no gnome devhelp in some common layer -EXTRA_OECONF += "--disable-devhelp" #PLUGINS += "${PN}-devhelp" #LIC_FILES_CHKSUM += "file://devhelp/COPYING;md5=d32239bcb673463ab874e80d47fae504" #LICENSE:${PN}-devhelp = "GPLv3" @@ -165,8 +163,6 @@ EXTRA_OECONF += "--disable-peg-markdown" #LIC_FILES_CHKSUM += "file://markdown/COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" #FILES:${PN}-markdown = "${libdir}/geany/markdown.so" -# | checking whether the GTK version in use is compatible with plugin multiterm... no -EXTRA_OECONF += "--disable-multiterm" #PLUGINS += "${PN}-multiterm" #LIC_FILES_CHKSUM += "file://multiterm/COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" #FILES:${PN}-multiterm = "${libdir}/geany/multiterm.so" From patchwork Mon May 5 06:21:41 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 62424 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 F3705C3ABB8 for ; Mon, 5 May 2025 06:21:54 +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.44491.1746426110363323114 for ; Sun, 04 May 2025 23:21:50 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=er5fuRNr; 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 d2e1a72fcca58-736a72220edso4479165b3a.3 for ; Sun, 04 May 2025 23:21:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1746426109; x=1747030909; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=JassYEXDa5PSD+6qDm2WldNRMkonsBR+x35oLrZF/74=; b=er5fuRNrLQPgla8F5iLQNuzP/NsfNDbymBv16LQ00N0HZvR2o1xdrlvIi6Uj9btncY 23IXa1ZGFh/x5SZKjcVYNE9mRlziR5ForGkxRESj0S4DoMmdfnzM2qa+1D43mP7k+rUm uBkMoukLKrdXMs7GrJ+FGMm4Q7onTS4v0q9JvbuWqhUyCByzp1V/FiU9xinMfF5sqttd IKdlz8Mo8F+X55QWS+MtvLZxuJdeR73KKnstjeFQtw1nNpUMa0y2AlP+f0/672XnpaCc QBckoahVz9zvmwuIVUWVQjYnLkTxFnnXtT6M+IG2TG+59TiDDUplXzGsRPVLrJuzLsV9 sNsQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746426109; x=1747030909; 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:message-id:reply-to; bh=JassYEXDa5PSD+6qDm2WldNRMkonsBR+x35oLrZF/74=; b=hjxS8Lq2oCtNM589G7wXa7on5hdi9F2NHrS73Tb1KaxErfUkeMh0MgLc0otlN+xTbK 0b89ItdcQo5uNXwVFafr55RoIUYsPyiz110VEiU7AD59aFbcDnptcAZyi1+Rd7+87LNQ Ca9lzjMgVetvLBjU+SZiZxZIvFyGXgYYhIV4UqWYdiKEwTogkGHEeUk84xziBr+PKeH3 q5BJ7OCDRXTHmb7PUeGPw5hVopqosSNyq6c22z/lMB0rA+9NTx3g8q4YDjQprOyZI5CB OR+2vucB3murbeTSQfXJ8UZRm8hcJjjN7eMP9NQxgWHuM8o5cGFC/6cz62BvNLvQv8cs eG/w== X-Gm-Message-State: AOJu0Yxww3236Bagm+j/KjXERD4IvTa3xZbAUfl8kCEnAFzwFBf9Wprh KlZEz7lWTXbPCPcxxVpWG6PKieUXYkUu6CHeTOVdZRwMjva3/TZj0f6HSG5r X-Gm-Gg: ASbGncvB2vbr0FMYVnl5q4hLQh8AYk/7xpvlt1IebnSTxIHrE0cUXRRc15nX6dIQQvC YjYqXAE4wo32QA7j4XFKoVUW6arSZiy67FeQkK5zofzqws3nA+dDI/zDBPpVpJX6TNTbk6JUFaL 7dwbRnTpXS3l7ZN6laukMI8V63XTMK9ARfynrmGegsSl6ThtZSxWlF1XX/mpCbWQkESd6fjHn6A BKV4e7+YcEygybxPdnjt3WZhqMDUSRJwo4nXAVwSvBKZu7Ni/lp8URkOj64ckYB0SKX8nD9LxWC 0ywY115t2wKkYJKqI6FGmHzykHdCY6ID X-Google-Smtp-Source: AGHT+IGuULc3mDAaukBiqUgqbXv9+V24nSf0sFILHIB7ACLdk5oxx5Oz0QTBGrWAwI3DNOyPfNNgjw== X-Received: by 2002:a05:6a00:4409:b0:73b:71a9:a5ad with SMTP id d2e1a72fcca58-740673faa0bmr11005793b3a.16.1746426109537; Sun, 04 May 2025 23:21:49 -0700 (PDT) Received: from apollo.localdomain ([2601:646:8201:fd20::5209]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-74058d7b1cdsm5952352b3a.25.2025.05.04.23.21.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 04 May 2025 23:21:49 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Cc: Khem Raj Subject: [meta-python][PATCH 6/7] python3-icu: Fix build with GCC-15 Date: Sun, 4 May 2025 23:21:41 -0700 Message-ID: <20250505062142.3478500-6-raj.khem@gmail.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250505062142.3478500-1-raj.khem@gmail.com> References: <20250505062142.3478500-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 ; Mon, 05 May 2025 06:21:54 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/117295 drop is_trivial check Fixes | In file included from bases.cpp:32: | arg.h:856:37: error: static assertion failed | 856 | static_assert(std::is_trivial::value); \ | | ~~~~~~~~~~~~~~~~~~~~^~~~~ | arg.h:859:1: note: in expansion of macro '_IS_POD' | 859 | _IS_POD(AnyPythonObject); | | ^~~~~~~ Signed-off-by: Khem Raj --- ...ove-assert-checking-for-trivial-type.patch | 26 +++++++++++++++++++ .../python/python3-icu_2.15.2.bb | 3 ++- 2 files changed, 28 insertions(+), 1 deletion(-) create mode 100644 meta-python/recipes-devtools/python/python3-icu/0001-Remove-assert-checking-for-trivial-type.patch diff --git a/meta-python/recipes-devtools/python/python3-icu/0001-Remove-assert-checking-for-trivial-type.patch b/meta-python/recipes-devtools/python/python3-icu/0001-Remove-assert-checking-for-trivial-type.patch new file mode 100644 index 0000000000..4c75eb5f7b --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-icu/0001-Remove-assert-checking-for-trivial-type.patch @@ -0,0 +1,26 @@ +From 3d58fb48bb1cef2177aab8e291167638993495f4 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Sat, 3 May 2025 21:27:34 -0700 +Subject: [PATCH] Remove assert checking for trivial type + +This fails with GCC-15, is_trivial is deprecated in C++26 + +Upstream-Status: Pending + +Signed-off-by: Khem Raj +--- + arg.h | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/arg.h b/arg.h +index a493d11..6cb232d 100644 +--- a/arg.h ++++ b/arg.h +@@ -853,7 +853,6 @@ public: + }; + + #define _IS_POD(T) \ +- static_assert(std::is_trivial::value); \ + static_assert(std::is_standard_layout::value) + + _IS_POD(AnyPythonObject); diff --git a/meta-python/recipes-devtools/python/python3-icu_2.15.2.bb b/meta-python/recipes-devtools/python/python3-icu_2.15.2.bb index 77013330d8..d265a20975 100644 --- a/meta-python/recipes-devtools/python/python3-icu_2.15.2.bb +++ b/meta-python/recipes-devtools/python/python3-icu_2.15.2.bb @@ -12,7 +12,8 @@ UPSTREAM_CHECK_PYPI_PACKAGE = "${PYPI_PACKAGE}" SRC_URI[sha256sum] = "561e77eedff17cec6839f26211f7a5ce3c071b776e8a0ec9d1207f46cbce598f" -SRC_URI += "file://0001-Fix-host-contamination-of-include-files.patch" +SRC_URI += "file://0001-Fix-host-contamination-of-include-files.patch \ + file://0001-Remove-assert-checking-for-trivial-type.patch" inherit pkgconfig pypi python_setuptools_build_meta From patchwork Mon May 5 06:21:42 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 62425 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 E5F44C369C2 for ; Mon, 5 May 2025 06:21:54 +0000 (UTC) Received: from mail-pf1-f172.google.com (mail-pf1-f172.google.com [209.85.210.172]) by mx.groups.io with SMTP id smtpd.web10.44204.1746426111269713895 for ; Sun, 04 May 2025 23:21:51 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=DOw8BpLy; spf=pass (domain: gmail.com, ip: 209.85.210.172, mailfrom: raj.khem@gmail.com) Received: by mail-pf1-f172.google.com with SMTP id d2e1a72fcca58-7398d65476eso3155177b3a.1 for ; Sun, 04 May 2025 23:21:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1746426110; x=1747030910; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=EOrNLcf7+1zBj1ANNlI+E5GZwhA8DZ7VjBNYUt15WEA=; b=DOw8BpLyjkQQgDYTE6W3PAyaplDgYCb4yuBPkvuRNfslHIozPxoF08uvS81CHRZ78z JCV1d9ph0uHSY5RpjIqcBeklXW/T3BXo8FgCUVGo0exdxbElbUCaqFi0g9NYrkxpy4Na /G/NwbL+yAMW20Cw6QN+w2D1SZOGvwsWfvxXk50k3iG7N1o5pFuwu7pbNNt4hbwPiIGb zCR7yTmZ2Vsne7mu13/hUxs3kDarrdoDwcXSB0485O/Viwfp4qCCfnAg+TyCVokFHm/E gwuZnquK2FBNu/TMgdPKmqZdfoO4NUx5Xvz2ALl6tvv6h6uWMnI0gMkX6yG7mQyXofS3 2q6g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746426110; x=1747030910; 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:message-id:reply-to; bh=EOrNLcf7+1zBj1ANNlI+E5GZwhA8DZ7VjBNYUt15WEA=; b=Cgjn2RMoneti7b6P2gB/0PCDFieQlPOdncJLCe7Txao5fNQ1EeobcGDAh+FyXNhrva u1lXvqaB81Fw56o1LbTaDugIhDgUPeuu05y0MXO/TrK7fFMGxWmcdbzfthViUD60B5kc ++dbNe92LDCmcpsM0ckCWtmLEMJNH9KBs7WuzjxiNWS+kuCt6zZy8oWZScoT0WKzinPK /vYrcud+GoYPkFTiRObquyFQltw/5hSaSx/uLgUM85uJBUY3vV45dTIGOpO7EiifLwXr c//2utyvkJnBA+rfxF06FJ8iBSwlURK/UPxD9XpjCPS7HIgwdC86jFElpS8vWHGR27s/ PnAA== X-Gm-Message-State: AOJu0Yzym+lS080hKcBeET8nBV5lJ8cFIc7bosRzyZgkp+DVH3bhpiKT OMMnVwV2lnYmtIYMsP3zat4vG81HTm++INXpxKrC52ZCOJdqeQ8oMUsBhI65 X-Gm-Gg: ASbGncvVeFkgF5p14BaQArfGFeEW3Uz+IiRcJNjHk9I3CjJbBU1OmfFZ1t4hEYwWa/K jas2RYQlzD/PwHEwJ1SXtI6EGOFzBEfzLeuhDr/8sm9QLXG/e5PgaXt6PfIEuh7al742LDOzVaK AzTag8OLF9iKK5vhKwAZF/ADq0l33aOCZ11UtdnUZmgKebzFj2rbOUv6HW1uvojdd7PSYrDezpc 9DDpiZP3s/4z+6q0oubC7soWCOlQ079AwCLIYmXs+xg6nTxD3gpGrfCHtO47eBmKept83ak84Wi c6bQoMWyBwNnKWUwDaGWV1IvkD5hYk89 X-Google-Smtp-Source: AGHT+IHohpl+JPorJWq65CY5LXCshTXgJ2eVXfEjtn/yuULAIXJpX9yDweY7z3pMBDREPSTdnsBcYg== X-Received: by 2002:aa7:8542:0:b0:727:39a4:30cc with SMTP id d2e1a72fcca58-7404917164dmr19142344b3a.1.1746426110358; Sun, 04 May 2025 23:21:50 -0700 (PDT) Received: from apollo.localdomain ([2601:646:8201:fd20::5209]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-74058d7b1cdsm5952352b3a.25.2025.05.04.23.21.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 04 May 2025 23:21:49 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Cc: Khem Raj Subject: [meta-oe][PATCH 7/7] pcp: Upgrade to 6.3.7 release Date: Sun, 4 May 2025 23:21:42 -0700 Message-ID: <20250505062142.3478500-7-raj.khem@gmail.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250505062142.3478500-1-raj.khem@gmail.com> References: <20250505062142.3478500-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 ; Mon, 05 May 2025 06:21:54 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/117296 * Fix packaging scripts needing bash separately * Fix packaging QA errors about staticlibs and dev-so * Add a patch to use native pmcpp during target build Signed-off-by: Khem Raj --- ...cp-native_6.0.5.bb => pcp-native_6.3.7.bb} | 3 +- meta-oe/recipes-support/pcp/pcp.inc | 6 ++-- ...1-bind2-Use-pmcpp-from-native-builds.patch | 30 ++++++++++++++++ ...ndency-order-of-header-and-sourcefil.patch | 11 ++---- .../pcp/{pcp_6.0.5.bb => pcp_6.3.7.bb} | 36 ++++++++++++++----- 5 files changed, 65 insertions(+), 21 deletions(-) rename meta-oe/recipes-support/pcp/{pcp-native_6.0.5.bb => pcp-native_6.3.7.bb} (93%) create mode 100644 meta-oe/recipes-support/pcp/pcp/0001-bind2-Use-pmcpp-from-native-builds.patch rename meta-oe/recipes-support/pcp/{pcp_6.0.5.bb => pcp_6.3.7.bb} (89%) diff --git a/meta-oe/recipes-support/pcp/pcp-native_6.0.5.bb b/meta-oe/recipes-support/pcp/pcp-native_6.3.7.bb similarity index 93% rename from meta-oe/recipes-support/pcp/pcp-native_6.0.5.bb rename to meta-oe/recipes-support/pcp/pcp-native_6.3.7.bb index 2f37b099b4..806ef668e2 100644 --- a/meta-oe/recipes-support/pcp/pcp-native_6.0.5.bb +++ b/meta-oe/recipes-support/pcp/pcp-native_6.3.7.bb @@ -44,5 +44,6 @@ do_install () { PCP_LIBADM_DIR=${D}/${libdir} \ PCP_LIB_DIR=${D}/${libdir} \ PCP_MAN_DIR=${D}/${mandir} \ - PCP_DOC_DIR=${D}/${docdir} + PCP_DOC_DIR=${D}/${docdir} \ + PCP_SYSTEMDUNIT_DIR=${D}${systemd_system_unitdir} } diff --git a/meta-oe/recipes-support/pcp/pcp.inc b/meta-oe/recipes-support/pcp/pcp.inc index 5ed2d220f0..4ab4f5502f 100644 --- a/meta-oe/recipes-support/pcp/pcp.inc +++ b/meta-oe/recipes-support/pcp/pcp.inc @@ -7,13 +7,13 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=37ab75b580d5aad4ada04260efa3702f \ " COMPATIBLE_HOST:libc-musl = "null" -SRC_URI = "git://github.com/performancecopilot/pcp;branch=main;protocol=https \ +SRC_URI = "git://github.com/performancecopilot/pcp;branch=stable;protocol=https \ file://0001-configure-Limit-the-header-search-to-sysroot.patch \ file://0001-htop-Change-dependency-order-of-header-and-sourcefil.patch \ file://config.linux \ " -SRCREV = "c13558fd0df54438cbb87cf303dc279cb58816c2" +SRCREV = "d8d97b79ee47d9dfb076a3242564ed3cae04eba9" S = "${WORKDIR}/git" @@ -39,5 +39,3 @@ EXTRA_OECONF:append = "\ PACKAGECONFIG[qt5] = "--with-qt=yes --with-qt3d=yes,--with-qt=no --with-qt3d=no,qtbase qt3d" PACKAGECONFIG ?= "" - -PARALLEL_MAKE = "" diff --git a/meta-oe/recipes-support/pcp/pcp/0001-bind2-Use-pmcpp-from-native-builds.patch b/meta-oe/recipes-support/pcp/pcp/0001-bind2-Use-pmcpp-from-native-builds.patch new file mode 100644 index 0000000000..32b9252542 --- /dev/null +++ b/meta-oe/recipes-support/pcp/pcp/0001-bind2-Use-pmcpp-from-native-builds.patch @@ -0,0 +1,30 @@ +From 4c79ea13b8456155e1acd6a53a2586b6c2c32e05 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Sat, 3 May 2025 14:27:30 -0700 +Subject: [PATCH] bind2: Use pmcpp from native builds + +This is needed for cross compiling. Fixes +| ./mk.rewrite +| ./mk.rewrite: line 41: ../../pmcpp/pmcpp.static: No such file or directory +| Error: pmcpp failed +| make[3]: *** [GNUmakefile:54: rewrite.conf] Error 1 + +Upstream-Status: Inappropriate [Cross-compiling specific] +Signed-off-by: Khem Raj +--- + src/pmdas/bind2/mk.rewrite | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/pmdas/bind2/mk.rewrite b/src/pmdas/bind2/mk.rewrite +index 36e8dc1e61..142a75a824 100755 +--- a/src/pmdas/bind2/mk.rewrite ++++ b/src/pmdas/bind2/mk.rewrite +@@ -38,7 +38,7 @@ inlist == 1 { print }' \ + -e 's/[ ][ ]*\([0-9][0-9]*\)/ { pmid -> BIND2.0.\1 }/' \ + ) >$tmp.tmp + +-if PCP_CONF=../../include/pcp.conf ../../pmcpp/pmcpp.static -P <$tmp.tmp >>rewrite.conf ++if PCP_CONF=../../include/pcp.conf pmcpp -P <$tmp.tmp >>rewrite.conf + then + : + else diff --git a/meta-oe/recipes-support/pcp/pcp/0001-htop-Change-dependency-order-of-header-and-sourcefil.patch b/meta-oe/recipes-support/pcp/pcp/0001-htop-Change-dependency-order-of-header-and-sourcefil.patch index 009dfe2d04..2915d48f04 100644 --- a/meta-oe/recipes-support/pcp/pcp/0001-htop-Change-dependency-order-of-header-and-sourcefil.patch +++ b/meta-oe/recipes-support/pcp/pcp/0001-htop-Change-dependency-order-of-header-and-sourcefil.patch @@ -16,14 +16,12 @@ Signed-off-by: Khem Raj src/pcp/htop/GNUmakefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -diff --git a/src/pcp/htop/GNUmakefile b/src/pcp/htop/GNUmakefile -index 6b7c0c5..5153c63 100644 --- a/src/pcp/htop/GNUmakefile +++ b/src/pcp/htop/GNUmakefile -@@ -186,8 +186,8 @@ CFGMETERS = $(patsubst %,pcp/meters/%,$(METERS)) - CFGCOLUMNS = $(patsubst %,pcp/columns/%,$(COLUMNS)) +@@ -210,8 +210,8 @@ CFGCOLUMNS = $(patsubst %,pcp/columns/%, + CFGSCREENS = $(patsubst %,pcp/screens/%,$(SCREENS)) - CFGXFILES = $(CFGMETERS) $(CFGCOLUMNS) + CFGXFILES = $(CFGMETERS) $(CFGCOLUMNS) $(CFGSCREENS) -TOPXFILES = $(TOPCFILES) $(TOPHFILES) $(DOCFILES) -SUBXFILES = $(SUBCFILES) $(SUBHFILES) +TOPXFILES = $(TOPHFILES) $(TOPCFILES) $(DOCFILES) @@ -31,6 +29,3 @@ index 6b7c0c5..5153c63 100644 CFILES = $(TOPCFILES) $(SUBCFILES) HFILES = $(TOPHFILES) $(SUBHFILES) LDIRT = $(TOPXFILES) $(SUBXFILES) $(CFGXFILES) \ --- -2.41.0 - diff --git a/meta-oe/recipes-support/pcp/pcp_6.0.5.bb b/meta-oe/recipes-support/pcp/pcp_6.3.7.bb similarity index 89% rename from meta-oe/recipes-support/pcp/pcp_6.0.5.bb rename to meta-oe/recipes-support/pcp/pcp_6.3.7.bb index ce8957714e..c390b9eec2 100644 --- a/meta-oe/recipes-support/pcp/pcp_6.0.5.bb +++ b/meta-oe/recipes-support/pcp/pcp_6.3.7.bb @@ -13,12 +13,16 @@ DEPENDS += "perl-native bison-native flex-native python3-native python3-setuptoo SRC_URI += "file://0001-Remove-unsuitble-part-for-cross-compile.patch \ file://pass-options-to-AR.patch \ file://fix_parallel_make.patch \ + file://0001-bind2-Use-pmcpp-from-native-builds.patch \ " export PCP_DIR = "${RECIPE_SYSROOT_NATIVE}" #export PCP_RUN_DIR = "${RECIPE_SYSROOT_NATIVE}" -EXTRA_OEMAKE = "CC="${CC}" LD="${LD}"" -inherit useradd systemd features_check python3targetconfig +EXTRA_OEMAKE = '\ + CC="${CC}" LD="${LD}" CROSS_COMPILING="yes" \ + PCP_SYSTEMDUNIT_DIR=${systemd_system_unitdir} \ +' +inherit useradd systemd features_check python3targetconfig gtk-icon-cache # Needs libx11 REQUIRED_DISTRO_FEATURES = "x11" @@ -48,6 +52,7 @@ USERADD_PARAM:${PN}-testsuite = "--system --home ${localstatedir}/lib/pcp/testsu --user-group pcpqa" RDEPENDS:${PN} += "perl" +RDEPENDS:${PN}-xsos += "${PN} bash" RDEPENDS:${PN}-testsuite += "${PN} bash perl" RDEPENDS:python3-${PN} += "${PN} python3" @@ -69,6 +74,7 @@ do_compile:prepend() { ${S}/src/include/builddefs sed -i -e "s,TOPDIR)/python3-pcp.list,TOPDIR)/python3-pcp.list --install-lib=${PYTHON_SITEPACKAGES_DIR},g" ${S}/src/python/GNUmakefile export PYTHON=python3 + export PATH=${PATH}:${RECIPE_SYSROOT_NATIVE}${libexecdir}/pcp/bin #export PYTHON3=${STAGING_BINDIR_NATIVE}/python3-native/python3 } @@ -85,10 +91,6 @@ do_install () { rm -rf ${D}${localstatedir}/lib/pcp/pmcd rm -rf ${D}${localstatedir}/lib/pcp/tmp rm -rf ${D}${localstatedir}/run - mv ${D}${docdir}/C* ${D}${docdir}/pcp-doc/ - mv ${D}${docdir}/I* ${D}${docdir}/pcp-doc/ - mv ${D}${docdir}/R* ${D}${docdir}/pcp-doc/ - mv ${D}${docdir}/V* ${D}${docdir}/pcp-doc/ sed -i "s#PCP_AWK_PROG=.*#PCP_AWK_PROG=awk#" ${D}/${sysconfdir}/pcp.conf sed -i "s#PCP_SORT_PROG=.*#PCP_SORT_PROG=sort#" ${D}/${sysconfdir}/pcp.conf sed -i "s#PCP_ECHO_PROG=.*#PCP_ECHO_PROG=echo#" ${D}/${sysconfdir}/pcp.conf @@ -99,7 +101,8 @@ do_install () { -e 's#${TMPDIR}##g' ${D}${includedir}/pcp/builddefs } -PACKAGES += " ${PN}-export-zabbix-agent ${PN}-testsuite \ +PACKAGE_BEFORE_PN = "${PN}-xsos" +PACKAGES =+ " ${PN}-export-zabbix-agent ${PN}-testsuite \ libpcp-gui2 libpcp-gui2-dev \ libpcp-import1 libpcp-archive1 \ libpcp-mmv1 libpcp-mmv1-dev \ @@ -109,7 +112,7 @@ PACKAGES += " ${PN}-export-zabbix-agent ${PN}-testsuite \ libpcp3 libpcp3-dev python3-${PN}\ " FILES:libpcp-gui2 = "${libdir}/libpcp_gui.so.2 \ -" +" FILES:libpcp-archive1 = "${libdir}/libpcp_archive.so.1 \ " FILES:libpcp-gui2-dev = " \ @@ -118,6 +121,8 @@ FILES:libpcp-gui2-dev = " \ ${includedir}/pmafm.h \ ${includedir}/pmtime.h \ " +INSANE_SKIP:libpcp-gui2-dev = "staticdev" + FILES:libpcp-mmv1 = " \ ${libdir}/libpcp_mmv.so.1 \ " @@ -130,6 +135,8 @@ FILES:libpcp-mmv1-dev = " \ ${datadir}/man/man3/mmv_* \ ${datadir}/man/man5/mmv.5.gz \ " +INSANE_SKIP:libpcp-mmv1-dev = "staticdev" + FILES:libpcp-import1 = " \ ${libdir}/libpcp_import.so.1 \ " @@ -145,6 +152,8 @@ FILES:libpcp-pmda3-dev = " \ ${datadir}/man/man3/PMDA.3.gz \ ${datadir}/man/man3/pmda* \ " +INSANE_SKIP:libpcp-pmda3-dev = "staticdev" + FILES:libpcp-trace2 = " \ ${libdir}/libpcp_trace.so.2 \ " @@ -155,6 +164,8 @@ FILES:libpcp-trace2-dev = " \ ${libdir}/libpcp_trace.so \ ${datadir}/man/man3/pmtrace* \ " +INSANE_SKIP:libpcp-trace2-dev = "staticdev" + FILES:libpcp-web1 = " \ ${libdir}/libpcp_web.so.1 \ " @@ -166,10 +177,15 @@ FILES:libpcp-web1-dev = " \ ${datadir}/man/man3/pmhttp* \ ${datadir}/man/man3/pmjson* \ " +INSANE_SKIP:libpcp-web1-dev = "staticdev" + FILES:libpcp3 = " \ ${libdir}/libpcp.so.3 \ " +FILES:${PN}-xsos = " \ + ${libexecdir}/pcp/bin/pcp-xsos \ +" FILES:${PN} = " \ ${sysconfdir}/pcp \ ${sysconfdir}/cron.d \ @@ -179,6 +195,7 @@ FILES:${PN} = " \ ${datadir}/bash-completion \ ${datadir}/pcp-gui \ ${datadir}/zsh \ + ${datadir}/icons \ ${systemd_system_unitdir}/ \ ${libdir}/pcp/ \ ${libdir}/sysusers.d/pcp.conf \ @@ -192,6 +209,7 @@ FILES:${PN} = " \ ${localstatedir}/lib/pcp/pmdas/ \ ${localstatedir}/lib/pcp/pmns \ ${libdir}/libpcp_fault.so.3 \ + ${nonarch_libdir}/tmpfiles.d/pcp-reboot-init.conf \ " FILES:${PN}-export-zabbix-agent += " \ @@ -200,6 +218,8 @@ FILES:${PN}-export-zabbix-agent += " \ ${mandir}/man3/zbxpcp.3.gz \ ${libdir}/zabbix \ " +INSANE_SKIP:${PN}-export-zabbix-agent = "dev-so" + FILES:${PN}-testsuite = "${localstatedir}/lib/pcp/testsuite/ ${libdir}/sysusers.d/pcp-testsuite.conf" FILES:python3-${PN} = "${PYTHON_SITEPACKAGES_DIR}" FILES:${PN}-dev += " \