From patchwork Tue Dec 27 01:37:33 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 17224 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 1015EC4332F for ; Tue, 27 Dec 2022 01:37:44 +0000 (UTC) Received: from mail-pl1-f171.google.com (mail-pl1-f171.google.com [209.85.214.171]) by mx.groups.io with SMTP id smtpd.web11.149942.1672105061962344212 for ; Mon, 26 Dec 2022 17:37:42 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=Dt7ucmE0; spf=pass (domain: gmail.com, ip: 209.85.214.171, mailfrom: raj.khem@gmail.com) Received: by mail-pl1-f171.google.com with SMTP id n4so11971711plp.1 for ; Mon, 26 Dec 2022 17:37:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=Wq0f5Lf8RPaAz0zdrr3dvvFeQrING1sVFk6pN1CWU+s=; b=Dt7ucmE0XTf/GcnbJZozHCLaaqHnsCK9jH4eAmmgngPaiJE/fdKWemzCURAR32gsvD Ec4emGVAFZwSRzxVgqB9Om774ygHRivmu3zQV27vZtfGqKV7BGFkj8CmboT9lK97nov9 YYF2L7rjlFFz1mdgOP9NuTcT6t/g9QGTV1ATdTI7gyXz8Z23WsS/nlEj5Opi60avs7AK 2B6kVpC5Oo8XdWTaXlVTUTc1yIJnhVmh27no+GVVTPs33hlAoFf4fhxMwFIDV5pApGuR /tFHAgm114c8Y4eUouofGVPQVdBa5ORPpKMyQ7Z+uDXIJaA3Zi5Yo0d6Lwp7fdi/agnu 9DGw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=Wq0f5Lf8RPaAz0zdrr3dvvFeQrING1sVFk6pN1CWU+s=; b=DXhU6utldQ1CVONVojqekI8tEWlQZvNR0ZwxUxcPvDsJvf6Up5+L2Ee12musMpDADg btd2xX+CFLV99MmzxNQGeZ6WU2wLuPrOh9h/vn9LsZRG9v5S9sCeIl7VxL3tbjNzkkiY QbfG7HCQgnLTJazHLpsENRS1BzrmeKOYaiXlVMIhn6GUwdgmSw99D5hZP+b3jFALDh+K qJieyNvpFVJUjp+ZTVf9kPSGozOU9Hhssc5fmiiXaV8EukzZM6+ezUevgJSb1c4u4HSZ HMPEoiwqrq7D/u04Vfboxo+f6QGCSEfiEgsk4qm+NbWhgpPqVugKqlS9UQPs1mSPlaTR eO0Q== X-Gm-Message-State: AFqh2koVhGhr/PtoYk7t8LSp9a6dY/unKJ9w4p0ymIgTeOeryMJIJEBB +7Yb7HJ8zdb8yONXTSCcS4/JJjHxoU8= X-Google-Smtp-Source: AMrXdXsW9uLNVXdWptDNbqeukaoG8JFbD4art2zxYaGY98lfxjIsz+C8wX3J3zkLv67wiGfaNRZzXA== X-Received: by 2002:a17:902:ff0f:b0:192:4887:f7b9 with SMTP id f15-20020a170902ff0f00b001924887f7b9mr24064661plj.17.1672105061008; Mon, 26 Dec 2022 17:37:41 -0800 (PST) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9181:1cf0::bccc]) by smtp.gmail.com with ESMTPSA id a13-20020a1709027e4d00b00183c6784704sm7596442pln.291.2022.12.26.17.37.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Dec 2022 17:37:40 -0800 (PST) From: Khem Raj To: openembedded-devel@lists.openembedded.org Cc: Khem Raj Subject: [meta-oe][PATCH v2 1/6] wxwidgets: Fix build with musl Date: Mon, 26 Dec 2022 17:37:33 -0800 Message-Id: <20221227013738.3840802-1-raj.khem@gmail.com> X-Mailer: git-send-email 2.39.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 ; Tue, 27 Dec 2022 01:37:44 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/100249 Signed-off-by: Khem Raj --- ...using-glibc-specific-defines-on-musl.patch | 26 +++++++++++++++++++ .../wxwidgets/wxwidgets_3.2.1.bb | 16 ++++++------ 2 files changed, 34 insertions(+), 8 deletions(-) create mode 100644 meta-oe/recipes-extended/wxwidgets/wxwidgets/0001-locale-Avoid-using-glibc-specific-defines-on-musl.patch diff --git a/meta-oe/recipes-extended/wxwidgets/wxwidgets/0001-locale-Avoid-using-glibc-specific-defines-on-musl.patch b/meta-oe/recipes-extended/wxwidgets/wxwidgets/0001-locale-Avoid-using-glibc-specific-defines-on-musl.patch new file mode 100644 index 0000000000..52f4449339 --- /dev/null +++ b/meta-oe/recipes-extended/wxwidgets/wxwidgets/0001-locale-Avoid-using-glibc-specific-defines-on-musl.patch @@ -0,0 +1,26 @@ +From 72c3b7324f00047e6dc5d8380ed2f6ff2494a6f9 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Sun, 18 Dec 2022 14:51:34 -0800 +Subject: [PATCH] locale: Avoid using glibc specific defines on musl + +musl does not provide some glibc-only enum members e.g. _NL_ADDRESS_LANG_NAME + +Upstream-Status: Submitted [https://github.com/wxWidgets/wxWidgets/pull/23050] +Signed-off-by: Khem Raj +--- + src/unix/uilocale.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/unix/uilocale.cpp b/src/unix/uilocale.cpp +index 57773e17f5..86816ba896 100644 +--- a/src/unix/uilocale.cpp ++++ b/src/unix/uilocale.cpp +@@ -619,7 +619,7 @@ wxString + wxUILocaleImplUnix::GetLocalizedName(wxLocaleName name, wxLocaleForm form) const + { + wxString str; +-#if defined(HAVE_LANGINFO_H) && defined(__LINUX__) ++#if defined(HAVE_LANGINFO_H) && defined(__LINUX__) && defined(__GLIBC__) + switch (name) + { + case wxLOCALE_NAME_LOCALE: diff --git a/meta-oe/recipes-extended/wxwidgets/wxwidgets_3.2.1.bb b/meta-oe/recipes-extended/wxwidgets/wxwidgets_3.2.1.bb index 7f0d27123f..03a75d8bd3 100644 --- a/meta-oe/recipes-extended/wxwidgets/wxwidgets_3.2.1.bb +++ b/meta-oe/recipes-extended/wxwidgets/wxwidgets_3.2.1.bb @@ -18,14 +18,14 @@ DEPENDS += " \ tiff \ " -SRC_URI = " \ - gitsm://github.com/wxWidgets/wxWidgets.git;branch=3.2;protocol=https \ - file://0001-wx-config.in-Disable-cross-magic-it-does-not-work-fo.patch \ - file://fix-libdir-for-multilib.patch \ - file://create-links-with-relative-path.patch \ - file://not-append-system-name-to-lib-name.patch \ - file://wx-config-fix-libdir-for-multilib.patch \ -" +SRC_URI = "gitsm://github.com/wxWidgets/wxWidgets.git;branch=3.2;protocol=https \ + file://0001-wx-config.in-Disable-cross-magic-it-does-not-work-fo.patch \ + file://fix-libdir-for-multilib.patch \ + file://create-links-with-relative-path.patch \ + file://not-append-system-name-to-lib-name.patch \ + file://wx-config-fix-libdir-for-multilib.patch \ + file://0001-locale-Avoid-using-glibc-specific-defines-on-musl.patch \ + " SRCREV= "97e99707c5d2271a70cb686720b48dbf34ced496" S = "${WORKDIR}/git" From patchwork Tue Dec 27 01:37:34 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 17225 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 13963C3DA79 for ; Tue, 27 Dec 2022 01:37:44 +0000 (UTC) Received: from mail-pj1-f52.google.com (mail-pj1-f52.google.com [209.85.216.52]) by mx.groups.io with SMTP id smtpd.web11.149944.1672105063284330260 for ; Mon, 26 Dec 2022 17:37:43 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=UMjugU7n; spf=pass (domain: gmail.com, ip: 209.85.216.52, mailfrom: raj.khem@gmail.com) Received: by mail-pj1-f52.google.com with SMTP id o8-20020a17090a9f8800b00223de0364beso15946487pjp.4 for ; Mon, 26 Dec 2022 17:37:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=yaVz3dcQ9+rp9I9Fpx60of3IhTzgCEaJqLVo/Wnol14=; b=UMjugU7nVasXr+YdP9VhYY4Tqvd8d7PzNlVKVuSVQ88P9BnqBW86K4ObVaK2/iXTyM CUVsBMcRrtb1mWLLOJekTMHS5JLcLXi9guQakmPCNBhYVqdbebF+VZfo45khu1TVAJYb /pWOnDuQlaQ+vRWycyNFN1y/c3rdE5YrquPYtMLGHXbDeVvcdUMpD4n04rumrLTIyzWr NReF/fAgdEhtA8XD2HCq6RtZu7+pf58FJbkZZvlsd9NK1R7vOWMDxDEOK6VQ+E1q0ReM FP6SWBvCxOgOcTH6SiOKGwLNXuBd1DqUQ7pItQFAKlsjPZb4buH9yEdu+qXXu8HLWxTJ AuFg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=yaVz3dcQ9+rp9I9Fpx60of3IhTzgCEaJqLVo/Wnol14=; b=K3LI2q+99+qHRULErXZ2IDA7hVjt85wLN6qHHeyMjpUwDNZ+2RrLDftQZ3JkxW3lu9 ED9ZU/JXCajvEmAClLyr14yPVGay0oevF0GInHHEC5e8k3szcqGO1RGxFoizfoX/QpfG GA4hdpTSDoG86IiPDqsHgFiygJkP3vVDMlFgj/FGYsj1EpPAkiRSFbT5+fcNOhzvoYAp 8j4XnuCmF1yZE/txHLuEstEcIm/tm1qlfad1w0gqSO1SJEURIS5YQOWfPsHBxuxBRCzc nWcbVEFJMDLwYIDRsAbAzAawybrFjLfdbiIpaWGbilTvTzxRRz3vcgGXYVzk/hLg3MDU L3MA== X-Gm-Message-State: AFqh2krX3WtH4j3ZcpIgDP41O+qVVRu++zmtiSeyg2v6CV5J6P+2GgdV 6+AsrUzK2uIz6AyVM/D2Hk2z2bn6mRE= X-Google-Smtp-Source: AMrXdXs2JTafqDDW1US//0uaE99HSKtxEVc3MJJVE+Brom0VzY2hYiSGG/Guexyo0e4dqGG/KhisbQ== X-Received: by 2002:a17:902:ccd0:b0:189:6ab3:9e57 with SMTP id z16-20020a170902ccd000b001896ab39e57mr23087923ple.22.1672105062090; Mon, 26 Dec 2022 17:37:42 -0800 (PST) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9181:1cf0::bccc]) by smtp.gmail.com with ESMTPSA id a13-20020a1709027e4d00b00183c6784704sm7596442pln.291.2022.12.26.17.37.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Dec 2022 17:37:41 -0800 (PST) From: Khem Raj To: openembedded-devel@lists.openembedded.org Cc: Khem Raj Subject: [meta-oe][PATCH v2 2/6] wxwidgets: Fix locale on musl Date: Mon, 26 Dec 2022 17:37:34 -0800 Message-Id: <20221227013738.3840802-2-raj.khem@gmail.com> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20221227013738.3840802-1-raj.khem@gmail.com> References: <20221227013738.3840802-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 ; Tue, 27 Dec 2022 01:37:44 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/100250 Signed-off-by: Khem Raj --- .../wxwidgets/wxwidgets/musl-locale-l.patch | 32 +++++++++++++++++++ .../wxwidgets/wxwidgets_3.2.1.bb | 4 +-- 2 files changed, 33 insertions(+), 3 deletions(-) create mode 100644 meta-oe/recipes-extended/wxwidgets/wxwidgets/musl-locale-l.patch diff --git a/meta-oe/recipes-extended/wxwidgets/wxwidgets/musl-locale-l.patch b/meta-oe/recipes-extended/wxwidgets/wxwidgets/musl-locale-l.patch new file mode 100644 index 0000000000..f83d2d4458 --- /dev/null +++ b/meta-oe/recipes-extended/wxwidgets/wxwidgets/musl-locale-l.patch @@ -0,0 +1,32 @@ +these macro'd away functions don't exist in musl (yet) +diff --git a/include/wx/xlocale.h b/include/wx/xlocale.h +index c433d25..3ab9d84 100644 +--- a/include/wx/xlocale.h ++++ b/include/wx/xlocale.h +@@ -33,6 +33,26 @@ + #include "wx/crt.h" // Includes wx/chartype.h, wx/wxcrt.h(wx/string.h) + #include "wx/intl.h" // wxLanguage + ++#ifndef strtol_l ++#define strtol_l(s, p, base, l) strtol(s, p, base) ++#endif ++ ++#ifndef strtoul_l ++#define strtoul_l(s, p, base, l) strtoul(s, p, base) ++#endif ++ ++#ifndef wcstod_l ++#define wcstod_l(s, p, l) wcstod(s, p) ++#endif ++ ++#ifndef wcstol_l ++#define wcstol_l(s, p, base, l) wcstol(s, p, base) ++#endif ++ ++#ifndef wcstoul_l ++#define wcstoul_l(s, p, base, l) wcstoul(s, p, base) ++#endif ++ + // The platform-specific locale type + // If wxXLocale_t is not defined, then only "C" locale support is provided + #ifdef wxHAS_XLOCALE_SUPPORT diff --git a/meta-oe/recipes-extended/wxwidgets/wxwidgets_3.2.1.bb b/meta-oe/recipes-extended/wxwidgets/wxwidgets_3.2.1.bb index 03a75d8bd3..ae2995db20 100644 --- a/meta-oe/recipes-extended/wxwidgets/wxwidgets_3.2.1.bb +++ b/meta-oe/recipes-extended/wxwidgets/wxwidgets_3.2.1.bb @@ -25,6 +25,7 @@ SRC_URI = "gitsm://github.com/wxWidgets/wxWidgets.git;branch=3.2;protocol=https file://not-append-system-name-to-lib-name.patch \ file://wx-config-fix-libdir-for-multilib.patch \ file://0001-locale-Avoid-using-glibc-specific-defines-on-musl.patch \ + file://musl-locale-l.patch \ " SRCREV= "97e99707c5d2271a70cb686720b48dbf34ced496" S = "${WORKDIR}/git" @@ -39,9 +40,6 @@ EXTRA_OECMAKE += " \ -DwxUSE_LIBTIFF=sys \ -DwxUSE_REGEX=builtin \ " -EXTRA_OECMAKE:append:libc-musl = " \ - -DHAVE_LOCALE_T=OFF \ -" EXTRA_OECMAKE:append:class-target = ' -DEGREP="/bin/grep -E"' # OpenGL support currently seems tied to using libglu, which requires x11 From patchwork Tue Dec 27 01:37: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: 17227 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 EF7D8C4332F for ; Tue, 27 Dec 2022 01:37:53 +0000 (UTC) Received: from mail-pj1-f53.google.com (mail-pj1-f53.google.com [209.85.216.53]) by mx.groups.io with SMTP id smtpd.web11.149945.1672105064035495636 for ; Mon, 26 Dec 2022 17:37:44 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=VMH3VsCU; spf=pass (domain: gmail.com, ip: 209.85.216.53, mailfrom: raj.khem@gmail.com) Received: by mail-pj1-f53.google.com with SMTP id u4-20020a17090a518400b00223f7eba2c4so11934366pjh.5 for ; Mon, 26 Dec 2022 17:37:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=vQwomKZ2uBknIj8MNR5u+Z1JqgsmcJjN1OY8SGo+pR8=; b=VMH3VsCUgmqs1tz5X2iPEyB+pjzneHjGtqfQ4SEF34AcnLxOD+4ZF9V340LBFLKLcs M6Qq6RB+qfxmBqYoD2SCBBKiGX9Jz5CjgaYTZky35Liz4/DbxyOTepypDgUwc+G7t/wS gk/8FLo5bBwQLqBqWX3IH+M7mSrtXxYyFjsjz9YMvkFfTycg4m9H46OipBtlR9/f/D3G TmR3rBvqamHP2SJLy7tk/IyPmTwnmGg/JF82KoDfvZaDC83ftnvuuv8eKgUFCvu9im+R 14vH4Kb4LQKHwCnbJK0IsTRiaEE4yHAyu5v6CPcoKTubrOuZGFUoDD/iMON2VPrRCqwj MGxQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=vQwomKZ2uBknIj8MNR5u+Z1JqgsmcJjN1OY8SGo+pR8=; b=Uet8ISAOuX7qwEfJ47pHxg1n8oT701cbYUU7Ecj6P7ne8o1u+mml0+TQ5zKtXVXmJH uymukvGNdnFoEB2KQDpWA5bxRILaQlDE4OMqaT1c/bP0gzxVfV77h8MGSax0K6L3RMz4 2KcUMWSNq5/Iv0ArQMT8vjurK0KiY+TEnba++bnYY7mJBvlzVdrRAirro1IES/kmMaDD F72oJwR/zvDb+kJde9ArRuI+M3Lwr3gHY2jUFbuUg5Oksx2rsxhCT1vN9+AaJ6BQYMLr EqdfU0Qx2710IBkKStgJzBWga05s0Rq3o4d5h6RlXDUFlJR9WU1NbzCKkVffv8Yp/ZsQ KH/w== X-Gm-Message-State: AFqh2krrvjfW9bVC+domwVdng5zSzLe/GN6q6TcUvs+87g2Q8y94MILT j7LeUe4Gw6zik/gUlPlHAUKHkTt4jvU= X-Google-Smtp-Source: AMrXdXsmDxdZq8cM2z91ONJSZpYgN/94TJ2whGPlLSHP6p4l1UeY2DLP5bLesxNRzsFnrV1I8rlX3w== X-Received: by 2002:a17:902:ed44:b0:18f:f3e4:3912 with SMTP id y4-20020a170902ed4400b0018ff3e43912mr22377883plb.34.1672105063158; Mon, 26 Dec 2022 17:37:43 -0800 (PST) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9181:1cf0::bccc]) by smtp.gmail.com with ESMTPSA id a13-20020a1709027e4d00b00183c6784704sm7596442pln.291.2022.12.26.17.37.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Dec 2022 17:37:42 -0800 (PST) From: Khem Raj To: openembedded-devel@lists.openembedded.org Cc: Khem Raj Subject: [meta-oe][PATCH v2 3/6] wxwidgets: Set HAVE_LARGEFILE_SUPPORT Date: Mon, 26 Dec 2022 17:37:35 -0800 Message-Id: <20221227013738.3840802-3-raj.khem@gmail.com> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20221227013738.3840802-1-raj.khem@gmail.com> References: <20221227013738.3840802-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 ; Tue, 27 Dec 2022 01:37:53 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/100251 cmake somehow fails to set it. Signed-off-by: Khem Raj --- ...VE_LARGEFILE_SUPPORT-to-1-explicitly.patch | 30 +++++++++++++++++++ .../wxwidgets/wxwidgets_3.2.1.bb | 4 +++ 2 files changed, 34 insertions(+) create mode 100644 meta-oe/recipes-extended/wxwidgets/wxwidgets/0001-Set-HAVE_LARGEFILE_SUPPORT-to-1-explicitly.patch diff --git a/meta-oe/recipes-extended/wxwidgets/wxwidgets/0001-Set-HAVE_LARGEFILE_SUPPORT-to-1-explicitly.patch b/meta-oe/recipes-extended/wxwidgets/wxwidgets/0001-Set-HAVE_LARGEFILE_SUPPORT-to-1-explicitly.patch new file mode 100644 index 0000000000..5160f2e1fe --- /dev/null +++ b/meta-oe/recipes-extended/wxwidgets/wxwidgets/0001-Set-HAVE_LARGEFILE_SUPPORT-to-1-explicitly.patch @@ -0,0 +1,30 @@ +From e108aff9d6dae613f486c1b1681f4a3cdf17b845 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Mon, 19 Dec 2022 15:07:55 -0800 +Subject: [PATCH] Set HAVE_LARGEFILE_SUPPORT to 1 explicitly + +nothing sets this to 0, but for some reason it gets undef'd + +Upstream-Status: Pending +Signed-off-by: Khem Raj +--- + build/cmake/setup.h.in | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/build/cmake/setup.h.in b/build/cmake/setup.h.in +index bce33a73f3..22afb4cfa0 100644 +--- a/build/cmake/setup.h.in ++++ b/build/cmake/setup.h.in +@@ -869,8 +869,7 @@ + /* + * Define if large (64 bit file offsets) files are supported. + */ +-#cmakedefine HAVE_LARGEFILE_SUPPORT 1 +- ++#define HAVE_LARGEFILE_SUPPORT 1 + /* + * Use OpenGL + */ +-- +2.39.0 + diff --git a/meta-oe/recipes-extended/wxwidgets/wxwidgets_3.2.1.bb b/meta-oe/recipes-extended/wxwidgets/wxwidgets_3.2.1.bb index ae2995db20..39b6a2bc7c 100644 --- a/meta-oe/recipes-extended/wxwidgets/wxwidgets_3.2.1.bb +++ b/meta-oe/recipes-extended/wxwidgets/wxwidgets_3.2.1.bb @@ -26,6 +26,7 @@ SRC_URI = "gitsm://github.com/wxWidgets/wxWidgets.git;branch=3.2;protocol=https file://wx-config-fix-libdir-for-multilib.patch \ file://0001-locale-Avoid-using-glibc-specific-defines-on-musl.patch \ file://musl-locale-l.patch \ + file://0001-Set-HAVE_LARGEFILE_SUPPORT-to-1-explicitly.patch \ " SRCREV= "97e99707c5d2271a70cb686720b48dbf34ced496" S = "${WORKDIR}/git" @@ -76,6 +77,9 @@ PACKAGECONFIG[sdl_audio] = "-DwxUSE_LIBSDL=ON,-DwxUSE_LIBSDL=OFF,libsdl2" PACKAGECONFIG[webkit] = "-DwxUSE_WEBVIEW_WEBKIT=ON,-DwxUSE_WEBVIEW_WEBKIT=OFF,webkitgtk,,,no_gui" PACKAGECONFIG[curl] = "-DwxUSE_WEBREQUEST_CURL=ON,-DwxUSE_WEBREQUEST_CURL=OFF,curl" +# Support LFS unconditionally +CXXFLAGS += "-D_FILE_OFFSET_BITS=64" + do_compile:append() { # if not at re-compile if [ -L ${B}/wx-config ]; then From patchwork Tue Dec 27 01:37: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: 17228 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 06531C4708D for ; Tue, 27 Dec 2022 01:37:54 +0000 (UTC) Received: from mail-pl1-f180.google.com (mail-pl1-f180.google.com [209.85.214.180]) by mx.groups.io with SMTP id smtpd.web11.149947.1672105064859749098 for ; Mon, 26 Dec 2022 17:37:44 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=exzm60cP; spf=pass (domain: gmail.com, ip: 209.85.214.180, mailfrom: raj.khem@gmail.com) Received: by mail-pl1-f180.google.com with SMTP id u7so11925559plq.11 for ; Mon, 26 Dec 2022 17:37:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Pl7oTwHtNL3luRmTz79WqDwaCDMe060lPB7jTy7GUzk=; b=exzm60cP9Gubo+MN4FHcIESCAf+KmLz92i9E10ne0OWdtPrxlVFUuJuvbqARIE+jCy NljNTr/Odg5LdTbUpH9nR/UjFYaVqtocElQf/e2TT9qKCfjxvSBDV5mrQ+sM9mAxd5g8 cNTc7ayj8hycuddkUv/loAZ+xO7OFRXUPsEhkQonZWSEgPwBhdHGDlNFiDPss+NDiC7F 9VsmO8KYXCVSaJjXNsgyF13UXEcypVekLSPr0E/RmuIH6NXoGObPhhk6WDmZaoZj8mvM eBvM/0bETXC+KA7eRD3qhsb06VeaPx5YfOU/b82Oo2YYZtySnD/gryFjpYAqT32gdhQA zoyw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Pl7oTwHtNL3luRmTz79WqDwaCDMe060lPB7jTy7GUzk=; b=x1jqmCt7b/Vb5CEs1qCGQd7cMLGg16CSYgXnIsm3bLiqRkG7hczcrHK1SC+D48Gh+I c94tByZPTY049XWrRQ7RU+sFclL3CZO9VR9VwZlwuCAUV4DXcf3eqKlIW6FzPv0PTcoM xTF3tNtBThP8AHFnytskUDnoR992ThX5Swxe+uoQRso5G18xQZhDsq8lamJLQtJCF5Tw lJUA8LixG7JhTQuBJCi4qTgGOJ/y60SZuOSNdKPLk7ZxnTUKy21EOEUoTtwFPcVwWF2l eSZpDgfMQ+Eb3SbU+xTpRpKxSxKp/LR110e2jGOpRzWOapJc9FsPNWD1SvifCoQf0z4x Jp2Q== X-Gm-Message-State: AFqh2krkFIjadG7C2eYfVT9Wrqk3V72OgAJylHlXqw7dCEZXR/2R2Yij qZ8/sIy8PGLRS+S5FQMPgY2DOfo+QkY= X-Google-Smtp-Source: AMrXdXuyV0TmYTsOYt8CgJ6jmhf3OmAGBrERmi3lW15TrHADSdACNDV0nWYC1Z8vdwMh2K1XBM3Rzw== X-Received: by 2002:a17:902:904b:b0:186:95c9:ddc9 with SMTP id w11-20020a170902904b00b0018695c9ddc9mr25924172plz.55.1672105064082; Mon, 26 Dec 2022 17:37:44 -0800 (PST) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9181:1cf0::bccc]) by smtp.gmail.com with ESMTPSA id a13-20020a1709027e4d00b00183c6784704sm7596442pln.291.2022.12.26.17.37.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Dec 2022 17:37:43 -0800 (PST) From: Khem Raj To: openembedded-devel@lists.openembedded.org Cc: Khem Raj Subject: [meta-python][PATCH v2 4/6] python3-wxgtk4: Do not use GetAssertStackTrace with USE_STACKWALKER disabled Date: Mon, 26 Dec 2022 17:37:36 -0800 Message-Id: <20221227013738.3840802-4-raj.khem@gmail.com> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20221227013738.3840802-1-raj.khem@gmail.com> References: <20221227013738.3840802-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 ; Tue, 27 Dec 2022 01:37:54 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/100252 Signed-off-by: Khem Raj --- ...y-use-GetAssertStackTrace-under-USE_.patch | 32 +++++++++++++++++++ .../python3-wxgtk4/python3-wxgtk4_4.2.0.bb | 9 +++--- 2 files changed, 37 insertions(+), 4 deletions(-) create mode 100644 meta-python/recipes-devtools/python3-wxgtk4/python3-wxgtk4/0001-sip-Conditionally-use-GetAssertStackTrace-under-USE_.patch diff --git a/meta-python/recipes-devtools/python3-wxgtk4/python3-wxgtk4/0001-sip-Conditionally-use-GetAssertStackTrace-under-USE_.patch b/meta-python/recipes-devtools/python3-wxgtk4/python3-wxgtk4/0001-sip-Conditionally-use-GetAssertStackTrace-under-USE_.patch new file mode 100644 index 0000000000..f8a3061ae0 --- /dev/null +++ b/meta-python/recipes-devtools/python3-wxgtk4/python3-wxgtk4/0001-sip-Conditionally-use-GetAssertStackTrace-under-USE_.patch @@ -0,0 +1,32 @@ +From b9f95c06b2e7a525f4f93d705976882e8dcba6ab Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Tue, 20 Dec 2022 09:46:31 -0800 +Subject: [PATCH] sip: Conditionally use GetAssertStackTrace under + USE_STACKWALKER + +Musl eg. does not implement stack walker ( backtrace ) therefore it gets +disabled for wxwidgets on those systems. This needs to be checked before using +GetAssertStackTrace() + +Upstream-Status: Pending +Signed-off-by: Khem Raj +--- + sip/cpp/sip_corewxAppTraits.cpp | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/sip/cpp/sip_corewxAppTraits.cpp b/sip/cpp/sip_corewxAppTraits.cpp +index 9c9f9d5b..1d2d2f90 100644 +--- a/sip/cpp/sip_corewxAppTraits.cpp ++++ b/sip/cpp/sip_corewxAppTraits.cpp +@@ -471,7 +471,11 @@ static PyObject *meth_wxAppTraits_GetAssertStackTrace(PyObject *sipSelf, PyObjec + PyErr_Clear(); + + Py_BEGIN_ALLOW_THREADS ++#if wxUSE_STACKWALKER + sipRes = new ::wxString((sipSelfWasArg ? sipCpp-> ::wxAppTraits::GetAssertStackTrace() : sipCpp->GetAssertStackTrace())); ++#else ++ sipRes = new ::wxString(""); ++#endif + Py_END_ALLOW_THREADS + + if (PyErr_Occurred()) diff --git a/meta-python/recipes-devtools/python3-wxgtk4/python3-wxgtk4_4.2.0.bb b/meta-python/recipes-devtools/python3-wxgtk4/python3-wxgtk4_4.2.0.bb index df23037fc6..bf87b0a73d 100644 --- a/meta-python/recipes-devtools/python3-wxgtk4/python3-wxgtk4_4.2.0.bb +++ b/meta-python/recipes-devtools/python3-wxgtk4/python3-wxgtk4_4.2.0.bb @@ -11,10 +11,11 @@ DEPENDS = "python3-attrdict3-native python3-six-native wxwidgets-native \ PYPI_PACKAGE = "wxPython" SRC_URI += "file://add-back-option-build-base.patch \ - file://wxgtk-fixup-build-scripts.patch \ - file://not-overwrite-cflags-cxxflags.patch \ - file://0001-pypubsub-Replace-deprecated-inspect.getargspec.patch \ - " + file://wxgtk-fixup-build-scripts.patch \ + file://not-overwrite-cflags-cxxflags.patch \ + file://0001-pypubsub-Replace-deprecated-inspect.getargspec.patch \ + file://0001-sip-Conditionally-use-GetAssertStackTrace-under-USE_.patch \ + " SRC_URI[sha256sum] = "663cebc4509d7e5d113518865fe274f77f95434c5d57bc386ed58d65ceed86c7" S = "${WORKDIR}/wxPython-${PV}" From patchwork Tue Dec 27 01:37: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: 17229 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 07E3DC46467 for ; Tue, 27 Dec 2022 01:37:54 +0000 (UTC) Received: from mail-pl1-f179.google.com (mail-pl1-f179.google.com [209.85.214.179]) by mx.groups.io with SMTP id smtpd.web10.148806.1672105065930077143 for ; Mon, 26 Dec 2022 17:37:45 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=SKz7RJCs; spf=pass (domain: gmail.com, ip: 209.85.214.179, mailfrom: raj.khem@gmail.com) Received: by mail-pl1-f179.google.com with SMTP id jl4so5677707plb.8 for ; Mon, 26 Dec 2022 17:37:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=hcgOKoZITvjjRaKGXTZuwq56OtsuVLpzxVMn8WDWbxw=; b=SKz7RJCs/3Hw4pA/fMDQSht8sBdrTV+Nbr1KEIfqZqACMzaOlZSk4y8GqkV+2wIFAr ibyp06NTIBDwBu2tmh76kEXTOtzba8ikvmUKbcOv/n2/4rNP44P2nMLk1hYM8P83PS1L jG95yCXRdPTJbuDKwh4pHkgCFK7MKYv70NvWHt8JD0kom7z7D7SaMwT2G8QW8hFv2Pap HONtClteK12vnYJzGq3Z8zbsCPT+/u6iZVaUOxhk+/Lsub92yuqh0zwKQZ6evuA2P/BF RTivZ6OacX6Jvp9ZcdVXpRFor//5R99jNZerLkahOL66zasepciqXbp7S9ZsDIpx7ekU ypNQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=hcgOKoZITvjjRaKGXTZuwq56OtsuVLpzxVMn8WDWbxw=; b=53FNQPmOP0NRRefzbuIRNFiDcKob5vjpvi4v1Xnp9B1T8u0FdD07YawIDthxx89Vw7 Gl2Zvk5RQTMGyGDd4gSPPDO9J1W4E6ZM8bE17JG4SwF/CRcFzFuoZDxXtKKZV2wCAzJR 6A0SeVIhXxnoXci1wwgMGz6nNASnVsuKRp/41nnG96wtWOsSUyYPt/eIUdzs5Ke/x188 NdafFQpicAUES8bozcSdZDhEa3UZYrYNnmM0HQayjWJHOYxSYWq8mHgFaKR0HZCQo0fP eyDLuP8KsTqhP2zoMjVje8dKVh56FUSMiWXpommMmD0b1+KY6JPlBMxJ2qBwhs4w6Jgf qB4A== X-Gm-Message-State: AFqh2kowb7tgr06qYpRYgtqyHqY2tYattN7NZW6gzHiKN4c91JWNFsLn xCfVpqnoHGy1ZWh6WP45SibVT2cQPi4= X-Google-Smtp-Source: AMrXdXtpYtJ9AilF5MuVywka5E5UQFCiTdaqmCKzEhavf0dgRqe5EPMHXaFg9B0skHb773rbya26LA== X-Received: by 2002:a17:902:d4ca:b0:189:ec62:3b2d with SMTP id o10-20020a170902d4ca00b00189ec623b2dmr31781755plg.4.1672105065005; Mon, 26 Dec 2022 17:37:45 -0800 (PST) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9181:1cf0::bccc]) by smtp.gmail.com with ESMTPSA id a13-20020a1709027e4d00b00183c6784704sm7596442pln.291.2022.12.26.17.37.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Dec 2022 17:37:44 -0800 (PST) From: Khem Raj To: openembedded-devel@lists.openembedded.org Cc: Khem Raj Subject: [meta-filesystems][PATCH v2 5/6] f2fs-tools: Upgrade to 1.15.0 Date: Mon, 26 Dec 2022 17:37:37 -0800 Message-Id: <20221227013738.3840802-5-raj.khem@gmail.com> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20221227013738.3840802-1-raj.khem@gmail.com> References: <20221227013738.3840802-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 ; Tue, 27 Dec 2022 01:37:54 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/100253 Add patches to build builds when S != B and largefile support Signed-off-by: Khem Raj --- .../0001-f2fs_io-Fix-out-of-tree-builds.patch | 27 +++ ...-f2fs_io-Define-_FILE_OFFSET_BITS-64.patch | 183 ++++++++++++++++++ ...s-tools_1.14.0.bb => f2fs-tools_1.15.0.bb} | 4 +- 3 files changed, 213 insertions(+), 1 deletion(-) create mode 100644 meta-filesystems/recipes-utils/f2fs-tools/f2fs-tools/0001-f2fs_io-Fix-out-of-tree-builds.patch create mode 100644 meta-filesystems/recipes-utils/f2fs-tools/f2fs-tools/0002-f2fs_io-Define-_FILE_OFFSET_BITS-64.patch rename meta-filesystems/recipes-utils/f2fs-tools/{f2fs-tools_1.14.0.bb => f2fs-tools_1.15.0.bb} (74%) diff --git a/meta-filesystems/recipes-utils/f2fs-tools/f2fs-tools/0001-f2fs_io-Fix-out-of-tree-builds.patch b/meta-filesystems/recipes-utils/f2fs-tools/f2fs-tools/0001-f2fs_io-Fix-out-of-tree-builds.patch new file mode 100644 index 0000000000..aa243bd9c0 --- /dev/null +++ b/meta-filesystems/recipes-utils/f2fs-tools/f2fs-tools/0001-f2fs_io-Fix-out-of-tree-builds.patch @@ -0,0 +1,27 @@ +From f110e34d7a4929cdea647b98fa177cf1bccf8b1e Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Wed, 21 Dec 2022 18:21:42 -0800 +Subject: [PATCH] f2fs_io: Fix out of tree builds + +Relative path does not work when searching for include files +when srcdir != builddir + +Upstream-Status: Submitted [https://lore.kernel.org/linux-f2fs-devel/20221222022830.976309-1-raj.khem@gmail.com/T/#t] +Signed-off-by: Khem Raj +--- + tools/f2fs_io/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tools/f2fs_io/Makefile.am b/tools/f2fs_io/Makefile.am +index 6c17db1..bc4f9d0 100644 +--- a/tools/f2fs_io/Makefile.am ++++ b/tools/f2fs_io/Makefile.am +@@ -1,7 +1,7 @@ + ## Makefile.am + + if LINUX +-AM_CPPFLAGS = -I../../include ++AM_CPPFLAGS = -I$(top_srcdir)/include + AM_CFLAGS = -Wall + sbin_PROGRAMS = f2fs_io + f2fs_io_SOURCES = f2fs_io.c diff --git a/meta-filesystems/recipes-utils/f2fs-tools/f2fs-tools/0002-f2fs_io-Define-_FILE_OFFSET_BITS-64.patch b/meta-filesystems/recipes-utils/f2fs-tools/f2fs-tools/0002-f2fs_io-Define-_FILE_OFFSET_BITS-64.patch new file mode 100644 index 0000000000..d4e3194e62 --- /dev/null +++ b/meta-filesystems/recipes-utils/f2fs-tools/f2fs-tools/0002-f2fs_io-Define-_FILE_OFFSET_BITS-64.patch @@ -0,0 +1,183 @@ +From 3c0314e1820afc9a98e890cc5f7973c3c81877f8 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Wed, 21 Dec 2022 18:23:03 -0800 +Subject: [PATCH] f2fs_io: Define _FILE_OFFSET_BITS=64 + +Remove _LARGEFILE64_SOURCE, this is redundant when _FILE_OFFSET_BITS=64 +additionally it fixes build with musl because the detection logic for +lseek64 fails because when using _LARGEFILE64_SOURCE musl also define's +lseek64 as an alias to lseek + +Upstream-Status: Submitted [https://lore.kernel.org/linux-f2fs-devel/20221222022830.976309-2-raj.khem@gmail.com/T/#u] +Signed-off-by: Khem Raj +--- + lib/libf2fs_io.c | 4 +++- + tools/f2fs_io/f2fs_io.c | 4 ++-- + 2 files changed, 5 insertions(+), 3 deletions(-) + +--- a/lib/libf2fs_io.c ++++ b/lib/libf2fs_io.c +@@ -11,7 +11,9 @@ + * + * Dual licensed under the GPL or LGPL version 2 licenses. + */ +-#define _LARGEFILE64_SOURCE ++#ifndef _FILE_OFFSET_BITS ++#define _FILE_OFFSET_BITS 64 ++#endif + + #include + #include +@@ -67,22 +69,13 @@ static int __get_device_fd(__u64 *offset + return -1; + } + +-#ifndef HAVE_LSEEK64 +-typedef off_t off64_t; +- +-static inline off64_t lseek64(int fd, __u64 offset, int set) +-{ +- return lseek(fd, offset, set); +-} +-#endif +- + /* ---------- dev_cache, Least Used First (LUF) policy ------------------- */ + /* + * Least used block will be the first victim to be replaced when max hash + * collision exceeds + */ + static bool *dcache_valid; /* is the cached block valid? */ +-static off64_t *dcache_blk; /* which block it cached */ ++static off_t *dcache_blk; /* which block it cached */ + static uint64_t *dcache_lastused; /* last used ticks for cache entries */ + static char *dcache_buf; /* cached block data */ + static uint64_t dcache_usetick; /* current use tick */ +@@ -172,7 +165,7 @@ static int dcache_alloc_all(long n) + { + if (n <= 0) + return -1; +- if ((dcache_blk = (off64_t *) malloc(sizeof(off64_t) * n)) == NULL ++ if ((dcache_blk = (off_t *) malloc(sizeof(off_t) * n)) == NULL + || (dcache_lastused = (uint64_t *) + malloc(sizeof(uint64_t) * n)) == NULL + || (dcache_buf = (char *) malloc (F2FS_BLKSIZE * n)) == NULL +@@ -257,7 +250,7 @@ static inline long dcache_relocate(long + dcache_config.num_cache_entry; + } + +-static long dcache_find(off64_t blk) ++static long dcache_find(off_t blk) + { + register long n = dcache_config.num_cache_entry; + register unsigned m = dcache_config.max_hash_collision; +@@ -278,10 +271,10 @@ static long dcache_find(off64_t blk) + } + + /* Physical read into cache */ +-static int dcache_io_read(int fd, long entry, off64_t offset, off64_t blk) ++static int dcache_io_read(int fd, long entry, off_t offset, off_t blk) + { +- if (lseek64(fd, offset, SEEK_SET) < 0) { +- MSG(0, "\n lseek64 fail.\n"); ++ if (lseek(fd, offset, SEEK_SET) < 0) { ++ MSG(0, "\n lseek fail.\n"); + return -1; + } + if (read(fd, dcache_buf + entry * F2FS_BLKSIZE, F2FS_BLKSIZE) < 0) { +@@ -308,12 +301,12 @@ static int dcache_io_read(int fd, long e + * 1: cache not available (uninitialized) + * -1: error + */ +-static int dcache_update_rw(int fd, void *buf, off64_t offset, ++static int dcache_update_rw(int fd, void *buf, off_t offset, + size_t byte_count, bool is_write) + { +- off64_t blk; ++ off_t blk; + int addr_in_blk; +- off64_t start; ++ off_t start; + + if (!dcache_initialized) + dcache_init(); /* auto initialize */ +@@ -377,13 +370,13 @@ static int dcache_update_rw(int fd, void + * return value: 1: cache not available + * 0: success, -1: I/O error + */ +-int dcache_update_cache(int fd, void *buf, off64_t offset, size_t count) ++int dcache_update_cache(int fd, void *buf, off_t offset, size_t count) + { + return dcache_update_rw(fd, buf, offset, count, true); + } + + /* handles read into cache + read into buffer */ +-int dcache_read(int fd, void *buf, off64_t offset, size_t count) ++int dcache_read(int fd, void *buf, off_t offset, size_t count) + { + return dcache_update_rw(fd, buf, offset, count, false); + } +@@ -395,7 +388,7 @@ int dev_read_version(void *buf, __u64 of + { + if (c.sparse_mode) + return 0; +- if (lseek64(c.kd, (off64_t)offset, SEEK_SET) < 0) ++ if (lseek(c.kd, (off_t)offset, SEEK_SET) < 0) + return -1; + if (read(c.kd, buf, len) < 0) + return -1; +@@ -537,10 +530,10 @@ int dev_read(void *buf, __u64 offset, si + + /* err = 1: cache not available, fall back to non-cache R/W */ + /* err = 0: success, err=-1: I/O error */ +- err = dcache_read(fd, buf, (off64_t)offset, len); ++ err = dcache_read(fd, buf, (off_t)offset, len); + if (err <= 0) + return err; +- if (lseek64(fd, (off64_t)offset, SEEK_SET) < 0) ++ if (lseek(fd, (off_t)offset, SEEK_SET) < 0) + return -1; + if (read(fd, buf, len) < 0) + return -1; +@@ -586,9 +579,9 @@ int dev_write(void *buf, __u64 offset, s + * dcache_update_cache() just update cache, won't do I/O. + * Thus even no error, we need normal non-cache I/O for actual write + */ +- if (dcache_update_cache(fd, buf, (off64_t)offset, len) < 0) ++ if (dcache_update_cache(fd, buf, (off_t)offset, len) < 0) + return -1; +- if (lseek64(fd, (off64_t)offset, SEEK_SET) < 0) ++ if (lseek(fd, (off_t)offset, SEEK_SET) < 0) + return -1; + if (write(fd, buf, len) < 0) + return -1; +@@ -602,7 +595,7 @@ int dev_write_block(void *buf, __u64 blk + + int dev_write_dump(void *buf, __u64 offset, size_t len) + { +- if (lseek64(c.dump_fd, (off64_t)offset, SEEK_SET) < 0) ++ if (lseek(c.dump_fd, (off_t)offset, SEEK_SET) < 0) + return -1; + if (write(c.dump_fd, buf, len) < 0) + return -1; +@@ -627,7 +620,7 @@ int dev_fill(void *buf, __u64 offset, si + /* Only allow fill to zero */ + if (*((__u8*)buf)) + return -1; +- if (lseek64(fd, (off64_t)offset, SEEK_SET) < 0) ++ if (lseek(fd, (off_t)offset, SEEK_SET) < 0) + return -1; + if (write(fd, buf, len) < 0) + return -1; +--- a/tools/f2fs_io/f2fs_io.c ++++ b/tools/f2fs_io/f2fs_io.c +@@ -12,8 +12,8 @@ + #ifndef _LARGEFILE_SOURCE + #define _LARGEFILE_SOURCE + #endif +-#ifndef _LARGEFILE64_SOURCE +-#define _LARGEFILE64_SOURCE ++#ifndef _FILE_OFFSET_BITS ++#define _FILE_OFFSET_BITS 64 + #endif + #ifndef O_LARGEFILE + #define O_LARGEFILE 0 diff --git a/meta-filesystems/recipes-utils/f2fs-tools/f2fs-tools_1.14.0.bb b/meta-filesystems/recipes-utils/f2fs-tools/f2fs-tools_1.15.0.bb similarity index 74% rename from meta-filesystems/recipes-utils/f2fs-tools/f2fs-tools_1.14.0.bb rename to meta-filesystems/recipes-utils/f2fs-tools/f2fs-tools_1.15.0.bb index fb71b18b60..5da059f738 100644 --- a/meta-filesystems/recipes-utils/f2fs-tools/f2fs-tools_1.14.0.bb +++ b/meta-filesystems/recipes-utils/f2fs-tools/f2fs-tools_1.15.0.bb @@ -7,8 +7,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=362b4b2594cd362b874a97718faa51d3" # to provide libuuid DEPENDS = "util-linux" -SRCREV = "d41dcbdf46dc3841cd0a0507e6573e38cb6c55bb" +SRCREV = "64f2596142800c215cb40a658ebd5793ed37c936" SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs-tools.git;branch=master \ + file://0001-f2fs_io-Fix-out-of-tree-builds.patch \ + file://0002-f2fs_io-Define-_FILE_OFFSET_BITS-64.patch \ " UPSTREAM_CHECK_GITTAGREGEX = "v(?P\d+(\.\d+)+)" From patchwork Tue Dec 27 01:37: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: 17226 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 F208BC3DA79 for ; Tue, 27 Dec 2022 01:37:53 +0000 (UTC) Received: from mail-pl1-f180.google.com (mail-pl1-f180.google.com [209.85.214.180]) by mx.groups.io with SMTP id smtpd.web11.149947.1672105064859749098 for ; Mon, 26 Dec 2022 17:37:46 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=UZvUD2zB; spf=pass (domain: gmail.com, ip: 209.85.214.180, mailfrom: raj.khem@gmail.com) Received: by mail-pl1-f180.google.com with SMTP id u7so11925613plq.11 for ; Mon, 26 Dec 2022 17:37:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=lURT3cZbjj9sjDJQZXitedFHLcuxP51cntEhjVAL33w=; b=UZvUD2zBh5tbLSe7ic56VMxgXzOCv7AA/iDYLq9AiU1eUxURyGg8wu02GrrCQcX25w b5dXb0XppDcNxNZMRBLow1N601cDe9Wdmu4B10ERylxl9d9hVin/AUoTmgZzG1oxCsV1 BC7FfLHqpb5oIjWbrxamvgdXYLnzTCFlDUos1Vo4dZg/bmcJaDTlclWivXCjh/xQlvbO mTc15KovP34BgNapK50BRPLUzZTPnY1NHZkMpL1X96tKaDXDWQXmbaLZ2CUKIswItMW2 E2oyx7uNd+wQt+Sop9yJvQcNuLMY2o15foAEUz/lId687jC3kRt6UZQt8DIG9NxE0naY wu7A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=lURT3cZbjj9sjDJQZXitedFHLcuxP51cntEhjVAL33w=; b=GCl2nG/k9KCEiWHXVwd8RshjmhrXqDwqRWN0NxtLv6UrN2O40wBZmw10WDReAUnBJh Lu7bqgFW4VITjBDpDs3W0q13jXAMDGG+7lw2GRWGaq4xFJG7Hw7UIv3MTgcsQV/8/JhJ qws0z/BtUzpfCu7KoKN+VhEdfZjG6iRwTNJazDH0IXoHpDV1w+x1y0ZbcH8r7xzmAwyA aGb2fozXvDqr2tnFSK/N0UFZsY7x/WB+1Jy5KO/Kt6uRfi4Mh9hZGxMqA79wndhckDVC 2wCTc6+7m1W3clH47GQbhNcOG/4uCgDG0kFd6yupxeyQflZU/1QtbMZHO+ZvDeU0Q2oc mnbw== X-Gm-Message-State: AFqh2kolBG702mFOz7KmkAg3J9Efa1clyUZqH4Z3O/OsA7p/ixg8fttx NCMU1DnOxXVGMmLDdEU4eLziAcH+MDM= X-Google-Smtp-Source: AMrXdXsHFvTmpaXCl0n36gTk44wL/FCSkBjFUpytosWo8UCfKEPLs1yHvTDiPdzSX/wfJuwntg+UfA== X-Received: by 2002:a17:902:c244:b0:189:603d:ea71 with SMTP id 4-20020a170902c24400b00189603dea71mr22817314plg.58.1672105065955; Mon, 26 Dec 2022 17:37:45 -0800 (PST) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9181:1cf0::bccc]) by smtp.gmail.com with ESMTPSA id a13-20020a1709027e4d00b00183c6784704sm7596442pln.291.2022.12.26.17.37.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Dec 2022 17:37:45 -0800 (PST) From: Khem Raj To: openembedded-devel@lists.openembedded.org Cc: Khem Raj Subject: [meta-oe][PATCH v2 6/6] trace-cmd: Pass ldflags to compiler Date: Mon, 26 Dec 2022 17:37:38 -0800 Message-Id: <20221227013738.3840802-6-raj.khem@gmail.com> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20221227013738.3840802-1-raj.khem@gmail.com> References: <20221227013738.3840802-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 ; Tue, 27 Dec 2022 01:37:53 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/100254 Fixes File /usr/lib/traceevent/libtraceevent.so in package trace-cmd doesn't have GNU_HASH (didn't pass LDFLAGS?) Signed-off-by: Khem Raj --- meta-oe/recipes-kernel/trace-cmd/trace-cmd_2.9.1.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta-oe/recipes-kernel/trace-cmd/trace-cmd_2.9.1.bb b/meta-oe/recipes-kernel/trace-cmd/trace-cmd_2.9.1.bb index 66bc2932ab..e6afbfaa82 100644 --- a/meta-oe/recipes-kernel/trace-cmd/trace-cmd_2.9.1.bb +++ b/meta-oe/recipes-kernel/trace-cmd/trace-cmd_2.9.1.bb @@ -16,6 +16,8 @@ DEPENDS += "libtraceevent libtracefs zstd xmlto-native asciidoc-native" inherit pkgconfig +TARGET_CC_ARCH += "${LDFLAGS}" + do_compile() { oe_runmake libdir_relative=${BASELIB} all libs }