From unknown Fri Jun 13 11:50:38 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#62916] [PATCH core-updates 0/2] Try to fix p11-kit compilation to mingw Resent-From: Vivien Kraus Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 17 Apr 2023 22:27:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 62916 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 62916@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.168177038628723 (code B ref -1); Mon, 17 Apr 2023 22:27:02 +0000 Received: (at submit) by debbugs.gnu.org; 17 Apr 2023 22:26:26 +0000 Received: from localhost ([127.0.0.1]:57130 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1poXIo-0007TD-AI for submit@debbugs.gnu.org; Mon, 17 Apr 2023 18:26:26 -0400 Received: from lists.gnu.org ([209.51.188.17]:43680) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1poXIm-0007T5-64 for submit@debbugs.gnu.org; Mon, 17 Apr 2023 18:26:24 -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 1poXIl-0004kz-Oe for guix-patches@gnu.org; Mon, 17 Apr 2023 18:26:23 -0400 Received: from planete-kraus.eu ([2a00:5881:4008:2810::309]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_CHACHA20_POLY1305:256) (Exim 4.90_1) (envelope-from ) id 1poXIj-0002N7-RE for guix-patches@gnu.org; Mon, 17 Apr 2023 18:26:23 -0400 Received: from planete-kraus.eu (localhost.lan [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id 4680f715 for ; Mon, 17 Apr 2023 22:26:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=planete-kraus.eu; h= message-id:from:date:subject:to:mime-version; s=dkim; bh=03YvGGw EwcNcI0swPXQQ5ps+Khk=; b=M9yOqetusGa3XetCFKfOwQyQtFIRaL0hOqT6sXI 7bVdBgo8nEEke6Fjq91rHevUM1tjqdyquVtxT6+to1m+3+QjwIZRtuOa6wjGyni+ ERr02ChdjJ6M7xmQ7u51k5h+IEH82rr/4Icu9kNK4YKmLHQlQYZ5PwaNvQqUzGrt YhEg= Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id 70536077 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO) for ; Mon, 17 Apr 2023 22:26:11 +0000 (UTC) Message-Id: From: Vivien Kraus Date: Tue, 18 Apr 2023 00:20:07 +0200 MIME-Version: 1.0 User-Agent: Evolution 3.46.0 Received-SPF: pass client-ip=2a00:5881:4008:2810::309; envelope-from=vivien@planete-kraus.eu; helo=planete-kraus.eu X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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, PP_MIME_FAKE_ASCII_TEXT=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.4 (-) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.4 (--) Dear guix, On core-updates, p11-kit still uses the gnu build system. However, it does not seem to be recommended anymore: the README now documents the meson build system, and the makefiles are broken when targetting mingw. For reference, on AUR: https://aur.archlinux.org/packages/mingw-w64-p11-kit p11-kit comes early in the dependency chain. It being broken means that we can’t cross-compile gnutls, curl and other packages. However, there is some kind of dependency cycle when using the meson build system (modules? Packages? I don’t know). Can someone help me sort that out? Best regards, Vivien Vivien Kraus (2): gnu: gcc: do not build gcov. NOT WORKING gnu: p11-kit: switch to meson-build-system. gnu/packages/gcc.scm | 4 ++++ gnu/packages/tls.scm | 19 ++++--------------- 2 files changed, 8 insertions(+), 15 deletions(-) base-commit: a6d2b54d3920d8858b5b36e4e4364088ed340107 -- 2.39.2 From unknown Fri Jun 13 11:50:38 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#62916] [PATCH core-updates 1/2] gnu: gcc: do not build gcov. Resent-From: Vivien Kraus Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 17 Apr 2023 22:29:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 62916 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 62916@debbugs.gnu.org Received: via spool by 62916-submit@debbugs.gnu.org id=B62916.168177050728944 (code B ref 62916); Mon, 17 Apr 2023 22:29:02 +0000 Received: (at 62916) by debbugs.gnu.org; 17 Apr 2023 22:28:27 +0000 Received: from localhost ([127.0.0.1]:57135 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1poXKk-0007Wm-QE for submit@debbugs.gnu.org; Mon, 17 Apr 2023 18:28:27 -0400 Received: from planete-kraus.eu ([89.234.140.182]:51112) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1poXKh-0007Wb-VX for 62916@debbugs.gnu.org; Mon, 17 Apr 2023 18:28:24 -0400 Received: from planete-kraus.eu (localhost.lan [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id ae20e3ff for <62916@debbugs.gnu.org>; Mon, 17 Apr 2023 22:28:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=planete-kraus.eu; h= message-id:in-reply-to:references:from:date:subject:to :mime-version; s=dkim; bh=HOJARSGlu57mSz7BHn09OQjNnkI=; b=anr1Wc oFEUtrvdqWPswJ2m+DIzqBG9//ZnB6HTzhTf7lfOfxInEzwpeh0fcTHmiAdyP9k2 VhUfBaVbUftApd2KulzidvfDB2D9KeMDizPjxjiV7Glf8v4wNYoZhBClSsfNLDNj se+yLgyMN+XjXHsGYf6ReP8vOtomLizF0mPvw= Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id 8e900e2c (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO) for <62916@debbugs.gnu.org>; Mon, 17 Apr 2023 22:28:19 +0000 (UTC) Message-Id: <234715f3c0fe265574fd9708abe0e057ee3c1641.1681770007.git.vivien@planete-kraus.eu> In-Reply-To: References: From: Vivien Kraus Date: Tue, 18 Apr 2023 00:09:55 +0200 MIME-Version: 1.0 User-Agent: Evolution 3.46.0 X-Spam-Score: -0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/gcc.scm (gcc-configure-flags-for-triplet): Disable gcov when targetting mingw. --- gnu/packages/gcc.scm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/gnu/packages/gcc.scm b/gnu/packages/gcc.scm index 5b1ef83ce6..c6575bf9db 100644 --- a/gnu/packages/gcc.scm +++ b/gnu/packages/gcc.scm @@ -88,6 +88,10 @@ (define (gcc-configure-flags-for-triplet target) (string-prefix? "powerpc-" target)) '("--with-long-double-128")) + ;; See https://bugs.gentoo.org/show_bug.cgi?id=843989 + ((target-mingw? target) + '("--disable-gcov")) + (else ;; TODO: Add `arm.*-gnueabi', etc. '()))) -- 2.39.2 From unknown Fri Jun 13 11:50:38 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#62916] [PATCH core-updates 2/2] NOT WORKING gnu: p11-kit: switch to meson-build-system. Resent-From: Vivien Kraus Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 17 Apr 2023 22:33:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 62916 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 62916@debbugs.gnu.org Received: via spool by 62916-submit@debbugs.gnu.org id=B62916.168177075529449 (code B ref 62916); Mon, 17 Apr 2023 22:33:01 +0000 Received: (at 62916) by debbugs.gnu.org; 17 Apr 2023 22:32:35 +0000 Received: from localhost ([127.0.0.1]:57140 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1poXOl-0007ev-Cs for submit@debbugs.gnu.org; Mon, 17 Apr 2023 18:32:35 -0400 Received: from planete-kraus.eu ([89.234.140.182]:40880) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1poXOj-0007el-Ak for 62916@debbugs.gnu.org; Mon, 17 Apr 2023 18:32:34 -0400 Received: from planete-kraus.eu (localhost.lan [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id 611debc8 for <62916@debbugs.gnu.org>; Mon, 17 Apr 2023 22:32:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=planete-kraus.eu; h= message-id:in-reply-to:references:from:date:subject:to :mime-version; s=dkim; bh=k7BK7sVjdng7mefOKYTfErq009I=; b=N4MGxD VOzmX04o1hGtJfLOaTea4w6a8jv4q5P8LexZ249DOcl4ErVBPT1+N1BBqNxPmMwc ejBJXF63ONV5rE0zzicxcabk2yoX3+S5gmFEbnk5/oSjFHIH9hwy2zd/2ATTYqv+ XYMZqJpKLClXfmhK+7uIALn38dazBMBmu2KDA= Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id 3574237c (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO) for <62916@debbugs.gnu.org>; Mon, 17 Apr 2023 22:32:27 +0000 (UTC) Message-Id: <16c8a106c160315cef9c04287414e2788e8a87f2.1681770007.git.vivien@planete-kraus.eu> In-Reply-To: References: From: Vivien Kraus Date: Tue, 18 Apr 2023 00:17:30 +0200 MIME-Version: 1.0 User-Agent: Evolution 3.46.0 X-Spam-Score: -0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/tls.scm (p11-kit): Switch to meson build system. --- gnu/packages/tls.scm | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index d41efe23b0..eaa18b9064 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -150,12 +150,9 @@ (define-public p11-kit "download/" version "/p11-kit-" version ".tar.xz")) (sha256 (base32 "1y5fm9gwhkh902r26p90qf1g2h1ziqrk4hgf9i9sxm2wzlz7ignq")))) - (build-system gnu-build-system) + (build-system meson-build-system) (native-inputs - (append (list pkg-config) - (if (hurd-target?) - (list autoconf automake gettext-minimal libtool) - '()))) + (list pkg-config)) (inputs (append (list libffi libtasn1) (if (hurd-target?) @@ -165,7 +162,7 @@ (define-public p11-kit (list #:configure-flags ;; Use the default certificates so that users such as flatpak ;; find them. See . - #~'("--with-trust-paths=/etc/ssl/certs/ca-certificates.crt") + #~'("-Dtrust_paths=/etc/ssl/certs/ca-certificates.crt") #:phases #~(modify-phases %standard-phases #$@(if (hurd-target?) #~((add-after 'unpack 'apply-hurd-patch @@ -178,15 +175,7 @@ (define patch (replace 'bootstrap (lambda _ (invoke "autoreconf" "-fiv")))) - #~()) - (add-before 'check 'prepare-tests - (lambda _ - ;; "test-runtime" expects XDG_RUNTIME_DIR to be set up - ;; and looks for .cache and other directories (only). - ;; For simplicity just drop it since it is irrelevant - ;; in the build container. - (substitute* "Makefile" - (("test-runtime\\$\\(EXEEXT\\)") ""))))))) + #~())))) (home-page "https://p11-glue.github.io/p11-glue/p11-kit.html") (synopsis "PKCS#11 library") (description -- 2.39.2 From unknown Fri Jun 13 11:50:38 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#62916] [PATCH core-updates 0/2] Try to fix p11-kit compilation to mingw Resent-From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 25 Apr 2023 16:12:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 62916 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Vivien Kraus Cc: 62916@debbugs.gnu.org Received: via spool by 62916-submit@debbugs.gnu.org id=B62916.168243911012806 (code B ref 62916); Tue, 25 Apr 2023 16:12:01 +0000 Received: (at 62916) by debbugs.gnu.org; 25 Apr 2023 16:11:50 +0000 Received: from localhost ([127.0.0.1]:53425 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1prLGf-0003KU-PD for submit@debbugs.gnu.org; Tue, 25 Apr 2023 12:11:49 -0400 Received: from eggs.gnu.org ([209.51.188.92]:52082) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1prLGb-0003KF-Oi for 62916@debbugs.gnu.org; Tue, 25 Apr 2023 12:11:48 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1prLGV-0003Qu-61; Tue, 25 Apr 2023 12:11:39 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:In-Reply-To:Date:References:Subject:To: From; bh=9lM7sXYA22iL49cxm9NS07e+E+CkChDhteUmjKvvoOU=; b=dqhXDbkOjXn8yhsb3mC5 ssLq0qqw1xBXNNzIaauren6ICoixxBZIYmEpZLKAyhqiiNAv+rCJ55j7PguJt9DcSg7oSfgWZkGt4 Gb0FdiHitI41/dLcAdgL16Z/5fF0DNDz9QTvFj43rXZRqq9GTRBtoKNNts5BBLm3mBrnmTBkd5m65 PBuvj5VzRJju9FBig+yqppLKE8IzHb/ZimFLg9Kp62dohbWQT96ZnO1nSGpcc4rbYS3uwBRB11lbJ sVt5N3cx0dV8Ln79C3SZk2RuR8zUJl8TWvSTP/ohxVXyTO6A5xRRNoAnVv/ibWl0vI3WV5o4LFsGY shtNffeUHZB3Nw==; Received: from [193.50.110.118] (helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1prLGU-0005uy-23; Tue, 25 Apr 2023 12:11:38 -0400 From: Ludovic =?UTF-8?Q?Court=C3=A8s?= References: <234715f3c0fe265574fd9708abe0e057ee3c1641.1681770007.git.vivien@planete-kraus.eu> Date: Tue, 25 Apr 2023 18:11:36 +0200 In-Reply-To: <234715f3c0fe265574fd9708abe0e057ee3c1641.1681770007.git.vivien@planete-kraus.eu> (Vivien Kraus's message of "Tue, 18 Apr 2023 00:09:55 +0200") Message-ID: <87ildkym9z.fsf_-_@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Hi, Vivien Kraus skribis: > * gnu/packages/gcc.scm (gcc-configure-flags-for-triplet): Disable gcov wh= en > targetting mingw. Pushed this one as 74038cf66e3a8cdcd9d97a81d9176c3cdefdaaf7. The p11-kit story isn=E2=80=99t good, but I=E2=80=99m not sure how to addre= ss it. When we find a way, we can add a feature branch to rebuild everything that depends on it though. Thanks! Ludo=E2=80=99. From unknown Fri Jun 13 11:50:38 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#62916] [PATCH v2 0/1] Fix p11-kit build system for mingw Resent-From: Vivien Kraus Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 25 Apr 2023 16:25:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 62916 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Ludovic =?UTF-8?Q?Court=C3=A8s?= Cc: 62916@debbugs.gnu.org Received: via spool by 62916-submit@debbugs.gnu.org id=B62916.168243987614133 (code B ref 62916); Tue, 25 Apr 2023 16:25:01 +0000 Received: (at 62916) by debbugs.gnu.org; 25 Apr 2023 16:24:36 +0000 Received: from localhost ([127.0.0.1]:53439 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1prLSx-0003fk-Gs for submit@debbugs.gnu.org; Tue, 25 Apr 2023 12:24:36 -0400 Received: from planete-kraus.eu ([89.234.140.182]:56622) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1prLSr-0003fX-02 for 62916@debbugs.gnu.org; Tue, 25 Apr 2023 12:24:30 -0400 Received: from planete-kraus.eu (localhost.lan [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id b393bd6e; Tue, 25 Apr 2023 16:24:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=planete-kraus.eu; h= message-id:in-reply-to:references:from:date:subject:mime-version :content-type:content-transfer-encoding:to:cc; s=dkim; bh=90YGrB ieo8VMs5DF+DbMNgkdK6c=; b=a/2Z+7VDVf651epGJNkMmv9K95dHG1Uz8zvaR2 KhOdIxti9Ecbruzpp14kRhNPwOfH+VoaSG5n9AuW4mnXGcztxADPvcunTuLOWH9S BJ/sIRW8VX+1FZZkmj+FKaN/AOFj6W4nK/E1I8K+NIo6LxaTSZ7fyOIlTP/ZCfVE NWUk0= Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id a18d222d (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); Tue, 25 Apr 2023 16:24:20 +0000 (UTC) Message-Id: In-Reply-To: <87ildkym9z.fsf_-_@gnu.org> References: <87ildkym9z.fsf_-_@gnu.org> From: Vivien Kraus Date: Tue, 25 Apr 2023 18:16:40 +0200 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit User-Agent: Evolution 3.46.0 X-Spam-Score: -0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hi! > The p11-kit story isn’t good, but I’m not sure how to address it. When > we find a way, we can add a feature branch to rebuild everything that > depends on it though. I just found out how to fix the makefiles, and the moment I was about to send the patch, I received your reply. This V2 does not fix the core issue, but at least it builds on mingw now! The core problem in the build system is that every auxiliary program is a mix of re-compiled common sources, static libraries, and the main shared object. I decided to use static libraries everywhere I can. This is gross but at least it links now, so this is a W I guess? What do you think? Best regards, Vivien Vivien Kraus (1): gnu: p11-kit: fix build on mingw. gnu/local.mk | 3 +- .../p11-kit-fix-build-system-for-mingw.patch | 108 ++++++++++++++++++ gnu/packages/tls.scm | 14 ++- 3 files changed, 123 insertions(+), 2 deletions(-) create mode 100644 gnu/packages/patches/p11-kit-fix-build-system-for-mingw.patch base-commit: 74038cf66e3a8cdcd9d97a81d9176c3cdefdaaf7 -- 2.39.2 From unknown Fri Jun 13 11:50:38 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#62916] [PATCH v2 1/1] gnu: p11-kit: fix build on mingw. Resent-From: Vivien Kraus Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 25 Apr 2023 16:26:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 62916 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Ludovic =?UTF-8?Q?Court=C3=A8s?= Cc: 62916@debbugs.gnu.org Received: via spool by 62916-submit@debbugs.gnu.org id=B62916.168243993714256 (code B ref 62916); Tue, 25 Apr 2023 16:26:01 +0000 Received: (at 62916) by debbugs.gnu.org; 25 Apr 2023 16:25:37 +0000 Received: from localhost ([127.0.0.1]:53443 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1prLTx-0003hk-6K for submit@debbugs.gnu.org; Tue, 25 Apr 2023 12:25:36 -0400 Received: from planete-kraus.eu ([89.234.140.182]:47470) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1prLTr-0003hZ-U5 for 62916@debbugs.gnu.org; Tue, 25 Apr 2023 12:25:31 -0400 Received: from planete-kraus.eu (localhost.lan [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id ead47980; Tue, 25 Apr 2023 16:25:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=planete-kraus.eu; h= message-id:in-reply-to:references:from:date:subject:mime-version :content-type:content-transfer-encoding:to:cc; s=dkim; bh=xcIunU b8WM7WWkOfXhJIq49eEyM=; b=S/9OSY+2Dx1VpwB6O00yvIo0F0Ab/PiYHVH9fw YEa3gBRCNHZ7M7YI2/M+8/tkVVqBG4m9h8mf3Zu8puYS7qC2MdQJlIBeti9KTZw9 y1I7kcDdN/ayzrDz8lALHYw+xt2p9qym+dfbRzM3w8h0B3UVm71eBk7ZrglqT4lP OOT6A= Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id a12c4e04 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); Tue, 25 Apr 2023 16:25:24 +0000 (UTC) Message-Id: In-Reply-To: References: <87ildkym9z.fsf_-_@gnu.org> From: Vivien Kraus Date: Tue, 25 Apr 2023 17:50:13 +0200 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit User-Agent: Evolution 3.46.0 X-Spam-Score: -0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/patches/p11-kit-fix-build-system-for-mingw.patch: New patch. It makes sure that all symbols are defined when linking objects. * gnu/packages/tls.scm (p11-kit) [on target-mingw?] [phase 'apply-mingw-patch]: New phase, similar to what’s done with hurd. * gnu/packages/tls.scm (p11-kit) [native-inputs]: also add the autotools on mingw. --- gnu/local.mk | 3 +- .../p11-kit-fix-build-system-for-mingw.patch | 108 ++++++++++++++++++ gnu/packages/tls.scm | 14 ++- 3 files changed, 123 insertions(+), 2 deletions(-) create mode 100644 gnu/packages/patches/p11-kit-fix-build-system-for-mingw.patch diff --git a/gnu/local.mk b/gnu/local.mk index 66dd240ba9..355c09caa4 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1696,7 +1696,8 @@ dist_patch_DATA = \ %D%/packages/patches/sqlite-hurd.patch \ %D%/packages/patches/strace-readlink-tests.patch \ %D%/packages/patches/sunxi-tools-remove-sys-io.patch \ - %D%/packages/patches/p11-kit-hurd.patch \ + %D%/packages/patches/p11-kit-hurd.patch \ + %D%/packages/patches/p11-kit-fix-build-system-for-mingw.patch \ %D%/packages/patches/patch-hurd-path-max.patch \ %D%/packages/patches/perl-5.14-autosplit-default-time.patch \ %D%/packages/patches/perl-5.14-module-pluggable-search.patch \ diff --git a/gnu/packages/patches/p11-kit-fix-build-system-for-mingw.patch b/gnu/packages/patches/p11-kit-fix-build-system-for-mingw.patch new file mode 100644 index 0000000000..cc02fdf1b3 --- /dev/null +++ b/gnu/packages/patches/p11-kit-fix-build-system-for-mingw.patch @@ -0,0 +1,108 @@ +From e350540c9e2259e2f66cbaf7c6dc347f03acac40 Mon Sep 17 00:00:00 2001 +From: Vivien Kraus +Date: Tue, 25 Apr 2023 17:41:47 +0200 +Subject: [PATCH] Fix the build system to avoid undefined references on mingw. + +--- + p11-kit/Makefile.am | 23 ++++++++++++----------- + trust/Makefile.am | 5 ++--- + 2 files changed, 14 insertions(+), 14 deletions(-) + +diff --git a/p11-kit/Makefile.am b/p11-kit/Makefile.am +index 7fe7a6c..017edd3 100644 +--- a/p11-kit/Makefile.am ++++ b/p11-kit/Makefile.am +@@ -13,6 +13,7 @@ COMMON_SRCS = \ + p11-kit/conf.c p11-kit/conf.h \ + p11-kit/iter.c \ + p11-kit/log.c p11-kit/log.h \ ++ p11-kit/lists.c \ + p11-kit/filter.c p11-kit/filter.h \ + p11-kit/modules.c p11-kit/modules.h \ + p11-kit/pkcs11.h \ +@@ -80,6 +81,7 @@ COMMON_CFLAGS = \ + COMMON_LIBS = \ + libp11-common.la \ + libp11-library.la \ ++ libp11-tool.la \ + $(LIBFFI_LIBS) \ + $(LTLIBINTL) \ + $(NULL) +@@ -125,7 +127,8 @@ libp11_kit_testable_la_SOURCES = \ + $(libp11_kit_internal_la_SOURCES) \ + $(libp11_kit_la_SOURCES) \ + $(NULL) +-libp11_kit_testable_la_LIBADD = $(COMMON_LIBS) ++libp11_kit_testable_la_LIBADD = $(COMMON_LIBS) \ ++ libp11-tool.la + + pkcs11_gnu_sources = \ + p11-kit/uri.gnu.c \ +@@ -238,14 +241,12 @@ EXTRA_DIST += \ + bin_PROGRAMS += p11-kit/p11-kit + + p11_kit_p11_kit_SOURCES = \ +- p11-kit/lists.c \ + p11-kit/p11-kit.c \ + $(NULL) + + p11_kit_p11_kit_LDADD = \ +- libp11-kit.la \ +- libp11-tool.la \ +- libp11-common.la \ ++ libp11-kit-internal.la \ ++ $(COMMON_LIBS) \ + $(LTLIBINTL) \ + $(NULL) + +@@ -257,12 +258,12 @@ private_PROGRAMS += p11-kit/p11-kit-remote + + p11_kit_p11_kit_remote_SOURCES = \ + p11-kit/remote.c \ ++ $(libp11_kit_la_SOURCES) \ + $(NULL) + + p11_kit_p11_kit_remote_LDADD = \ +- libp11-tool.la \ +- libp11-common.la \ +- libp11-kit.la \ ++ libp11-kit-internal.la \ ++ $(COMMON_LIBS) \ + $(NULL) + + check_PROGRAMS += p11-kit/p11-kit-remote-testable +@@ -278,12 +279,12 @@ private_PROGRAMS += p11-kit/p11-kit-server + + p11_kit_p11_kit_server_SOURCES = \ + p11-kit/server.c \ ++ $(libp11_kit_la_SOURCES) \ + $(NULL) + + p11_kit_p11_kit_server_LDADD = \ +- libp11-tool.la \ +- libp11-common.la \ +- libp11-kit.la \ ++ libp11-kit-internal.la \ ++ $(COMMON_LIBS) \ + $(LIBSYSTEMD_LIBS) \ + $(NULL) + +diff --git a/trust/Makefile.am b/trust/Makefile.am +index 6ff5d12..f5d87f5 100644 +--- a/trust/Makefile.am ++++ b/trust/Makefile.am +@@ -84,9 +84,8 @@ bin_PROGRAMS += trust/trust + + trust_trust_LDADD = \ + libtrust-data.la \ +- libp11-kit.la \ +- libp11-common.la \ +- libp11-tool.la \ ++ libp11-kit-internal.la \ ++ $(COMMON_LIBS) \ + $(LTLIBINTL) \ + $(LIBTASN1_LIBS) \ + $(HASH_LIBS) \ +-- +2.39.2 + diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index e0da7757e0..2cd43c6957 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -153,7 +153,7 @@ (define-public p11-kit (build-system gnu-build-system) (native-inputs (append (list pkg-config) - (if (hurd-target?) + (if (or (target-mingw?) (hurd-target?)) (list autoconf automake gettext-minimal libtool) '()))) (inputs @@ -179,6 +179,18 @@ (define patch (lambda _ (invoke "autoreconf" "-fiv")))) #~()) + #$@(if (target-mingw?) + #~((add-after 'unpack 'apply-mingw-patch + (lambda* (#:key inputs #:allow-other-keys) + (define patch + #$(local-file + (search-patch "p11-kit-fix-build-system-for-mingw.patch"))) + (invoke "patch" "-p1" "--batch" "-i" + patch))) + (replace 'bootstrap + (lambda _ + (invoke "autoreconf" "-fiv")))) + #~()) (add-before 'check 'prepare-tests (lambda _ ;; "test-runtime" expects XDG_RUNTIME_DIR to be set up -- 2.39.2 From unknown Fri Jun 13 11:50:38 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#62916] [PATCH v3 0/1] Simpler fix for p11-kit@mingw Resent-From: Vivien Kraus Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 25 Apr 2023 21:36:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 62916 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Ludovic =?UTF-8?Q?Court=C3=A8s?= Cc: 62916@debbugs.gnu.org Received: via spool by 62916-submit@debbugs.gnu.org id=B62916.168245853315530 (code B ref 62916); Tue, 25 Apr 2023 21:36:02 +0000 Received: (at 62916) by debbugs.gnu.org; 25 Apr 2023 21:35:33 +0000 Received: from localhost ([127.0.0.1]:53705 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1prQJw-00042Q-Vp for submit@debbugs.gnu.org; Tue, 25 Apr 2023 17:35:33 -0400 Received: from planete-kraus.eu ([89.234.140.182]:55384) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1prQJq-000427-2S for 62916@debbugs.gnu.org; Tue, 25 Apr 2023 17:35:31 -0400 Received: from planete-kraus.eu (localhost.lan [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id 80728def; Tue, 25 Apr 2023 21:35:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=planete-kraus.eu; h= message-id:in-reply-to:references:from:date:subject:mime-version :content-type:content-transfer-encoding:to:cc; s=dkim; bh=0Vx8cW SzX7+v7IHXhNcGGBZmdMI=; b=Pvg1Mf70Blgd2EWgCbDTcEWI+8Oak5ydNZZPk/ Fhe3a2Zwy422sewB7AYikNPaMmGOqli2HUHnBbpBt0cwJ57NcCQdh9rK1lelZXT1 S2S/T2yuluWLWbSIGSmPn77HlOyFv8msd9n2HCWodypjS/uskq/mOQjHj8vIFOtY 3EX4Q= Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id 0785ec92 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); Tue, 25 Apr 2023 21:35:12 +0000 (UTC) Message-Id: In-Reply-To: References: From: Vivien Kraus Date: Tue, 25 Apr 2023 23:33:12 +0200 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit User-Agent: Evolution 3.46.4 X-Spam-Score: -0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) I noticed that the only problem was the way to generate the list of symbols for the DLL. So I don’t have to fix anything in the build system. Vivien Kraus (1): gnu: p11-kit: fix build on mingw. gnu/packages/tls.scm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) base-commit: 74038cf66e3a8cdcd9d97a81d9176c3cdefdaaf7 -- 2.39.2 From unknown Fri Jun 13 11:50:38 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#62916] [PATCH v3 1/1] gnu: p11-kit: fix build on mingw. Resent-From: Vivien Kraus Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 25 Apr 2023 21:37:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 62916 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Ludovic =?UTF-8?Q?Court=C3=A8s?= Cc: 62916@debbugs.gnu.org Received: via spool by 62916-submit@debbugs.gnu.org id=B62916.168245857315610 (code B ref 62916); Tue, 25 Apr 2023 21:37:01 +0000 Received: (at 62916) by debbugs.gnu.org; 25 Apr 2023 21:36:13 +0000 Received: from localhost ([127.0.0.1]:53709 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1prQKb-00043h-9v for submit@debbugs.gnu.org; Tue, 25 Apr 2023 17:36:13 -0400 Received: from planete-kraus.eu ([89.234.140.182]:57854) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1prQKZ-00043W-5I for 62916@debbugs.gnu.org; Tue, 25 Apr 2023 17:36:12 -0400 Received: from planete-kraus.eu (localhost.lan [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id 007a29de; Tue, 25 Apr 2023 21:36:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=planete-kraus.eu; h= message-id:in-reply-to:references:from:date:subject:mime-version :content-type:content-transfer-encoding:to:cc; s=dkim; bh=mcnFlY H1pioO1wiLhj/+0WSK05I=; b=tMYfzSJu8nGq/FYuYsszcMKMSLJ/Vx0AWI+1V/ wuDwzKBi5m4dSSF/cgsSIUc3Wn3sUH9r1YDMa8LISUk7wibqLrVGw5W3HG9pLjh2 K61Ez1rsd/8+pVrr8HozqmSu3RdZjo9dPMx5zBXFFL4ttXE30HJFt9WRjiNP/lv3 5UelQ= Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id 36aec753 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); Tue, 25 Apr 2023 21:36:02 +0000 (UTC) Message-Id: <8cde1bc525bc95c12b080de22d692d04b915618e.1682458392.git.vivien@planete-kraus.eu> In-Reply-To: References: From: Vivien Kraus Date: Tue, 25 Apr 2023 17:50:13 +0200 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit User-Agent: Evolution 3.46.4 X-Spam-Score: 1.1 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * gnu/packages/patches/p11-kit-fix-build-system-for-mingw.patch: New patch. It makes sure that all symbols are defined when linking objects. * gnu/packages/tls.scm (p11-kit) [on target-mingw?] [phase [...] Content analysis details: (1.1 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.0 SPF_PASS SPF: sender matches SPF record 1.1 DATE_IN_PAST_03_06 Date: is 3 to 6 hours before Received: date X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 0.1 (/) * gnu/packages/patches/p11-kit-fix-build-system-for-mingw.patch: New patch. It makes sure that all symbols are defined when linking objects. * gnu/packages/tls.scm (p11-kit) [on target-mingw?] [phase 'apply-mingw-patch]: New phase, similar to what’s done with hurd. * gnu/packages/tls.scm (p11-kit) [native-inputs]: also add the autotools on mingw. --- gnu/packages/tls.scm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index e0da7757e0..38126e2326 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -165,7 +165,10 @@ (define-public p11-kit (list #:configure-flags ;; Use the default certificates so that users such as flatpak ;; find them. See . - #~'("--with-trust-paths=/etc/ssl/certs/ca-certificates.crt") + #~'("--with-trust-paths=/etc/ssl/certs/ca-certificates.crt" + #$@(if (target-mingw?) + #~("--disable-ld-version-script") + #~())) #:phases #~(modify-phases %standard-phases #$@(if (hurd-target?) #~((add-after 'unpack 'apply-hurd-patch -- 2.39.2