From patchwork Tue Apr 8 02:52:04 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 60950 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 16B42C3601E for ; Tue, 8 Apr 2025 02:52:17 +0000 (UTC) Received: from mail-pl1-f173.google.com (mail-pl1-f173.google.com [209.85.214.173]) by mx.groups.io with SMTP id smtpd.web10.66267.1744080729676105306 for ; Mon, 07 Apr 2025 19:52:09 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=LtPmLVUA; spf=pass (domain: gmail.com, ip: 209.85.214.173, mailfrom: raj.khem@gmail.com) Received: by mail-pl1-f173.google.com with SMTP id d9443c01a7336-2243803b776so69457985ad.0 for ; Mon, 07 Apr 2025 19:52:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1744080729; x=1744685529; 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=toT5OyMWwbr0j4nba0SgudiVXkXcTcZbswzp0re87xs=; b=LtPmLVUA404mnqhzOUVKlhqFDffE6oG6UQUZcx+jiXkLO4ybg9mlVWxXG4iTvBM5Qr aqh7q9OlWS3NV7zu6wY8ot6CduIjXZsOkmeGCd+DtOcZWgflJzgEpZ/kCrVlf7JdNaTa +bJV89CdQY//gQUMMFXLGHPloEUeWCZQ0zsW+I6FPFaylWH1nWkM7vXOE6xmreQCWfq6 a+jliJEYELVQLNkKseZQA+PUsxe0kZ87zYWXV2jy3VBLdpgmfYBzu1wPjrR/cbtKty/j BNC7S7tBLWnq3GZngLY1JsPLQnbCiKWckn77KXtw9mwvP02qhdrX+R1GCNOq6AfauW1A VDPQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744080729; x=1744685529; 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=toT5OyMWwbr0j4nba0SgudiVXkXcTcZbswzp0re87xs=; b=io8KfKhkwKW5r52RvKdGegVwbjsVMuLCpY3klVZv9XzB5xTzHoRtiBTgn1q9Z5+U/r /yovj/nsI5MunVpxR/O7bHiRgb2TaCEMSU6S6NdCTiPgQE3wjutHkjVafHd+NkJe+YzP R3ubpt7jGqQ5DH5OfyhcqtFQ9F/A0t+tmT2gHYa6OKJX5m9LikiOqu9AULlVCys/L1Fz vKTWWJH89zHWRvP0YKgILQW+lqekQ5//E9JZk/kWoorbRfy6dlvMC5RGtzhyc036LHOY lNZ4DtM6Mf0bRLnqQtRi6AUkWY0I+JfgLAVqWO2yva+OZN+J+MYG2E+b6V8QgkQ2ugzj PdAw== X-Gm-Message-State: AOJu0YzS7Y0GiuG9/l/pKp2M6M4AgUP8d6TNpbbOgW0+H0J9UEg5y0Ks OwUdVUc0y8+0AXI64TfVG3bcRbfQgmi8zfidX8MCT0hsMc4vaPudkfPzEgMz X-Gm-Gg: ASbGnctyYVMTc2MnxEaQjy9aU/pblYiMueMx6kNF9vhhvzM1KTgzlV8pCeEdwPBsTnO tQgNvS3uDvGU5w3I6GGvFhZc1H89GSRp7cjtFAozs/bLQRH82018dpqf7UbkAMtu6jMNxW/rte6 6oCA0RAYwPWxrLe4M9SdRMURwwQski+K7O0E4Xv30WU+uKUjSRyfhMB4Qh4I1GOPD1PbMQquK4M QdmeEE5RmFzoNyefd/qXZjrGqR5WImI1JaGogjrPLMslB0QBi9AeqJKKzKFq1FD+IvD4NGoOkFA yknBHbJAlA1JzlUfGGtIQsmnXGSScOg0K7F6+FZvu8TAeuo= X-Google-Smtp-Source: AGHT+IE4zH202rK1nOhyXY4IsJLhL5gbW9OkcYM79J3CXZ1i6NGZu1JXx6u3UasFJ8/XC1DR2g0qcg== X-Received: by 2002:a17:903:2c5:b0:224:1294:1d24 with SMTP id d9443c01a7336-22a954f9deamr144968775ad.3.1744080728735; Mon, 07 Apr 2025 19:52:08 -0700 (PDT) Received: from apollo.localdomain ([2601:646:8201:fd20::f900]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-229787728cfsm89057245ad.228.2025.04.07.19.52.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Apr 2025 19:52:08 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Cc: Khem Raj Subject: [meta-oe][PATCH 1/3] mariadb: Fix build with clang Date: Mon, 7 Apr 2025 19:52:04 -0700 Message-ID: <20250408025206.548418-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 ; Tue, 08 Apr 2025 02:52:17 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/116682 Signed-off-by: Khem Raj --- meta-oe/recipes-dbs/mysql/mariadb.inc | 1 + meta-oe/recipes-dbs/mysql/mariadb/3871.patch | 29 ++++++++++++++++++++ 2 files changed, 30 insertions(+) create mode 100644 meta-oe/recipes-dbs/mysql/mariadb/3871.patch diff --git a/meta-oe/recipes-dbs/mysql/mariadb.inc b/meta-oe/recipes-dbs/mysql/mariadb.inc index f704ff6dec..eedb6735a4 100644 --- a/meta-oe/recipes-dbs/mysql/mariadb.inc +++ b/meta-oe/recipes-dbs/mysql/mariadb.inc @@ -24,6 +24,7 @@ SRC_URI = "https://archive.mariadb.org/${BP}/source/${BP}.tar.gz \ file://lfs64.patch \ file://0001-Add-missing-includes-cstdint-and-cstdio.patch \ file://0001-Ensure-compatibility-with-ARMv9-by-updating-.arch-di.patch \ + file://3871.patch \ " SRC_URI[sha256sum] = "ff6595f8c482f9921e39b97fa1122377a69f0dcbd92553c6b9032cbf0e9b5354" diff --git a/meta-oe/recipes-dbs/mysql/mariadb/3871.patch b/meta-oe/recipes-dbs/mysql/mariadb/3871.patch new file mode 100644 index 0000000000..4bbca2d706 --- /dev/null +++ b/meta-oe/recipes-dbs/mysql/mariadb/3871.patch @@ -0,0 +1,29 @@ +From d6923ac0adc11a0364acd421316116190eedb508 Mon Sep 17 00:00:00 2001 +From: Brad Smith +Date: Fri, 7 Mar 2025 02:04:01 -0500 +Subject: [PATCH] Fix building with Clang and GCC on RISC-V + +Clang does not have the builtin __builtin_riscv_pause(). + +Upstream-Status: Backport [https://github.com/MariaDB/server/pull/3871] +Signed-off-by: Khem Raj +--- + include/my_cpu.h | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +--- a/include/my_cpu.h ++++ b/include/my_cpu.h +@@ -97,7 +97,12 @@ static inline void MY_RELAX_CPU(void) + /* Changed from __ppc_get_timebase for musl and clang compatibility */ + __builtin_ppc_get_timebase(); + #elif defined __GNUC__ && defined __riscv +- __builtin_riscv_pause(); ++ /* The GCC-only __builtin_riscv_pause() or the pause instruction is ++ encoded like a fence instruction with special parameters. On RISC-V ++ implementations that do not support arch=+zihintpause this ++ instruction could be interpreted as a more expensive memory fence; ++ it should not be an illegal instruction. */ ++ __asm__ volatile(".long 0x0100000f" ::: "memory"); + #elif defined __GNUC__ + /* Mainly, prevent the compiler from optimizing away delay loops */ + __asm__ __volatile__ ("":::"memory"); From patchwork Tue Apr 8 02:52:05 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 60949 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 183A2C3DA4A for ; Tue, 8 Apr 2025 02:52:17 +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.65705.1744080730545962444 for ; Mon, 07 Apr 2025 19:52:10 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=FmG580A7; 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 d9443c01a7336-2264aefc45dso63715465ad.0 for ; Mon, 07 Apr 2025 19:52:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1744080730; x=1744685530; 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=2hirYTAxwCPJQVbcqY3z8VYiXeHES59ot7pVBmRe0Hc=; b=FmG580A7/ipxqBlzp+rx5w/H5vyOhPmPDOMb7H4whsvii3pr37VHjmuBWKOpUooiM+ ybDCObNKmjgMGgkCJuFj3mpfw5rFVXYMLmC5liF05PJHeia1QRmCXqb+09/ap8bf8+lT 5inOQCnbzRdJqpbgQ2MHY6VCD+CuSrb7tkG7SanfIUzSwOPOCmZoUnW01erTpMq37tKg 0aaPW6n4ez7S8UtrLRe3nfMOJt+Qkg8Hiky28Om6uOUzYvDCwNGzUrOSZrKMyiClqtjp +5zuDIU2S37bWGB2y1iP14mc/dsbpVACupybfsV5ecRYZ+nRHURx14qSMXqUvbJtf3hy RWWA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744080730; x=1744685530; 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=2hirYTAxwCPJQVbcqY3z8VYiXeHES59ot7pVBmRe0Hc=; b=Uk9HWAMiHOt83sElYBvFRZQcEONBVzK++mc32pQAqQ7GOohauhiFkZqD9+2oDPGkDM wWwrXUsQ4/jm+vdsg8PcI4K+Zj6PrjbbS/KIpl6GsBgD5zNjLu6L5tFm3J6XEyEpNvOp 2cKTI4s8Kp8A8n6Al57uaXy/wp0WU9dAMI9vrQ2CXD++KzaUIYJBo1sgYkKsZYVE+n8k pVqv8+Yk1yswx4Ktc/4s5TbkDRFQSzlXQWsLqQwz7kBJQ0MVJhEA+TZ2porTn5PlrKMg QxXCnavj4OlBKIfmD9JaxsT+GN/xcBpi6IXW/XjgRr1p25fafFZlECB2yonInMrn00CP 2hHw== X-Gm-Message-State: AOJu0Yzn9mLasZ01nYUuXmTUSeU2XiyHt8JwuX4YhysZEiGhUIRvtS1x O+bxN8dZ0IEF7qJh/f4mj84OZU/YNxxXcWCs3H9qrg84E2kDSl6Hqjmo0N/q X-Gm-Gg: ASbGncvMeeI5ymCSM7hBZR0ZD7xlpT8PH+W7zh6X/EvbyC/2wNykc5kEuxXVMr/CBnU ABixIWA1jq9vxKB4WT/9T5uIHLbXl8Nkhv7ioCyC2NMgUiIlsZGhrkceKZoyWSTRtVDsftkU2oS 9/ajva0aidRRnG9uHl1StMwpzzHGpKIHZsCsDG27DbihM18ZKjWaJ5CqsWB4ykAfuZeF8wUkbVt dhvtqOxDDajPBlp+Mx6JJuHnL1w2Jg+3lGdUk5FPNx+t75j9pHgnnRPGxvT+JjcGWupmzsJZdDf pWbBi2cfikJjYyDIJ2/D8Jx8c8Rkr/55vCVk X-Google-Smtp-Source: AGHT+IFsHrWWluB9QC7xkYNQwTEquyQqYwRJO5zLOUMsOTL68GinHMeaWQzpvbusCeATm0r6GJ3L/w== X-Received: by 2002:a17:902:e78f:b0:224:26f5:9c1e with SMTP id d9443c01a7336-22a8a84add0mr200116055ad.2.1744080729614; Mon, 07 Apr 2025 19:52:09 -0700 (PDT) Received: from apollo.localdomain ([2601:646:8201:fd20::f900]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-229787728cfsm89057245ad.228.2025.04.07.19.52.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Apr 2025 19:52:09 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Cc: Khem Raj Subject: [meta-oe][PATCH 2/3] mariadb: Fix build on riscv32 Date: Mon, 7 Apr 2025 19:52:05 -0700 Message-ID: <20250408025206.548418-2-raj.khem@gmail.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250408025206.548418-1-raj.khem@gmail.com> References: <20250408025206.548418-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, 08 Apr 2025 02:52:17 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/116683 Signed-off-by: Khem Raj --- meta-oe/recipes-dbs/mysql/mariadb.inc | 1 + .../recipes-dbs/mysql/mariadb/riscv32.patch | 19 +++++++++++++++++++ 2 files changed, 20 insertions(+) create mode 100644 meta-oe/recipes-dbs/mysql/mariadb/riscv32.patch diff --git a/meta-oe/recipes-dbs/mysql/mariadb.inc b/meta-oe/recipes-dbs/mysql/mariadb.inc index eedb6735a4..3a39d036f7 100644 --- a/meta-oe/recipes-dbs/mysql/mariadb.inc +++ b/meta-oe/recipes-dbs/mysql/mariadb.inc @@ -25,6 +25,7 @@ SRC_URI = "https://archive.mariadb.org/${BP}/source/${BP}.tar.gz \ file://0001-Add-missing-includes-cstdint-and-cstdio.patch \ file://0001-Ensure-compatibility-with-ARMv9-by-updating-.arch-di.patch \ file://3871.patch \ + file://riscv32.patch \ " SRC_URI[sha256sum] = "ff6595f8c482f9921e39b97fa1122377a69f0dcbd92553c6b9032cbf0e9b5354" diff --git a/meta-oe/recipes-dbs/mysql/mariadb/riscv32.patch b/meta-oe/recipes-dbs/mysql/mariadb/riscv32.patch new file mode 100644 index 0000000000..24b86584e3 --- /dev/null +++ b/meta-oe/recipes-dbs/mysql/mariadb/riscv32.patch @@ -0,0 +1,19 @@ +Do not use static_cast in C sources + +C compiler does not recognise static_cast which is a C++ keyword +and bails out compiling mysys/my_rdtsc.c, use traditional typecast +instead + +Upstream-Status: Submitted [https://github.com/MariaDB/server/pull/1981/files#r2032207090] +Signed-off-by: Khem Raj +--- a/include/my_rdtsc.h ++++ b/include/my_rdtsc.h +@@ -226,7 +226,7 @@ static inline ulonglong my_timer_cycles( + "sub %0, zero, %0\n" + "and %1, %1, %0\n" + : "=r"(result_hi0), "=r"(result_lo), "=r"(result_hi1)); +- return (static_cast(result_hi1) << 32) | result_lo; ++ return ((ulonglong)result_hi1 << 32) | result_lo; + # else + ulonglong result; + __asm __volatile__("rdtime %0" : "=r"(result)); From patchwork Tue Apr 8 02:52:06 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 60951 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 13A18C36010 for ; Tue, 8 Apr 2025 02:52:17 +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.65706.1744080731497625278 for ; Mon, 07 Apr 2025 19:52:11 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=kYTnsr9s; 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 d9443c01a7336-2240b4de12bso67216225ad.2 for ; Mon, 07 Apr 2025 19:52:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1744080730; x=1744685530; 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=vMuSwuWsuk3Y1s6CmMZi/LH2LCEXqiKbVgVo6z9522s=; b=kYTnsr9sp/9bq6LlXhVPdBKeYqLJOmAZz+sERU0xeL0fRrEdd5O6YJDHjZtcoDujRI zOlF4pLWUE4GtWSj2AtzrDfgwt/f5lZL2We12CBkw5p8q2ZWvWZMOMW1YVrAiOe+dBa9 T9+sn8DNSlLNeJs8MrBi1rd71xaiASDnrDlGtsxyMdrAw9AbVlaFnpo1+HphG4px/P8i XV9xn6JwUSM4DlXx1TDa2+3eS8rSZbunGdohb/ucrlTHGoENKyv07LwXc80qVmm00okx zhHq0vV928xyf7136wnWDX1NMqD3VAyo3piZeHx43vYH9iuk7awNTmgBonHvf+d4RjDG fL2g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744080730; x=1744685530; 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=vMuSwuWsuk3Y1s6CmMZi/LH2LCEXqiKbVgVo6z9522s=; b=m1NzZUWWbDg0M6yQfGfJ+nqu6J/Qf7QE9RPkiJ0Aa0gFRAcWKHW3DAhREKyLzHTPIn lK9u22WMzpFkLXMRdBHSZsynIL4HwH43k8eJ4j7fM47R6ipO3JVasydevzHI+2JXe5Y3 QkX2se3hyCXR0bzKco+8hh40Jh2m8whh6ieEpnl9NfvHLmXebjyaVmi7XsU2sEX0XfjI 7dYMpJRleHa7V/zDRqWBiCvuPZ00W4oK+C+QDwjlShyS5WT1WwjHN/V+wV8ikLLrieAZ 26CW1zKTONRcbY0atYnHMrBOGCR6m8W96AJWQHoeWda1CgmSsAk4P5+HrrwOayhhpi9v DknQ== X-Gm-Message-State: AOJu0Yx5lalraQEpLCd2Girnl3sC+n0R3ng4yNiHnyfFFQwg1GB+YJ53 k/6sJawRNQu/xJoik/PxRBddhTZGGy4uo1wT24TGSi/PL+O8BYPOrwS084X6 X-Gm-Gg: ASbGncs6ftBFEM4sVotriQv/XirMFLbvNS3Xkp6EmnznKig7wHB6rUCSk44tSoOtyzO URIkPU/fUy+fntuWH7zOTwRwBy6DrR28lrDPgPcpUA5EV+8bSnudfEUefKJhb9sG42Ern3g52WG xNiW6eh+c3nT+ra8aw8rQZRBuQ80btOkzGy3tJ9FVh0eC9yA7r9tbmuPQjK+vetJrC6H+QB4Lno Tmip/OqBdzDLH0P6K/0sugySQkXWVFMVLIxrW7ci4xkEfXWmdrgKdpWVwfucW4bktHjGzgxkm9L pX7DTYdkO0A6AroSKm06z57/JUxBUmYR1KhZTvkZtyKbVjw= X-Google-Smtp-Source: AGHT+IFP2sTWDB7m1OfyW2PNn088RgSV2+0Fpoise0kJUpaN3msGGdbby5WEW1Gp7m3DMbyGaCMW7g== X-Received: by 2002:a17:902:fc4e:b0:223:5c33:56a8 with SMTP id d9443c01a7336-22a8a0a37c0mr239045075ad.35.1744080730458; Mon, 07 Apr 2025 19:52:10 -0700 (PDT) Received: from apollo.localdomain ([2601:646:8201:fd20::f900]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-229787728cfsm89057245ad.228.2025.04.07.19.52.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Apr 2025 19:52:10 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Cc: Khem Raj Subject: [meta-oe][PATCH 3/3] webkitgtk3: Fix build break due to a typo Date: Mon, 7 Apr 2025 19:52:06 -0700 Message-ID: <20250408025206.548418-3-raj.khem@gmail.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250408025206.548418-1-raj.khem@gmail.com> References: <20250408025206.548418-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, 08 Apr 2025 02:52:17 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/116684 Also fix building on riscv64 Signed-off-by: Khem Raj --- .../webkitgtk3/fix-ftbfs-riscv64.patch | 39 +++++++++++++++++++ .../fix-typo-denormaldisabler.patch | 18 +++++++++ .../webkitgtk/webkitgtk3_2.48.1.bb | 2 + 3 files changed, 59 insertions(+) create mode 100644 meta-oe/recipes-support/webkitgtk/webkitgtk3/fix-ftbfs-riscv64.patch create mode 100644 meta-oe/recipes-support/webkitgtk/webkitgtk3/fix-typo-denormaldisabler.patch diff --git a/meta-oe/recipes-support/webkitgtk/webkitgtk3/fix-ftbfs-riscv64.patch b/meta-oe/recipes-support/webkitgtk/webkitgtk3/fix-ftbfs-riscv64.patch new file mode 100644 index 0000000000..00347ef3e1 --- /dev/null +++ b/meta-oe/recipes-support/webkitgtk/webkitgtk3/fix-ftbfs-riscv64.patch @@ -0,0 +1,39 @@ +From: Alberto Garcia +Description: Use WTF_CPU_UNKNOWN when building for riscv64 + WebKitGTK doesn't build on riscv64 even with the JIT disabled. + Treating the CPU as unknown is perhaps a bit severe, but it allows us + to get the build done until someone steps up to maintain this + properly. +Bug: https://bugs.webkit.org/show_bug.cgi?id=271371 +Forwarded: no + +Upstream-Status: Pending +Signed-off-by: Khem Raj +--- a/Source/WTF/wtf/PlatformCPU.h ++++ b/Source/WTF/wtf/PlatformCPU.h +@@ -286,14 +286,6 @@ + + #endif /* ARM */ + +-/* CPU(RISCV64) - RISC-V 64-bit */ +-#if defined(__riscv) \ +- && defined(__riscv_xlen) \ +- && (__riscv_xlen == 64) +-#define WTF_CPU_RISCV64 1 +-#define WTF_CPU_KNOWN 1 +-#endif +- + #if !CPU(KNOWN) + #define WTF_CPU_UNKNOWN 1 + #endif +--- a/Source/cmake/WebKitCommon.cmake ++++ b/Source/cmake/WebKitCommon.cmake +@@ -125,8 +125,6 @@ if (NOT HAS_RUN_WEBKIT_COMMON) + set(WTF_CPU_PPC64 1) + elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "ppc64le") + set(WTF_CPU_PPC64LE 1) +- elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "^riscv64") +- set(WTF_CPU_RISCV64 1) + elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "^loongarch64") + set(WTF_CPU_LOONGARCH64 1) + else () diff --git a/meta-oe/recipes-support/webkitgtk/webkitgtk3/fix-typo-denormaldisabler.patch b/meta-oe/recipes-support/webkitgtk/webkitgtk3/fix-typo-denormaldisabler.patch new file mode 100644 index 0000000000..c3383fcd41 --- /dev/null +++ b/meta-oe/recipes-support/webkitgtk/webkitgtk3/fix-typo-denormaldisabler.patch @@ -0,0 +1,18 @@ +From: Alberto Garcia +Subject: Fix build failure due to missing semicolon + +Source: https://sources.debian.org/data/main/w/webkit2gtk/2.48.1-2/debian/patches/fix-typo-denormaldisabler.patch + +Upstream-Status: Pending +Signed-off-by: Khem Raj +--- a/Source/WebCore/platform/audio/DenormalDisabler.cpp ++++ b/Source/WebCore/platform/audio/DenormalDisabler.cpp +@@ -91,7 +91,7 @@ DenormalDisabler::~DenormalDisabler() + } + } + #else +-DenormalDisabler::DenormalDisabler() = default ++DenormalDisabler::DenormalDisabler() = default; + DenormalDisabler::~DenormalDisabler() = default; + #endif + diff --git a/meta-oe/recipes-support/webkitgtk/webkitgtk3_2.48.1.bb b/meta-oe/recipes-support/webkitgtk/webkitgtk3_2.48.1.bb index 14dc3a841d..b03ed3cbb9 100644 --- a/meta-oe/recipes-support/webkitgtk/webkitgtk3_2.48.1.bb +++ b/meta-oe/recipes-support/webkitgtk/webkitgtk3_2.48.1.bb @@ -19,6 +19,8 @@ SRC_URI = "https://www.webkitgtk.org/releases/webkitgtk-${PV}.tar.xz \ file://no-musttail-arm.patch \ file://sys_futex.patch \ file://0001-Fix-build-errors-on-RISCV-https-bugs.webkit.org-show.patch \ + file://fix-typo-denormaldisabler.patch \ + file://fix-ftbfs-riscv64.patch \ " SRC_URI[sha256sum] = "98efdf21c4cdca0fe0b73ab5a8cb52093b5aa52d9b1b016a93f71dbfa1eb258f"