From patchwork Tue Aug 17 10:19:07 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Efraim Flashner X-Patchwork-Id: 32152 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 23C0727BC78; Tue, 17 Aug 2021 11:27:15 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id D806D27BC6B for ; Tue, 17 Aug 2021 11:27:14 +0100 (BST) Received: from localhost ([::1]:33294 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mFwJN-0005dM-MN for patchwork@mira.cbaines.net; Tue, 17 Aug 2021 06:27:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53140) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mFwJE-0005d6-0b for guix-patches@gnu.org; Tue, 17 Aug 2021 06:27:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:40265) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mFwJC-00085s-1Q for guix-patches@gnu.org; Tue, 17 Aug 2021 06:27:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mFwJB-0004K2-U1 for guix-patches@gnu.org; Tue, 17 Aug 2021 06:27:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50091] [PATCH 09/21] gnu: pcre: Fix building on riscv64-linux. Resent-From: Efraim Flashner Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 17 Aug 2021 10:27:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 50091 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 50091@debbugs.gnu.org Cc: Efraim Flashner Received: via spool by 50091-submit@debbugs.gnu.org id=B50091.162919597216544 (code B ref 50091); Tue, 17 Aug 2021 10:27:01 +0000 Received: (at 50091) by debbugs.gnu.org; 17 Aug 2021 10:26:12 +0000 Received: from localhost ([127.0.0.1]:51808 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mFwIJ-0004Ii-Sh for submit@debbugs.gnu.org; Tue, 17 Aug 2021 06:26:12 -0400 Received: from flashner.co.il ([178.62.234.194]:45936) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mFwID-0004HV-Fe for 50091@debbugs.gnu.org; Tue, 17 Aug 2021 06:26:06 -0400 Received: from localhost (unknown [141.226.169.107]) by flashner.co.il (Postfix) with ESMTPSA id 85247402E0; Tue, 17 Aug 2021 10:25:55 +0000 (UTC) From: Efraim Flashner Date: Tue, 17 Aug 2021 13:19:07 +0300 Message-Id: <874b6930d544e1f7179b98dbcb58aea84e143e70.1629193993.git.efraim@flashner.co.il> X-Mailer: git-send-email 2.32.0 In-Reply-To: References: MIME-Version: 1.0 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+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/pcre.scm (pcre)[arguments]: Adjust configure-flags to not build with JIT when building for riscv64-linux. --- gnu/packages/pcre.scm | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/gnu/packages/pcre.scm b/gnu/packages/pcre.scm index 318727915e..315dd8be1d 100644 --- a/gnu/packages/pcre.scm +++ b/gnu/packages/pcre.scm @@ -5,7 +5,7 @@ ;;; Copyright © 2016 Leo Famulari ;;; Copyright © 2017 Marius Bakke ;;; Copyright © 2017 Ludovic Courtès -;;; Copyright © 2017 Efraim Flashner +;;; Copyright © 2017, 2021 Efraim Flashner ;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; Copyright © 2021 Jean-Baptiste Volatier ;;; Copyright © 2021 Simon Tournier @@ -32,6 +32,7 @@ #:use-module (gnu packages) #:use-module (guix packages) #:use-module (guix download) + #:use-module (guix utils) #:use-module (guix build-system gnu)) (define-public pcre @@ -54,7 +55,7 @@ ("readline" ,readline) ("zlib" ,zlib))) (arguments - '(#:disallowed-references ("doc") + `(#:disallowed-references ("doc") #:configure-flags '("--enable-utf" "--enable-pcregrep-libz" "--enable-pcregrep-libbz2" @@ -62,7 +63,9 @@ "--enable-unicode-properties" "--enable-pcre16" "--enable-pcre32" - "--enable-jit") + ,@(if (target-riscv?) + '() + `("--enable-jit"))) #:phases (modify-phases %standard-phases (add-after 'install 'move-static-libs (lambda* (#:key outputs #:allow-other-keys)