From mboxrd@z Thu Jan 1 00:00:00 1970 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 smtp3.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id F086DC61DC2 for ; Thu, 27 Aug 2026 07:07:21 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id D285B60774; Thu, 27 Aug 2026 07:07:19 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id 1VYQyXIIckSH; Thu, 27 Aug 2026 07:07:17 +0000 (UTC) X-Comment: SPF check N/A for local connections - client-ip=140.211.166.142; helo=lists1.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=buildroot.org; s=default; t=1787814437; bh=0EgZIcWUDaynSTloSRCOIzCgkxzVQeXiAGB+CSpTvLA=; h=To:Cc:Date:Subject:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From:Reply-To:From; b=iT6bv+M2FJUGsGm/892DZdB9VhAPLs4fQ/CFtkTi5HLxo5aueuL9m+aeExErj6CV3 7grR4c7DIoghkYri4ySpJoT/m6qKA8J0o+5ERMx+M7Rs3Gx8r+04By/G4qwBtEa5GU Fgjkm1k0A/nfL0DmH+yHz2gTHXMwE+AO9L2aELA9ga6Gp3CnUmCvQE1s2FT+5urtqE +BDQoPWuIWU8q5soqXSKaYZtZk787MvcP84Bwpm20KSD0yZB4H7Y5aSzlZa/FKkBWc kZAkIqQsj2o0Q9mYXpiJUt4gmSC7p5ZN4UvpFFBEY2x1SLJPOiQ5Sn3Qutc7zCG7XD AgNBdRGqCwRsw== Received: from lists1.osuosl.org (lists1.osuosl.org [140.211.166.142]) by smtp3.osuosl.org (Postfix) with ESMTP id 7A36E605E7; Thu, 27 Aug 2026 07:07:17 +0000 (UTC) Received: from smtp1.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by lists1.osuosl.org (Postfix) with ESMTP id B0D05230 for ; Thu, 27 Aug 2026 07:07:15 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id 90FE2807F2 for ; Thu, 27 Aug 2026 07:07:15 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id NpvRouGEH7sT for ; Thu, 27 Aug 2026 07:07:14 +0000 (UTC) Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=185.246.84.56; helo=smtpout-02.galae.net; envelope-from=thomas.petazzoni@bootlin.com; receiver= Received: from smtpout-02.galae.net (smtpout-02.galae.net [185.246.84.56]) by smtp1.osuosl.org (Postfix) with ESMTPS id 2F43F807E1 for ; Thu, 27 Aug 2026 07:07:12 +0000 (UTC) Received: from smtpout-01.galae.net (smtpout-01.galae.net [212.83.139.233]) by smtpout-02.galae.net (Postfix) with ESMTPS id B7A8C1A185E; Thu, 27 Aug 2026 07:07:09 +0000 (UTC) Received: from mail.galae.net (mail.galae.net [212.83.136.155]) by smtpout-01.galae.net (Postfix) with ESMTPS id 8C7AF602B8; Thu, 27 Aug 2026 07:07:09 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) by localhost (Mailerdaemon) with ESMTPSA id B48A011C78051; Thu, 27 Aug 2026 09:07:03 +0200 (CEST) To: buildroot@buildroot.org Cc: Thomas Petazzoni , Julien Olivain Date: Thu, 27 Aug 2026 09:07:00 +0200 Message-ID: <20260827070701.1001372-1-thomas.petazzoni@bootlin.com> X-Mailer: git-send-email 2.55.0 MIME-Version: 1.0 X-Last-TLS-Session-Version: TLSv1.3 Subject: [Buildroot] [PATCH] package/fluidsynth: fix download-while-configure since 2.5.7 bump X-BeenThere: buildroot@buildroot.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , From: Thomas Petazzoni via buildroot Reply-To: Thomas Petazzoni Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" Since commit 566bdcb97f5706aa08f40a88e4728e4a0bed8257 ("package/fluidsynth: security bump to version 2.5.7"), fluidsynth tries to download some "gcem" code during its configure step, which not violates Buildroot's policies, but also breaks the build if network is not available during the build. To fix this, we add an EXTRA_DOWNLOADS to grab gcem and extract it at the right place. Some minor fix (submitted upstream) is needed to ensure the FindGCEM.cmake logic properly finds that gcem is already in the source tree. Fixes: https://autobuild.buildroot.net/results/048df28f6ab97a16731e62d7f56c6eba565cda63/ Signed-off-by: Thomas Petazzoni --- ...-finding-bundled-GCEM-with-a-sysroot.patch | 41 +++++++++++++++++++ package/fluidsynth/fluidsynth.hash | 1 + package/fluidsynth/fluidsynth.mk | 12 ++++++ 3 files changed, 54 insertions(+) create mode 100644 package/fluidsynth/0001-cmake-fix-finding-bundled-GCEM-with-a-sysroot.patch diff --git a/package/fluidsynth/0001-cmake-fix-finding-bundled-GCEM-with-a-sysroot.patch b/package/fluidsynth/0001-cmake-fix-finding-bundled-GCEM-with-a-sysroot.patch new file mode 100644 index 0000000000..66f5224847 --- /dev/null +++ b/package/fluidsynth/0001-cmake-fix-finding-bundled-GCEM-with-a-sysroot.patch @@ -0,0 +1,41 @@ +From f558b8656efe8bba7dd94f4acfceb1294a7ded22 Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni +Date: Thu, 27 Aug 2026 08:59:32 +0200 +Subject: [PATCH] cmake: fix finding bundled GCEM with a sysroot + +CMAKE_FIND_ROOT_PATH_MODE_INCLUDE may be set to ONLY when cross +compiling, to ensure that header searches use the target sysroot +instead of accidentally finding host headers. + +This causes find_path() to re-root the absolute path to the bundled +GCEM headers under the target sysroot, making FindGCEM miss +gcem/include/gcem.hpp in situations where +CMAKE_FIND_ROOT_PATH_MODE_INCLUDE is set to ONLY. + +To fix this, this commit passes NO_CMAKE_FIND_ROOT_PATH to prevent +sysroot re-rooting when searching this source-tree path. It allows to +properly detected gcem/include/gcem.hpp and avoid the download if +already present. + +Upstream: https://github.com/FluidSynth/fluidsynth/pull/1835 +Signed-off-by: Thomas Petazzoni +--- + cmake_admin/FindGCEM.cmake | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/cmake_admin/FindGCEM.cmake b/cmake_admin/FindGCEM.cmake +index 980951cc..e02d97f8 100644 +--- a/cmake_admin/FindGCEM.cmake ++++ b/cmake_admin/FindGCEM.cmake +@@ -23,7 +23,7 @@ This will define the following variables: + #]=======================================================================] + + # Find the headers and library +-find_path(GCEM_INCLUDE_DIR NAMES "gcem.hpp" PATHS "${CMAKE_CURRENT_SOURCE_DIR}/gcem/include") ++find_path(GCEM_INCLUDE_DIR NAMES "gcem.hpp" PATHS "${CMAKE_CURRENT_SOURCE_DIR}/gcem/include" NO_CMAKE_FIND_ROOT_PATH) + + include(FindPackageHandleStandardArgs) + +-- +2.55.0 + diff --git a/package/fluidsynth/fluidsynth.hash b/package/fluidsynth/fluidsynth.hash index 0d727e75e6..1e15d48d0d 100644 --- a/package/fluidsynth/fluidsynth.hash +++ b/package/fluidsynth/fluidsynth.hash @@ -1,3 +1,4 @@ # Locally computed sha256 ce27840221ab00dd59bf27e85ecbba480c6c2a7c9fbec4243658f68f59c07f4a fluidsynth-2.5.7.tar.gz +sha256 34ab0ee87a9eb26d3087fa9b49c2572ea8ee03db0c9705b83648301a3a3fc172 gcem-012ae73c6d0a2cb09ffe86475f5c6fba3926e200.tar.gz sha256 20e50fe7aae3e56378ebf0417d9de904f55a0e61e4df315333e632a4d3555d95 LICENSE diff --git a/package/fluidsynth/fluidsynth.mk b/package/fluidsynth/fluidsynth.mk index 1d6cb118ff..1e6043e6b8 100644 --- a/package/fluidsynth/fluidsynth.mk +++ b/package/fluidsynth/fluidsynth.mk @@ -12,6 +12,18 @@ FLUIDSYNTH_CPE_ID_VENDOR = fluidsynth FLUIDSYNTH_INSTALL_STAGING = YES FLUIDSYNTH_DEPENDENCIES = libglib2 +FLUIDSYNTH_GCEM_VERSION = 012ae73c6d0a2cb09ffe86475f5c6fba3926e200 +FLUIDSYNTH_EXTRA_DOWNLOADS = $(call github,kthohr,gcem,$(FLUIDSYNTH_GCEM_VERSION))/gcem-$(FLUIDSYNTH_GCEM_VERSION).tar.gz + +define FLUIDSYNTH_GCEM_EXTRACT + $(call suitable-extractor,$(notdir $(FLUIDSYNTH_EXTRA_DOWNLOADS))) \ + $(FLUIDSYNTH_DL_DIR)/$(notdir $(FLUIDSYNTH_EXTRA_DOWNLOADS)) | \ + $(TAR) -C $(@D)/ $(TAR_OPTIONS) - + rmdir $(@D)/gcem + ln -sf gcem-$(FLUIDSYNTH_GCEM_VERSION) $(@D)/gcem +endef +FLUIDSYNTH_POST_EXTRACT_HOOKS += FLUIDSYNTH_GCEM_EXTRACT + ifeq ($(BR2_PACKAGE_FLUIDSYNTH_ALSA_LIB),y) FLUIDSYNTH_CONF_OPTS += -Denable-alsa=1 FLUIDSYNTH_DEPENDENCIES += alsa-lib -- 2.55.0 _______________________________________________ buildroot mailing list buildroot@buildroot.org https://lists.buildroot.org/mailman/listinfo/buildroot