From patchwork Sat Sep 16 09:55:07 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vivien Kraus X-Patchwork-Id: 17004 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 01ABC27BBEA; Sat, 16 Sep 2023 16:26:09 +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=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,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 5F0B427BBE2 for ; Sat, 16 Sep 2023 16:26:08 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qhXBF-0008K4-DL; Sat, 16 Sep 2023 11:25:57 -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 1qhXBD-0008JT-DM for guix-patches@gnu.org; Sat, 16 Sep 2023 11:25:55 -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 ) id 1qhXBD-0007oR-4H for guix-patches@gnu.org; Sat, 16 Sep 2023 11:25:55 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qhXBJ-0001Bf-Lk; Sat, 16 Sep 2023 11:26:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66034] [PATCH gnome-team 1/3] gnu: glib: fix required.private reference to pcre. Resent-From: Vivien Kraus Original-Sender: "Debbugs-submit" Resent-CC: liliana.prikler@gmail.com, maxim.cournoyer@gmail.com, rg@raghavgururajan.name, guix-patches@gnu.org Resent-Date: Sat, 16 Sep 2023 15:26:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 66034 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 66034@debbugs.gnu.org Cc: liliana.prikler@gmail.com, maxim.cournoyer@gmail.com, rg@raghavgururajan.name X-Debbugs-Original-Xcc: liliana.prikler@gmail.com, maxim.cournoyer@gmail.com, rg@raghavgururajan.name Received: via spool by 66034-submit@debbugs.gnu.org id=B66034.16948779234486 (code B ref 66034); Sat, 16 Sep 2023 15:26:01 +0000 Received: (at 66034) by debbugs.gnu.org; 16 Sep 2023 15:25:23 +0000 Received: from localhost ([127.0.0.1]:48289 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qhXAR-00019k-Sd for submit@debbugs.gnu.org; Sat, 16 Sep 2023 11:25:22 -0400 Received: from planete-kraus.eu ([89.234.140.182]:47078) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qhXAO-00019W-Vl for 66034@debbugs.gnu.org; Sat, 16 Sep 2023 11:25:06 -0400 Received: from planete-kraus.eu (localhost.lan [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id d8cedd7e for <66034@debbugs.gnu.org>; Sat, 16 Sep 2023 15:24:56 +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=albinoniA; bh=qUeX+aw5Im/r+Vuw5g8BpjjOs4w=; b=i GPVKLIiC5OFKfxMJBdIpnL+W52X5GKGsY+X1g7epLDoPJ+MyGu5xPuIcqEFhrHvC O0Ih37etnJ0ScqTpvWDhvT1h6Dc0QeYHUB7xK0B1FhAr40QRC9NHZ39MPV/XzqJy Rq8b6ve0iXPWv20X7I3tbBO6+80YO4+rkznilxNzhCnOzs2JRejIsUVlzaiIfqBG 1EHQ9/+/v/fX7xTy/mtl4ogjuSKRWiyhbZ8wHSuOLPA6IrZHQ5eTjFFdICuaxo3d ZvD8DbkFUarmeZB0IBsXK70GFsGH3qksCt/+k+hYQqeb302mSfpV+sBDTLzikga+ v5oLaALuotG685WZMfpsw== Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id 93b2f4b0 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO) for <66034@debbugs.gnu.org>; Sat, 16 Sep 2023 15:24:56 +0000 (UTC) Message-ID: <1683acded2289fca76c221a997c6735b355f5a27.1694877577.git.vivien@planete-kraus.eu> In-Reply-To: References: Date: Sat, 16 Sep 2023 11:55:07 +0200 MIME-Version: 1.0 User-Agent: Evolution 3.46.4 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: , Reply-to: Vivien Kraus X-ACL-Warn: , Vivien Kraus via Guix-patches X-Patchwork-Original-From: Vivien Kraus via Guix-patches via From: Vivien Kraus 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 * gnu/packages/glib.scm (glib) [#:phases 'patch-pkg-config-files]: Replace the reference to libpcre-8 to libpcre2-8. --- gnu/packages/glib.scm | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index 8af89d60e0..dcc61802a4 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -449,7 +449,12 @@ (define glib (("^bindir=.*") "") (("=\\$\\{bindir\\}/") - "="))))))) + "=")) + ;; Update the required.private pcre pkg-config name + (substitute* + (list (search-input-file outputs "lib/pkgconfig/glib-2.0.pc")) + (("libpcre-8") + "libpcre2-8"))))))) (native-inputs (list dbus gettext-minimal From patchwork Sat Sep 16 12:25:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vivien Kraus X-Patchwork-Id: 17005 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 6D3EF27BBEA; Sat, 16 Sep 2023 16:26:19 +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=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,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 B14A927BBE2 for ; Sat, 16 Sep 2023 16:26:18 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qhXBF-0008K3-BL; Sat, 16 Sep 2023 11:25:57 -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 1qhXBD-0008Jf-Q2 for guix-patches@gnu.org; Sat, 16 Sep 2023 11:25:55 -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 ) id 1qhXBD-0007od-Hz for guix-patches@gnu.org; Sat, 16 Sep 2023 11:25:55 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qhXBK-0001Bm-1g; Sat, 16 Sep 2023 11:26:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66034] [PATCH gnome-team 2/3] gnu: pcre2: install static libraries. Resent-From: Vivien Kraus Original-Sender: "Debbugs-submit" Resent-CC: liliana.prikler@gmail.com, maxim.cournoyer@gmail.com, rg@raghavgururajan.name, guix-patches@gnu.org Resent-Date: Sat, 16 Sep 2023 15:26:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 66034 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 66034@debbugs.gnu.org Cc: liliana.prikler@gmail.com, maxim.cournoyer@gmail.com, rg@raghavgururajan.name X-Debbugs-Original-Xcc: liliana.prikler@gmail.com, maxim.cournoyer@gmail.com, rg@raghavgururajan.name Received: via spool by 66034-submit@debbugs.gnu.org id=B66034.16948779234492 (code B ref 66034); Sat, 16 Sep 2023 15:26:02 +0000 Received: (at 66034) by debbugs.gnu.org; 16 Sep 2023 15:25:23 +0000 Received: from localhost ([127.0.0.1]:48292 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qhXAh-0001AJ-32 for submit@debbugs.gnu.org; Sat, 16 Sep 2023 11:25:23 -0400 Received: from planete-kraus.eu ([89.234.140.182]:35408) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qhXAc-0001A5-UR for 66034@debbugs.gnu.org; Sat, 16 Sep 2023 11:25:19 -0400 Received: from planete-kraus.eu (localhost.lan [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id ff7ddf6b for <66034@debbugs.gnu.org>; Sat, 16 Sep 2023 15:25:10 +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=albinoniA; bh=+Nxm0LnNypR383VYIW88zFxs8UY=; b=P BGbuO55fUc2jukEew4rm2qUs+mmBqM24LQXVTDKVyHE2JJDw3fB7r1KC7fOOQwej MwS91VFYz3L558xbN+o7DyDI1GdftXdfoQhbiPh0/GxJePgZNMDtlqfvGsgfdXnZ /HYzcZG/5HJTdp+9uObS1j+TM2CWmOZoZrl87woIqC5wd5XMp33Z4ibI/K3H+lW7 j3EL6rgw7KbjF5QYamu53k4jnPrxyjl6lsx8mV69hQKy0Swi18TfmQqKF5AILPBS ++xt/1CrviFCns9KtXTw+7sAeTzdsIN47s2JDcfsOXhnNptJnHQ02l8rdg7m2bz1 b49Li85Mz7LeUoppehuJA== Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id 028591c9 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO) for <66034@debbugs.gnu.org>; Sat, 16 Sep 2023 15:25:10 +0000 (UTC) Message-ID: <051fe4a2bba91549c26246e071c1575f14c9ca38.1694877577.git.vivien@planete-kraus.eu> In-Reply-To: References: Date: Sat, 16 Sep 2023 14:25:58 +0200 MIME-Version: 1.0 User-Agent: Evolution 3.46.4 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: , Reply-to: Vivien Kraus X-ACL-Warn: , Vivien Kraus via Guix-patches X-Patchwork-Original-From: Vivien Kraus via Guix-patches via From: Vivien Kraus 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 * gnu/packages/pcre.scm (pcre2)[#:configure-flags]: Remove "--disable-static". [#:phases 'move-static-libs]: Same as pcre. [outputs]: Add a "static" output. --- gnu/packages/pcre.scm | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/gnu/packages/pcre.scm b/gnu/packages/pcre.scm index ee48ad0e2b..c7471169d9 100644 --- a/gnu/packages/pcre.scm +++ b/gnu/packages/pcre.scm @@ -102,6 +102,7 @@ (define-public pcre2 (base32 "0s4x2l6g0sb9piwkr3sxqwdswz2g6bk1hhwngv0kv4w38wybir0l")))) (build-system gnu-build-system) + (outputs '("out" "static")) (inputs (list bzip2 readline zlib)) (arguments (list #:configure-flags @@ -114,14 +115,23 @@ (define-public pcre2 ;; riscv64-linux is an unsupported architecture. #$@(if (target-riscv64?) #~() - #~("--enable-jit")) - "--disable-static") + #~("--enable-jit"))) #:phases #~(modify-phases %standard-phases (add-after 'unpack 'patch-paths (lambda _ (substitute* "RunGrepTest" - (("/bin/echo") (which "echo")))))))) + (("/bin/echo") (which "echo"))))) + (add-after 'install 'move-static-libs + (lambda _ + (let ((source (string-append #$output "/lib")) + (static (string-append #$output:static "/lib"))) + (mkdir-p static) + (for-each (lambda (lib) + (link lib (string-append static "/" + (basename lib))) + (delete-file lib)) + (find-files source "\\.a$")))))))) (synopsis "Perl Compatible Regular Expressions") (description "The PCRE library is a set of functions that implement regular expression From patchwork Sat Sep 16 12:27:26 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vivien Kraus X-Patchwork-Id: 17006 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id DF1D327BBEA; Sat, 16 Sep 2023 16:26:25 +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=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,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 6419F27BBE2 for ; Sat, 16 Sep 2023 16:26:25 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qhXBF-0008K6-Dl; Sat, 16 Sep 2023 11:25:57 -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 1qhXBD-0008Ja-KS for guix-patches@gnu.org; Sat, 16 Sep 2023 11:25:55 -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 ) id 1qhXBD-0007oY-Cg for guix-patches@gnu.org; Sat, 16 Sep 2023 11:25:55 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qhXBK-0001Bx-Eg; Sat, 16 Sep 2023 11:26:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66034] [PATCH gnome-team 3/3] gnu: qemu: Switch to pcre2. Resent-From: Vivien Kraus Original-Sender: "Debbugs-submit" Resent-CC: liliana.prikler@gmail.com, maxim.cournoyer@gmail.com, rg@raghavgururajan.name, guix-patches@gnu.org Resent-Date: Sat, 16 Sep 2023 15:26:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 66034 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 66034@debbugs.gnu.org Cc: liliana.prikler@gmail.com, maxim.cournoyer@gmail.com, rg@raghavgururajan.name X-Debbugs-Original-Xcc: liliana.prikler@gmail.com, maxim.cournoyer@gmail.com, rg@raghavgururajan.name Received: via spool by 66034-submit@debbugs.gnu.org id=B66034.16948779294513 (code B ref 66034); Sat, 16 Sep 2023 15:26:02 +0000 Received: (at 66034) by debbugs.gnu.org; 16 Sep 2023 15:25:29 +0000 Received: from localhost ([127.0.0.1]:48295 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qhXAn-0001Ag-Dp for submit@debbugs.gnu.org; Sat, 16 Sep 2023 11:25:29 -0400 Received: from planete-kraus.eu ([89.234.140.182]:35408) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qhXAm-0001A5-FW for 66034@debbugs.gnu.org; Sat, 16 Sep 2023 11:25:28 -0400 Received: from planete-kraus.eu (localhost.lan [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id cf315d07 for <66034@debbugs.gnu.org>; Sat, 16 Sep 2023 15:25:20 +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=albinoniA; bh=nnOgkHztYYjAuFpobfkFgYN1yo4=; b=Z 6UkLoIHVneK/Ox1+YBNeNmqHiCYI6QvByf1seLZweyd+FubVquzFCrN54PaHW3dj cFBNVA+GMI+2vd5EDNaLvrBs6/TECnfq5U6GCmIqU85BUFCsvEeT+L8YgrzPZXQo BT8vi+Ofktn+OWK2MTNZadAjVZ2EtFxgNPDWtTTPLkpv6wpjCSjokpxY6bzm9551 +xV3fWDj131M4V/oshBmCk1fdD5E3wASuYSQS+PmTy1XJ903NwOkPR3hnFUuzwqq 5BkjvpbEhESbZA3NhLwfPmI2ZVKHtuFnIc1XCJGgLroh4iHLf6Q0PKrNb4VRwg/2 snT/PM0rDBf3ZMQu0BWnw== Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id 88b3064f (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO) for <66034@debbugs.gnu.org>; Sat, 16 Sep 2023 15:25:19 +0000 (UTC) Message-ID: <295660c04d49fb96a446201cee89a70e337328e4.1694877577.git.vivien@planete-kraus.eu> In-Reply-To: References: Date: Sat, 16 Sep 2023 14:27:26 +0200 MIME-Version: 1.0 User-Agent: Evolution 3.46.4 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: , Reply-to: Vivien Kraus X-ACL-Warn: , Vivien Kraus via Guix-patches X-Patchwork-Original-From: Vivien Kraus via Guix-patches via From: Vivien Kraus 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 * gnu/packages/virtualization.scm (qemu) [native-inputs]: Replace the static output of pcre with that of pcre2. --- gnu/packages/virtualization.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index f5bdedd45e..49817fdbcd 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -481,7 +481,7 @@ (define-public qemu ;; The following static libraries are required to build ;; the static output of QEMU. `(,glib "static") - `(,pcre "static") + `(,pcre2 "static") `(,zlib "static"))) (home-page "https://www.qemu.org") (synopsis "Machine emulator and virtualizer")