From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id YC27L6Z+WGRvdQAASxT56A (envelope-from ) for ; Mon, 08 May 2023 06:46:30 +0200 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id gBC4L6Z+WGRHjAAA9RJhRA (envelope-from ) for ; Mon, 08 May 2023 06:46:30 +0200 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 50C2E26B57 for ; Mon, 8 May 2023 06:46:30 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pvslD-00007v-5w; Mon, 08 May 2023 00:46:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pvsl9-00007l-Hq for guix-patches@gnu.org; Mon, 08 May 2023 00:46:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pvsl8-0002D6-PY for guix-patches@gnu.org; Mon, 08 May 2023 00:46:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pvsl8-0003Kg-LC for guix-patches@gnu.org; Mon, 08 May 2023 00:46:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63355] [PATCH] gnu: kodi: Fix build with latest glibc. Resent-From: Eric Bavier Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 08 May 2023 04:46:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 63355 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 63355@debbugs.gnu.org Cc: rekado@elephly.net, Eric Bavier X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.168352115312789 (code B ref -1); Mon, 08 May 2023 04:46:02 +0000 Received: (at submit) by debbugs.gnu.org; 8 May 2023 04:45:53 +0000 Received: from localhost ([127.0.0.1]:38816 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pvsky-0003KC-Pv for submit@debbugs.gnu.org; Mon, 08 May 2023 00:45:53 -0400 Received: from lists.gnu.org ([209.51.188.17]:56404) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pvskw-0003K2-On for submit@debbugs.gnu.org; Mon, 08 May 2023 00:45:51 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pvskv-00005O-NV for guix-patches@gnu.org; Mon, 08 May 2023 00:45:50 -0400 Received: from mout02.posteo.de ([185.67.36.66]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pvskr-00027X-G4 for guix-patches@gnu.org; Mon, 08 May 2023 00:45:48 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id 079DF240271 for ; Mon, 8 May 2023 06:45:40 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1683521140; bh=n5ENVrOSXwjzwQLY+jNztIS81BmCP2jCSDpdU2tLymY=; h=From:To:Cc:Subject:Date:From; b=KLRy5b+2Sy/BZgm5rqhJBU6hqHCl4xtWPKB4f/3aiuchky4Ym5ljyXmsdfRYar7TL 4phaDTS5qbetPR4y3m4pvTD4K00DIdbA6B9NHMgtnzSUQQ5zBHPyh/sqM1BF4SIDOL xSJXVRD9X+utrVDWsnacIGqLM4UKjMzD6JKMytxdGxSvysu6+yEV3WALDGlzpUA+Jw kV7X/0FiyamHjw9XVcjDNCXn+wxRA2CNGAu/e1f9D3MS3MlNECdbkSDxhntt4h6j+T 0+NaqG0M/aTyaS456/2LXqJC0NocuChZ4AblhGkBS453cDF52viSa9ZjB+mEOTR2Wx lB6isXRlTdBfQ== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4QF7yV5FX2z9rxF; Mon, 8 May 2023 06:45:38 +0200 (CEST) From: Eric Bavier Date: Mon, 8 May 2023 04:45:02 +0000 Message-Id: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=185.67.36.66; envelope-from=bavier@posteo.net; helo=mout02.posteo.de X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN ARC-Seal: i=1; s=key1; d=yhetil.org; t=1683521190; a=rsa-sha256; cv=none; b=LpW5KzXio/5V+ZuZfuTQHtbL8SIYaAAsxg0mx8rUoo9OSpprc2njjc3TpoJg9V2C9c54w2 Dc5G9qhptRTY44uM6+jbbhkYm6Iak9+r3hEicyG42F5y49KJKcRkIRsU5xCGXUWS4GZvyd CDkKW7mSP+0k/GtDf4oS2Z6ciOzDsLMcPZuIp2FJ6KGiuO2DiHCxotBBf0oF2VXLdlYiTd OBxgdlfB7tsDSIJOfR6x0rEf/ZnKscH4Ns6dHqsaD+U5J+ncYWdFQ0pucuNWQDV9mmxpDx UHrUOgOP9qJIKF+OBcnYzHnq1L7+CcY2tqiIAx1f2AznlQQ26tnOBEJy9e0B4w== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=posteo.net header.s=2017 header.b=KLRy5b+2; dmarc=fail reason="SPF not aligned (strict)" header.from=posteo.net (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1683521190; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:list-id:list-help: list-unsubscribe:list-subscribe:list-post:dkim-signature; bh=O0U0BS/F0iJNM+cyQetFruxSo0wFvYCcpnuvoTXIOmI=; b=gj6x7MedPw6xLCbUnDdPN6f58U9FIkd47t0gxqXmwknCP/46B0iW3Z+eC5LBk6bwxMmzhi ZzFbtoIDRH2J4KaSPGsnEYUnBp7AcP7SarPR650wkjQ/wTsQ2MxGNe9lrMhyP8UfFQM+fC q9rVDEgR9nY0d6t/bhHDpQlWHwwI3+cmd++EgRiaLIF6BmfUippRCf4sjGDhxZiuvb0LhM RG2GXZfGlyRkTwH1YE9bo3d8Jzpsmjw9BQpRWV2NqBP1zGy+ZrQOMWStvZE8hUivkyaf7J ze8W5V9UQyNh9TUwSICwTk9e/jjGNHOULDf8foCd19Asn+E6iQbLNUU3zWiWvg== X-Migadu-Spam-Score: 1.79 X-Spam-Score: 1.79 X-Migadu-Queue-Id: 50C2E26B57 X-Migadu-Scanner: scn0.migadu.com Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=posteo.net header.s=2017 header.b=KLRy5b+2; dmarc=fail reason="SPF not aligned (strict)" header.from=posteo.net (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-TUID: tCuwQrwcInsY Currently, kodi's dependency `spdlog`, via spdlog-for-kodi, fails to build, primarily due to a failure in building its tests; its bundled copy of "check.h" cannot compile against latest glibc whose `MINSIGSTKSZ` is no longer a constant. See e.g. https://github.com/catchorg/Catch2/issues/2178 The `spdlog-for-kodi` variable was added at the same time as the kodi update to 19.5, but it seems to compile and run fine with the most recent spdlog and fmt packages, which have been adapted to the glibc change. Ricardo, do you recall why this special package was added? or forsee anything wrong with the change? `~Eric * gnu/packages/kodi.scm (kodi)[inputs]: Use most recent 'fmt' and 'spdlog' packages. * gnu/packages/logging.scm (spdlog-for-kodi): Delete. --- gnu/packages/kodi.scm | 4 ++-- gnu/packages/logging.scm | 14 -------------- 2 files changed, 2 insertions(+), 16 deletions(-) diff --git a/gnu/packages/kodi.scm b/gnu/packages/kodi.scm index 739d293a57..e0710c9fc2 100644 --- a/gnu/packages/kodi.scm +++ b/gnu/packages/kodi.scm @@ -415,7 +415,7 @@ (define-public kodi ffmpeg-4 flac flatbuffers - fmt-6 + fmt fontconfig freetype fribidi @@ -456,7 +456,7 @@ (define-public kodi python rapidjson samba - spdlog-for-kodi + spdlog sqlite taglib tinyxml diff --git a/gnu/packages/logging.scm b/gnu/packages/logging.scm index 550caf7be1..61b3d6ccc5 100644 --- a/gnu/packages/logging.scm +++ b/gnu/packages/logging.scm @@ -252,20 +252,6 @@ (define-public spdlog-1.10 (sha256 (base32 "02xz017ba9fssm1rp1fcfld7h79awbr6fqai9dxaqp02akp3davk")))))) -(define-public spdlog-for-kodi - (package - (inherit spdlog) - (version "1.5.0") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/gabime/spdlog") - (commit (string-append "v" version)))) - (file-name (git-file-name "spdlog" version)) - (sha256 - (base32 "0dn44r3xbw1w0bk9yflnxkh3rzdq2bpxkks44skfmqig0rsj1f1x")))))) - (define-public rsyslog (package (name "rsyslog") base-commit: 7a0a186a32524d4156bf96786d708fab323cebff -- 2.39.2