From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id DE362158083 for ; Sat, 31 Aug 2024 13:18:49 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 38DFAE29E5; Sat, 31 Aug 2024 13:18:49 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 256F2E29E5 for ; Sat, 31 Aug 2024 13:18:49 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 6D8173430EB for ; Sat, 31 Aug 2024 13:18:48 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0C3AD14D5 for ; Sat, 31 Aug 2024 13:18:47 +0000 (UTC) From: "Michael Orlitzky" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michael Orlitzky" Message-ID: <1725110310.6cd7e5165b7750317d42a65b9bc20ce65eec8302.mjo@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-auth/oath-toolkit/files/, sys-auth/oath-toolkit/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-auth/oath-toolkit/files/oath-toolkit-2.6.11-fix-musl-build.patch sys-auth/oath-toolkit/oath-toolkit-2.6.11.ebuild X-VCS-Directories: sys-auth/oath-toolkit/ sys-auth/oath-toolkit/files/ X-VCS-Committer: mjo X-VCS-Committer-Name: Michael Orlitzky X-VCS-Revision: 6cd7e5165b7750317d42a65b9bc20ce65eec8302 X-VCS-Branch: master Date: Sat, 31 Aug 2024 13:18:47 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: fb393941-9e05-434f-b485-783e8039102e X-Archives-Hash: 8bc5e34b6e33d4b6d1342d73c3f4c915 commit: 6cd7e5165b7750317d42a65b9bc20ce65eec8302 Author: Michael Orlitzky gentoo org> AuthorDate: Sat Aug 31 11:03:45 2024 +0000 Commit: Michael Orlitzky gentoo org> CommitDate: Sat Aug 31 13:18:30 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6cd7e516 sys-auth/oath-toolkit: fix the build on musl Add an upstream patch to fix the build on musl, and then fix a new problem introduced by the patch: the build system is extremely sensitive to mtime changes in the source tree, in that patching triggers a rebuild of some Makefile sources, which ultimately tries to invoke automake. We have to fudge the mtime on the patched file to avoid this. Bug: https://bugs.gentoo.org/936309 Closes: https://bugs.gentoo.org/933086 Signed-off-by: Michael Orlitzky gentoo.org> .../files/oath-toolkit-2.6.11-fix-musl-build.patch | 24 ++++++++++++++++++++++ sys-auth/oath-toolkit/oath-toolkit-2.6.11.ebuild | 12 +++++++++++ 2 files changed, 36 insertions(+) diff --git a/sys-auth/oath-toolkit/files/oath-toolkit-2.6.11-fix-musl-build.patch b/sys-auth/oath-toolkit/files/oath-toolkit-2.6.11-fix-musl-build.patch new file mode 100644 index 000000000000..5affd40c3111 --- /dev/null +++ b/sys-auth/oath-toolkit/files/oath-toolkit-2.6.11-fix-musl-build.patch @@ -0,0 +1,24 @@ +From 65f37d4deb6ac87dd64df1bb281588d300a1bf3e Mon Sep 17 00:00:00 2001 +From: orbea +Date: Mon, 12 Feb 2024 18:18:31 -0800 +Subject: [PATCH] libpskc: fix implicit declaration with musl + +--- + libpskc/global.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/libpskc/global.c b/libpskc/global.c +index 1a514506..6082e11a 100644 +--- a/libpskc/global.c ++++ b/libpskc/global.c +@@ -24,6 +24,7 @@ + #include + + #include "internal.h" ++#include /* free */ + #include /* strverscmp */ + #include /* xmlInitParser */ + #include /* xmlLoadCatalog */ +-- +GitLab + diff --git a/sys-auth/oath-toolkit/oath-toolkit-2.6.11.ebuild b/sys-auth/oath-toolkit/oath-toolkit-2.6.11.ebuild index 03d2801fa64c..80f393cfd4d0 100644 --- a/sys-auth/oath-toolkit/oath-toolkit-2.6.11.ebuild +++ b/sys-auth/oath-toolkit/oath-toolkit-2.6.11.ebuild @@ -27,6 +27,8 @@ BDEPEND=" test? ( dev-libs/libxml2 ) " +PATCHES=( "${FILESDIR}/${P}-fix-musl-build.patch" ) + QA_CONFIG_IMPL_DECL_SKIP=( MIN # glibc fp unreachable @@ -34,6 +36,16 @@ QA_CONFIG_IMPL_DECL_SKIP=( static_assert ) +src_prepare() { + default + + # After patching, we have to fix the mtime on libpskc/global.c so + # that it doesn't cause Makefile.gdoc to be rebuilt so that it + # doesn't cause Makefile.in to be rebuilt so that it doesn't try to + # run automake-1.16.5 for no reason. Bug 936309. + touch --reference=libpskc/errors.c libpskc/global.c || die +} + src_configure() { local myeconfargs=( --cache-file="${S}"/config.cache