From patchwork Sat Dec 18 19:04:48 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Ludovic_Court=C3=A8s?= X-Patchwork-Id: 35394 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 AA8AB27BBEA; Sat, 18 Dec 2021 19:05:23 +0000 (GMT) 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,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL, SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable 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 7331A27BBE9 for ; Sat, 18 Dec 2021 19:05:23 +0000 (GMT) Received: from localhost ([::1]:60748 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1myf1G-0001lz-Ls for patchwork@mira.cbaines.net; Sat, 18 Dec 2021 14:05:22 -0500 Received: from eggs.gnu.org ([209.51.188.92]:33212) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1myf0w-0001lW-Oo for guix-patches@gnu.org; Sat, 18 Dec 2021 14:05:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:60532) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1myf0w-0003zB-GS for guix-patches@gnu.org; Sat, 18 Dec 2021 14:05:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1myf0w-00088F-CY for guix-patches@gnu.org; Sat, 18 Dec 2021 14:05:02 -0500 Subject: bug#51996: [PATCH] gnu: Add xfoil. Resent-From: Ludovic =?utf-8?q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-To: guix-patches@gnu.org Resent-Date: Sat, 18 Dec 2021 19:05:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: cc-closed 51996 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Foo Chuan Wei Cc: 51996-done@debbugs.gnu.org Mail-Followup-To: 51996@debbugs.gnu.org, ludo@gnu.org, chuanwei.foo@hotmail.com Received: via spool by 51996-done@debbugs.gnu.org id=D51996.163985429731241 (code D ref 51996); Sat, 18 Dec 2021 19:05:02 +0000 Received: (at 51996-done) by debbugs.gnu.org; 18 Dec 2021 19:04:57 +0000 Received: from localhost ([127.0.0.1]:43844 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1myf0r-00087p-0M for submit@debbugs.gnu.org; Sat, 18 Dec 2021 14:04:57 -0500 Received: from eggs.gnu.org ([209.51.188.92]:60670) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1myf0p-00087b-JO for 51996-done@debbugs.gnu.org; Sat, 18 Dec 2021 14:04:55 -0500 Received: from [2001:470:142:3::e] (port=36402 helo=fencepost.gnu.org) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1myf0k-0003yM-CC; Sat, 18 Dec 2021 14:04:50 -0500 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=Skb8x85ddwP3pDnmNxXDsDJ+DGnPzL3Y8jv/6XqAxcM=; b=nuz9bYOe8j1Z7uUbgrTO uvbptVYcfjrTvg4VkvW9dH0uuwzRzlQq0Id+fursEWrdnPsJC9adsijv6O++r4jgMyfxHc76DkMAw R20x60ax6KFRYrUHDbyo3jsBlc/YFXYFpriW/kH1sdSFHUqGYN0j45PBS4RqsMAj/Bi0O0fPzmii1 3WaGZRUqx+Y/cnD6UXIlmkxSuZPIR4/sGpzi4GoW1uDKwmvVYbAfOC67aKs6NPLcQ6SD+ZIb9Iwzh iehdAKdieAs4e5nqHrnvB26ysk7gUtE9ryh+gkCl0PhAs/CYFP5RJmj6JSgMmFtwYzACHiiVdXpWZ kd8RXg1eQZQp3g==; Received: from 91-160-117-201.subs.proxad.net ([91.160.117.201]:56032 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1myf0k-0006oA-C3; Sat, 18 Dec 2021 14:04:50 -0500 From: Ludovic =?utf-8?q?Court=C3=A8s?= References: Date: Sat, 18 Dec 2021 20:04:48 +0100 In-Reply-To: (Foo Chuan Wei's message of "Sun, 21 Nov 2021 10:40:50 +0000") Message-ID: <87mtkxohtb.fsf_-_@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) 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 Hi, Foo Chuan Wei skribis: > * gnu/packages/engineering.scm (xfoil): New variable. Applied with the changes below. Thanks! Ludo’. diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index 42f5544a54..e0fe0f354f 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -2961,6 +2961,10 @@ (define-public xfoil (with-directory-excursion "orrs" (invoke "bin/osgen" "osmaps_ns.lst")) (invoke "make" "-C" "plotlib") + (substitute* "bin/Makefile_gfortran" + (("^FFLAGS =(.*)$" _ suffix) + (string-append "FFLAGS = -fallow-argument-mismatch " + suffix "\n"))) (invoke "make" "-C" "bin" "-f" "Makefile_gfortran"))) (replace 'install (lambda* (#:key outputs #:allow-other-keys) @@ -2976,9 +2980,9 @@ (define-public xfoil (install-file "xfoil_doc.txt" doc-dir))))) #:tests? #f)) (inputs - `(("libx11" ,libx11))) + (list libx11)) (native-inputs - `(("gfortran" ,gfortran))) + (list gfortran)) (home-page "https://web.mit.edu/drela/Public/web/xfoil/") (synopsis "Program for the design and analysis of subsonic airfoils") (description