From patchwork Tue Apr 12 18:57:49 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Paul A. Patience" X-Patchwork-Id: 38546 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 8B51227BBEB; Tue, 12 Apr 2022 19:58:59 +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=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 4961B27BBE9 for ; Tue, 12 Apr 2022 19:58:59 +0100 (BST) Received: from localhost ([::1]:38234 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1neLj8-0000ZF-DW for patchwork@mira.cbaines.net; Tue, 12 Apr 2022 14:58:58 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43774) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1neLiF-0000Yo-E2 for guix-patches@gnu.org; Tue, 12 Apr 2022 14:58:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:56093) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1neLiF-0007wg-4b for guix-patches@gnu.org; Tue, 12 Apr 2022 14:58:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1neLiF-0007JJ-4o for guix-patches@gnu.org; Tue, 12 Apr 2022 14:58:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#54892] [PATCH 3/3] gnu: nomad-optimizer: Update to 4.2.0. Resent-From: "Paul A. Patience" Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 12 Apr 2022 18:58:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 54892 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 54892@debbugs.gnu.org Cc: "Paul A. Patience" X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.164978988028063 (code B ref -1); Tue, 12 Apr 2022 18:58:02 +0000 Received: (at submit) by debbugs.gnu.org; 12 Apr 2022 18:58:00 +0000 Received: from localhost ([127.0.0.1]:49986 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1neLiC-0007IY-Bj for submit@debbugs.gnu.org; Tue, 12 Apr 2022 14:58:00 -0400 Received: from lists.gnu.org ([209.51.188.17]:53986) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1neLiA-0007IR-P5 for submit@debbugs.gnu.org; Tue, 12 Apr 2022 14:57:59 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43768) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1neLiA-0000Yb-FY for guix-patches@gnu.org; Tue, 12 Apr 2022 14:57:58 -0400 Received: from mail-4323.proton.ch ([185.70.43.23]:44962) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1neLi7-0007un-P0 for guix-patches@gnu.org; Tue, 12 Apr 2022 14:57:57 -0400 Date: Tue, 12 Apr 2022 18:57:49 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=apatience.com; s=protonmail2; t=1649789872; bh=O8G9XPIiw5PSavPSAOVKL0hqZJmD2DpH1QWmXvMAXrI=; h=Date:To:From:Cc:Reply-To:Subject:Message-ID:In-Reply-To: References:From:To:Cc:Date:Subject:Reply-To:Feedback-ID: Message-ID; b=qYHfq7T6khQj51cs597KO6+Uiy42OvhyhXFpaMZJ1QxTLXFT+XjXNSvC4WfbivnbO GDnaNpdEx8SQzNC2/Uxmc5rZuhn7yISQlJ9aaCmuhCGibWV20MRVP3sczOWjlXfKCl 3xAcf+1ckk56A/g+z6f7sfzssQCB6+UUm9P7LVIJTsghYOfx+oGhlbysuryFLTUbTA n+pEBeWzS4FBsLZ4bGdf1mUAwKfFM2t3GtmDWI1CfPWtalShuwxya2UgNMqzUzffno VHgheL3jWHSZoq4ndWWxSABZvj881dYauiJY3CmaTq1S4uRACWp1hHkHm7/H2SAAAo Vy/9TAoSsSKpw== From: "Paul A. Patience" Message-ID: <20220412185712.67292-3-paul@apatience.com> In-Reply-To: <20220412185712.67292-1-paul@apatience.com> References: <20220412185712.67292-1-paul@apatience.com> MIME-Version: 1.0 Received-SPF: pass client-ip=185.70.43.23; envelope-from=paul@apatience.com; helo=mail-4323.proton.ch 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, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham 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: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: "Paul A. Patience" Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/maths.scm (nomad-optimizer): Update to 4.2.0. [arguments]: Accommodate updated build process. --- gnu/packages/maths.scm | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) -- 2.35.1 diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index b68cb966c2..8ebfb87480 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -1937,17 +1937,17 @@ (define-public ipopt (define-public nomad-optimizer (package (name "nomad-optimizer") - (version "4.1.0") + (version "4.2.0") (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/bbopt/nomad/") - (commit (string-append "v" version)))) + (commit (string-append "v." version)))) (file-name (git-file-name name version)) (sha256 (base32 - "0w386d8r5ldbvnv0c0g7vz95pfpvwdxis26vaalk2amsa5akl775")))) + "1r4ygy3xn83dnppsw1451ynklsxpb238g5gk57inn84ghmdk08mj")))) (build-system cmake-build-system) (native-inputs (list python-wrapper python-cython)) @@ -1959,7 +1959,8 @@ (define-public nomad-optimizer (guix build cmake-build-system) (guix build utils)) #:configure-flags - '("-DBUILD_INTERFACES=ON" + '("-DBUILD_INTERFACE_C=ON" + "-DBUILD_INTERFACE_PYTHON=ON" "-DBUILD_TESTS=ON") #:phases (modify-phases %standard-phases @@ -1993,8 +1994,11 @@ (define-public nomad-optimizer (substitute* "interfaces/PyNomad/setup_PyNomad.py" (("^( +os_include_dirs = ).*" _ prefix) (string-append prefix "[\"../../src\"]\n")) - (("^(installed_lib_dir = ).*" _ prefix) - (string-append prefix "\"" out "/lib\"\n")))))) + (("^(installed_lib_dir1 = ).*" _ prefix) + (string-append prefix "\"" out "/lib\"\n")) + (("^installed_lib_dir2 = .*") "") + (("^ +link_args\\.append\\(\"-Wl,-rpath,\" \\+ installed_lib_dir2\\)\n") + ""))))) ;; Fix the tests so they run in out-of-source builds. (add-after 'fix-sources-for-build 'fix-sources-for-tests