Message ID | 679de4b93ba92b2b4d9f7272ca5531275f7ff446.1746631093.git.mail@pisemsky.site |
---|---|
State | New |
Headers |
Return-Path: <guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org> X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 6665D27BC4B; Wed, 7 May 2025 16:19:23 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.1 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FROM_SUSPICIOUS_NTLD,MAILING_LIST_MULTI, RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H2,RCVD_IN_SBL_CSS, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 18F6C27BC49 for <patchwork@mira.cbaines.net>; Wed, 7 May 2025 16:19:23 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from <guix-patches-bounces@gnu.org>) id 1uCgY5-0004Fn-E0; Wed, 07 May 2025 11:19:05 -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 <Debian-debbugs@debbugs.gnu.org>) id 1uCgY2-0004FY-Rp for guix-patches@gnu.org; Wed, 07 May 2025 11:19:03 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1uCgY2-0005Lu-IU for guix-patches@gnu.org; Wed, 07 May 2025 11:19:02 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:Date:From:To:Subject; bh=+eSjYi30QYEOCuIsLkR+soVhdJiEd2urKZA7dcSSYE4=; b=C7QEnYo5Ye7coeauLfXhNZcW65WOgH0pUYUafp2Glq7EDbtph9OHC+Z1vva1Zm6wcbCxOpa+Ck02bc+1sZYvY0UsqPH8EuOkuqOOd+nU/TfORmIQskrih0s76o86Ok8+uuILIFfqGlKuPjHmCEvePy647rYrLbYVSejCuR6+AfbgzbBISQGVjzpvzme1RFqtZ3qTbdR+JgiMYE86cre7Ii9vQc49jK1JPIWbMq771nkB26Njx5H0DsKpSmtkAv+BF7u9VangkdALKczOYbqR0kgIogFDRVRuOBCiCp24R0AI6pqYYHFyixmZn/WnzMHZT7tz8UmxerNtfW8xMMUe3Q==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1uCgY2-0001ed-6d for guix-patches@gnu.org; Wed, 07 May 2025 11:19:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#78301] [PATCH] gnu: guile-mqtt: Patch extension path. Resent-From: Evgeny Pisemsky <mail@pisemsky.site> Original-Sender: "Debbugs-submit" <debbugs-submit-bounces@debbugs.gnu.org> Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 07 May 2025 15:19:01 +0000 Resent-Message-ID: <handler.78301.B.17466311266314@debbugs.gnu.org> Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 78301 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 78301@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.17466311266314 (code B ref -1); Wed, 07 May 2025 15:19:01 +0000 Received: (at submit) by debbugs.gnu.org; 7 May 2025 15:18:46 +0000 Received: from localhost ([127.0.0.1]:45639 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces@debbugs.gnu.org>) id 1uCgXm-0001dk-1T for submit@debbugs.gnu.org; Wed, 07 May 2025 11:18:46 -0400 Received: from lists.gnu.org ([2001:470:142::17]:39250) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from <mail@pisemsky.site>) id 1uCgXj-0001d8-Ez for submit@debbugs.gnu.org; Wed, 07 May 2025 11:18:43 -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 <mail@pisemsky.site>) id 1uCgXa-0004EV-DH for guix-patches@gnu.org; Wed, 07 May 2025 11:18:34 -0400 Received: from pisemsky.site ([103.54.19.55]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from <mail@pisemsky.site>) id 1uCgXY-0005Ba-Jz for guix-patches@gnu.org; Wed, 07 May 2025 11:18:34 -0400 Received: from localhost.localdomain (<unknown> [212.233.86.99]) by pisemsky.site (OpenSMTPD) with ESMTPSA id 21049e5a (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO) for <guix-patches@gnu.org>; Wed, 7 May 2025 15:18:03 +0000 (UTC) From: Evgeny Pisemsky <mail@pisemsky.site> Date: Wed, 7 May 2025 18:18:13 +0300 Message-ID: <679de4b93ba92b2b4d9f7272ca5531275f7ff446.1746631093.git.mail@pisemsky.site> X-Mailer: git-send-email 2.49.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=103.54.19.55; envelope-from=mail@pisemsky.site; helo=pisemsky.site X-Spam_score_int: 14 X-Spam_score: 1.4 X-Spam_bar: + X-Spam_report: (1.4 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_SBL_CSS=3.335, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=no 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: <guix-patches.gnu.org> List-Unsubscribe: <https://lists.gnu.org/mailman/options/guix-patches>, <mailto:guix-patches-request@gnu.org?subject=unsubscribe> List-Archive: <https://lists.gnu.org/archive/html/guix-patches> List-Post: <mailto:guix-patches@gnu.org> List-Help: <mailto:guix-patches-request@gnu.org?subject=help> List-Subscribe: <https://lists.gnu.org/mailman/listinfo/guix-patches>, <mailto:guix-patches-request@gnu.org?subject=subscribe> Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches |
Series |
[bug#78301] gnu: guile-mqtt: Patch extension path.
|
|
Commit Message
Evgeny Pisemsky
May 7, 2025, 3:18 p.m. UTC
* gnu/packages/guile-xyz.scm (guile-mqtt): Patch extension path. [arguments]: Add 'patch-extension-path phase. Change-Id: Ifbbd0adebcf82a36f674ab3fded3db5ba04b98b0 --- gnu/packages/guile-xyz.scm | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) base-commit: ec95c71c01144fcae1a3d079e0d0aec6087b9d2a
Comments
Evgeny Pisemsky <mail@pisemsky.site> writes: > * gnu/packages/guile-xyz.scm (guile-mqtt): Patch extension path. > [arguments]: Add 'patch-extension-path phase. > > Change-Id: Ifbbd0adebcf82a36f674ab3fded3db5ba04b98b0 > --- > gnu/packages/guile-xyz.scm | 11 ++++++++++- > 1 file changed, 10 insertions(+), 1 deletion(-) > > diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm > index 28a94dc83a..7c6e3ade3e 100644 > --- a/gnu/packages/guile-xyz.scm > +++ b/gnu/packages/guile-xyz.scm > @@ -1658,7 +1658,16 @@ (define-public guile-mqtt > (build-system gnu-build-system) > (arguments > (list > - #:make-flags #~(list "GUILE_AUTO_COMPILE=0"))) > + #:make-flags > + #~(list "GUILE_AUTO_COMPILE=0") > + #:phases > + #~(modify-phases %standard-phases > + (add-after 'unpack 'patch-extension-path > + (lambda* (#:key inputs #:allow-other-keys) > + (substitute* "module/ffi/mosquitto.scm" > + (("list #f \"libmosquitto\"") > + (format #f "list #f \"~a/lib/libmosquitto\"" > + (assoc-ref inputs "mosquitto"))))))))) please use string-append. else if no "mosquitto" in inputs, The modified result is "list #f \"#f/lib/libmosquitto\"" > (native-inputs (list guile-3.0 pkg-config)) > (inputs (list mosquitto)) > (home-page "https://github.com/mdjurfeldt/guile-mqtt") > > base-commit: ec95c71c01144fcae1a3d079e0d0aec6087b9d2a
Evgeny Pisemsky <mail@pisemsky.site> writes: > Z572 <z572@z572.online> writes: > >> else if no "mosquitto" in inputs > > I don't get it. > > It is in inputs. for example, If I use the following codes ``` (define-public mosquitto-with-something (package (inherit mosquitto) (name "mosquitto-with-something") ... (license (list license:epl1.0 license:edl1.0)))) (define-public guile-mqtt-with-something (package (inherit guile-mqtt) (name "guile-mqtt-with-something") ... (inputs (list mosquitto-with-v)))) ``` guix build guile-mqtt-with-something will success, but if you see share/guile/site/3.0/ffi/mosquitto.scm, ``` (define (foreign-pointer-search name) (let loop ((libs (list #f "#f/lib/libmosquitto"))) (cond ((null? libs) (error "no library for ~s" name)) ((false-if-exception (foreign-library-pointer (car libs) name))) (else (loop (cdr libs)))))) ``` This will cause problems. It is best to report an error during build. A better approach is to use search-input-file. Instead of relying on names, look up /lib/libmosquitto.so.
diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index 28a94dc83a..7c6e3ade3e 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -1658,7 +1658,16 @@ (define-public guile-mqtt (build-system gnu-build-system) (arguments (list - #:make-flags #~(list "GUILE_AUTO_COMPILE=0"))) + #:make-flags + #~(list "GUILE_AUTO_COMPILE=0") + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'patch-extension-path + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "module/ffi/mosquitto.scm" + (("list #f \"libmosquitto\"") + (format #f "list #f \"~a/lib/libmosquitto\"" + (assoc-ref inputs "mosquitto"))))))))) (native-inputs (list guile-3.0 pkg-config)) (inputs (list mosquitto)) (home-page "https://github.com/mdjurfeldt/guile-mqtt")