From patchwork Wed May 1 12:00:49 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dario Binacchi X-Patchwork-Id: 3084 Return-Path: X-Original-To: linux-amarula@patchwork.amarulasolutions.com Delivered-To: linux-amarula@patchwork.amarulasolutions.com Received: from mail-ed1-f71.google.com (mail-ed1-f71.google.com [209.85.208.71]) by ganimede.amarulasolutions.com (Postfix) with ESMTPS id 4973C3F1F7 for ; Wed, 1 May 2024 14:00:57 +0200 (CEST) Received: by mail-ed1-f71.google.com with SMTP id 4fb4d7f45d1cf-572a200a67fsf705920a12.0 for ; Wed, 01 May 2024 05:00:57 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1714564857; cv=pass; d=google.com; s=arc-20160816; b=vdJBX03A/owyjqQuh4Ub8eGWQbJ8O3lbO4T/OYr6L3T7fi7sgVca2jR5KjyqPlV/V0 7lvOPCBLo3OMLbUFNcEcUxLm9dxoXodjf4r+qyJbmqOzSbvXD35udllr4xI5fCnYFUbj 6GMGPXH8C/LyeUAsiN1tHOjONh7Y3VpLe3L61yQkqHXL4SQFdAQsj0hg4oLFprScgzDj jXS0AF6MHs8OOg36122kWt809RWKYPoB4AquJQ6wiPBE29ID8aWntls7TQ4YaxFe74n3 0ORUryfcyOoOvCBKsckjnEtnenTliJ3UrQpzbIdI5p2lNRSCJk7SbsYRibC/YYutckvK BxTQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-archive:list-help:list-post:list-id :mailing-list:precedence:mime-version:message-id:date:subject:cc:to :from:dkim-signature; bh=aC0VWKw70peCqvcR65BVAxE9I5nt1vx7S9WZmr6BVwE=; fh=99aKHjk/2NV/ygAA/qXdRL7TTO9okF1jnBUse7+3rik=; b=ON9MifEGJ5k4nhOiwa/9YB5lhXTqdKGnnKXYN5okuWsBBiGEa53tdsvWqULcDxMWem FjqPpNAwT5m9jnkkvuw8CgFqYO/f5Mo/CqgIGfWuSKbwXm9U2LNeCxngm1gg88onOgEa jj5SbzfF754eUBIuqWB9Td47ZCllRJ77K+mmNAI23WB+tBRzSWhdtpYzDnF0Nq8b76Kr 2UE+JM4ThS6vLE7w6nHkZfTnhwVrKPABMII6HXbr5X7DOZceamBNMkR53TPA7vMYfa+5 v/tIyTMGmgvpAaTq5mS7JMtfQ3yDk1cHH8Ea/BSvw3MvS+PeP3/e/HvCU4fLvcBzwwPR jPIQ==; darn=patchwork.amarulasolutions.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=OYHszmWK; spf=pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=dario.binacchi@amarulasolutions.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=amarulasolutions.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions.com; s=google; t=1714564857; x=1715169657; darn=patchwork.amarulasolutions.com; h=list-unsubscribe:list-archive:list-help:list-post:list-id :mailing-list:precedence:x-original-authentication-results :x-original-sender:mime-version:message-id:date:subject:cc:to:from :from:to:cc:subject:date:message-id:reply-to; bh=aC0VWKw70peCqvcR65BVAxE9I5nt1vx7S9WZmr6BVwE=; b=RZckuP0aLV+SLkj2exgRQbCCsKlX37S1DIKBEdzxExTyL3RJQ+UGDs450i9n2MS26h GFo7TBJwiNuqPLUVXljSInzN92OxysmHOhl9PV5frwPgg+7A4+mykP5c2/aCmWqBydnk gcP9J57Obzfg4ccFWC+OKlwfmYXON5yHx76Z8= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1714564857; x=1715169657; h=list-unsubscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence :x-original-authentication-results:x-original-sender:mime-version :message-id:date:subject:cc:to:from:x-beenthere:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=aC0VWKw70peCqvcR65BVAxE9I5nt1vx7S9WZmr6BVwE=; b=vW+OfWCDZ/jB3ALjm1Dq6aUENE8EpxONXG/Dyhu3578SWhPwNeE6d34+6Boqk9PyzQ tbMZ6Vf2QUTqbe3WIIgtSOfhkPbi6EbN94O+LPqRTSEhv2qbQKAx85LL8oiT6t3/hBbW /6o/0vs07DAkKFPtIOfbycnVh0KSHkMUpOzpAAAv3AWctTG16EZeDgc042CQ+1e8OfJp Flu+eHIy55IF/ZVKD0dvx2ZvYJ+ce0V2ypFIO2xMeGn2JOgNaOKoCiZOn8Py3kwKpDpJ DwQ8AwahFu+3sm4slC1FGi+n9ffZDph6IjUg3bo6GQKaigPBTh06HIp5ZcSzZ7GwvVeA AWfQ== X-Forwarded-Encrypted: i=2; AJvYcCXEIin8i8H/5H3zo5sCJ/UtRcr7321c7Nn+Iwqk0efzSJ6RTIe7DgWcIxyHTG62yc/es6XK8ymX1rlcMo/EWs9NaLTadVupQ87lzY469Y/pA4bNXCo3g8aiJrMVtw== X-Gm-Message-State: AOJu0YwiD5xwi1d0k8X2DeWvNk3Ix6T7FU7lTD/sHM8Any2yEOIA5xGR 23IGsHkxewEqqPMp1Gp/cka5KGAxyWSwPLJKm5Q7fpFdomsc9sU1ekOA0FyAfHwSRA== X-Google-Smtp-Source: AGHT+IHJvWMWsarMruKAdjBciDc4ImkgZxKr3hbZ44+HvOUNrqCtQ3mRaOgpGfXMyS1Z2Wi443T/4w== X-Received: by 2002:a50:9f2e:0:b0:572:a1fe:7d0b with SMTP id b43-20020a509f2e000000b00572a1fe7d0bmr2361987edf.7.1714564856547; Wed, 01 May 2024 05:00:56 -0700 (PDT) X-BeenThere: linux-amarula@amarulasolutions.com Received: by 2002:a05:6402:3985:b0:572:3ac4:56ed with SMTP id 4fb4d7f45d1cf-5723b8d77ccls929563a12.0.-pod-prod-00-eu; Wed, 01 May 2024 05:00:55 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUie87ddyGUrI4bGpzCuOTkcuLvRsxrKt5Zwmw2lg5Z9thAHgbGXN3aIRnjS/vHpy5AIyBsyZMdVoYfL3HvRdgb/y2QYPScbtf/H3t2H25tBTQD X-Received: by 2002:a17:906:c144:b0:a58:7ddf:1805 with SMTP id dp4-20020a170906c14400b00a587ddf1805mr6576396ejc.7.1714564854690; Wed, 01 May 2024 05:00:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1714564854; cv=none; d=google.com; s=arc-20160816; b=QIkdaz6N8B7iDreQ7JJiraMTSpmLcmJJ28NOcW/lSoWU94K936bX4wzsBdJxX2HU1n 5l3pCbw8sfm3vZ/ZKccIAcvrhL1lvV80Kk9RfGhuZZQG3w5Os4yuaEm7tQBZiuc7sbgQ hbkc2YgRz9K3IFby3t7qMHrWle75jfkG6Ll2t4zIw5wD7HOz1aQ6h+aZ/sEADB1zs7Pb ablWzznhrSSRqlvlqhOZTE0C6JxmCaUA7xzQNzuIperjlHQBscJuX0yJLn2WooTtSbaE zusJEEOuGi+M31gUjBs3E3IWEldR99R7AJrfyhbbnfr1Kf2L+fM9bzQpIjmeU9vW6e5y /ypw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:dkim-signature; bh=5dld5unzAnrICLjw0rhb2ZmS+jeAX0qBbHLVbDywQJY=; fh=gkDTkhNv+PMPxQVvOioPAc00CUT0nwcMNuvvXM9yZAY=; b=d51ReGNsT7ptgNL79fCkXwujWHHVrdBlQB389zvvLDR/okREeZGkt/hpMKZ+uBhQmd rAyRZAXjh0LI0KBunG7kSKnPR9HHwBykkEx/lA44JQJ7Upb0FJvuSB3XAcOqO41LY0dQ 4wyY7IGz0k3TIAI5ONDsfMSo51xkYVmDyWe6XiqZO/z9VKbqsQi0JwD7kndOR+FtzjnY qwVHl7tWZFTW6WzeQOTyxTScF8nX7imkio9FOM8fDZPPJkv/jI3tiJ0w2gv/NIUAXIop GRtntT0qNWkUJBAtY1NNshdjlajQowEERjnWR8evpEOx8ZR9epSnH7ztLWTZZe23eoCF Bu2Q==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=OYHszmWK; spf=pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=dario.binacchi@amarulasolutions.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=amarulasolutions.com Received: from mail-sor-f41.google.com (mail-sor-f41.google.com. [209.85.220.41]) by mx.google.com with SMTPS id o25-20020a170906289900b00a51a28391c0sor419438ejd.4.2024.05.01.05.00.54 for (Google Transport Security); Wed, 01 May 2024 05:00:54 -0700 (PDT) Received-SPF: pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) client-ip=209.85.220.41; X-Forwarded-Encrypted: i=1; AJvYcCWTV4So8H9Ki7NjxrZ8y7Yhp4NjWhZHBAvvSQGHWY75a4qcvAc8n4cFO6XJlwbiyDvGGEoyP7FzSzoyt4hk/oYoVJ9NwtYvRTrQrtbMayxjysLr X-Received: by 2002:a17:906:3111:b0:a58:c4f9:a2f7 with SMTP id 17-20020a170906311100b00a58c4f9a2f7mr5123174ejx.2.1714564854073; Wed, 01 May 2024 05:00:54 -0700 (PDT) Received: from dario-ThinkPad-T14s-Gen-2i.amarulasolutions.com (host-87-8-99-67.retail.telecomitalia.it. [87.8.99.67]) by smtp.gmail.com with ESMTPSA id y9-20020a50eb09000000b005727bdb1eafsm3973689edp.40.2024.05.01.05.00.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 May 2024 05:00:53 -0700 (PDT) From: Dario Binacchi To: buildroot@buildroot.org Cc: Romain Naour , michael@amarulasolutions.com, linux-amarula@amarulasolutions.com, Dario Binacchi Subject: [PATCH 1/2] package/qemu: fix disabling fp-bench test compilation Date: Wed, 1 May 2024 14:00:49 +0200 Message-ID: <20240501120050.670109-1-dario.binacchi@amarulasolutions.com> X-Mailer: git-send-email 2.43.0 MIME-Version: 1.0 X-Original-Sender: dario.binacchi@amarulasolutions.com X-Original-Authentication-Results: mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=OYHszmWK; spf=pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=dario.binacchi@amarulasolutions.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=amarulasolutions.com Content-Type: text/plain; charset="UTF-8" Precedence: list Mailing-list: list linux-amarula@amarulasolutions.com; contact linux-amarula+owners@amarulasolutions.com List-ID: X-Spam-Checked-In-Group: linux-amarula@amarulasolutions.com X-Google-Group-Id: 476853432473 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , With the bump to version 8.1.1, the patch that disabled the compilation of the fp-bench test is no longer applicable, even though the package compilation process does not report any errors in applying the patch itself. The new patch does not disable the test by default but only if the file fenv.h is not missing, with the hope that this approach will be considered acceptable by the maintainer and merged upstream. The patch is an adaptation of the one sent upstream. Signed-off-by: Dario Binacchi --- .checkpackageignore | 2 +- ...fp-disable-fp-bench-build-by-default.patch | 28 ----------- ...on-t-build-fp-bench-test-if-fenv.h-i.patch | 49 +++++++++++++++++++ 3 files changed, 50 insertions(+), 29 deletions(-) delete mode 100644 package/qemu/0001-tests-fp-disable-fp-bench-build-by-default.patch create mode 100644 package/qemu/0001-tests-fp-meson-don-t-build-fp-bench-test-if-fenv.h-i.patch diff --git a/.checkpackageignore b/.checkpackageignore index 1b336ce7a3ee..c16e17cc35e4 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -1073,7 +1073,7 @@ package/python3/0028-fix-building-on-older-distributions.patch lib_patch.Upstrea package/python3/0029-configure.ac-fixup-CC-print-multiarch-output-for-mus.patch lib_patch.Upstream package/python3/0030-Add-an-option-to-disable-the-berkeleydb-module.patch lib_patch.Upstream package/python3/0031-lib-crypt-uClibc-ng-doesn-t-set-errno-when-encryptio.patch lib_patch.Upstream -package/qemu/0001-tests-fp-disable-fp-bench-build-by-default.patch lib_patch.Upstream +package/qemu/0001-tests-fp-meson-don-t-build-fp-bench-test-if-fenv.h-i.patch lib_patch.Upstream package/qemu/0002-softmmu-qemu-seccomp.c-add-missing-header-for-CLONE_.patch lib_patch.Upstream package/qextserialport/0001-Create-a-main-include-file-QExtSerialPort.patch lib_patch.Upstream package/qextserialport/0002-Tell-qmake-to-add-a-pkgconfig-file-to-ease-usage-wit.patch lib_patch.Upstream diff --git a/package/qemu/0001-tests-fp-disable-fp-bench-build-by-default.patch b/package/qemu/0001-tests-fp-disable-fp-bench-build-by-default.patch deleted file mode 100644 index fb7a9a69897b..000000000000 --- a/package/qemu/0001-tests-fp-disable-fp-bench-build-by-default.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 83d976d6d7f0357659d5daa0f01c52048a609e88 Mon Sep 17 00:00:00 2001 -From: Romain Naour -Date: Wed, 25 Aug 2021 21:55:53 +0200 -Subject: [PATCH] tests/fp: disable fp-bench build by default - -Fixes: -https://lists.nongnu.org/archive/html/qemu-devel/2021-03/msg00947.html - -Signed-off-by: Romain Naour ---- - tests/fp/meson.build | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/tests/fp/meson.build b/tests/fp/meson.build -index 8bd0979f67..2fe019d2c6 100644 ---- a/tests/fp/meson.build -+++ b/tests/fp/meson.build -@@ -640,6 +640,7 @@ fpbench = executable( - dependencies: [qemuutil], - include_directories: [sfinc, include_directories(tfdir)], - c_args: fpcflags, -+ build_by_default: false, - ) - - fptestlog2 = executable( --- -2.35.1 - diff --git a/package/qemu/0001-tests-fp-meson-don-t-build-fp-bench-test-if-fenv.h-i.patch b/package/qemu/0001-tests-fp-meson-don-t-build-fp-bench-test-if-fenv.h-i.patch new file mode 100644 index 000000000000..836754ba231a --- /dev/null +++ b/package/qemu/0001-tests-fp-meson-don-t-build-fp-bench-test-if-fenv.h-i.patch @@ -0,0 +1,49 @@ +From b4a692f46135af1011bf0adbfeb19abf354ca191 Mon Sep 17 00:00:00 2001 +From: Dario Binacchi +Date: Tue, 30 Apr 2024 09:40:55 +0200 +Subject: [PATCH] tests/fp/meson: don't build fp-bench test if fenv.h is + missing + +The fp-bench test (i. e. tests/fp/fp-bench.c) use fenv.h that is not +always provided by the libc (uClibc). The patch disables its compilation +in case the header is not available. + +The patch is based on a suggestion from Paolo Bonzini, which you can +find at the following link. + +Link: https://lists.nongnu.org/archive/html/qemu-devel/2021-03/msg00492.html +Suggested-by: Paolo Bonzini +Signed-off-by: Dario Binacchi +[Upstream status: https://patchwork.ozlabs.org/project/qemu-devel/patch/20240430164752.645521-1-dario.binacchi@amarulasolutions.com/] +--- + tests/fp/meson.build | 14 ++++++++------ + 1 file changed, 8 insertions(+), 6 deletions(-) + +diff --git a/tests/fp/meson.build b/tests/fp/meson.build +index cbc17392d678..cd052667e940 100644 +--- a/tests/fp/meson.build ++++ b/tests/fp/meson.build +@@ -126,12 +126,14 @@ test('fp-test-mulAdd', fptest, + ['f16_mulAdd', 'f32_mulAdd', 'f64_mulAdd', 'f128_mulAdd'], + suite: ['softfloat-slow', 'softfloat-ops-slow', 'slow'], timeout: 90) + +-executable( +- 'fp-bench', +- ['fp-bench.c', '../../fpu/softfloat.c'], +- dependencies: [qemuutil, libtestfloat, libsoftfloat], +- c_args: fpcflags, +-) ++if cc.has_header('fenv.h') ++ executable( ++ 'fp-bench', ++ ['fp-bench.c', '../../fpu/softfloat.c'], ++ dependencies: [qemuutil, libtestfloat, libsoftfloat], ++ c_args: fpcflags, ++ ) ++endif + + fptestlog2 = executable( + 'fp-test-log2', +-- +2.43.0 +