From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2.migadu.com ([2001:41d0:403:4876::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms1.migadu.com with LMTPS id eGLMNfL4RGaJzwAAe85BDQ:P1 (envelope-from ) for ; Wed, 15 May 2024 20:03:31 +0200 Received: from aspmx1.migadu.com ([2001:41d0:403:4876::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2.migadu.com with LMTPS id eGLMNfL4RGaJzwAAe85BDQ (envelope-from ) for ; Wed, 15 May 2024 20:03:31 +0200 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=rimm.ee header.s=herman header.b=EFZwgDI2; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=pass (policy=none) header.from=gnu.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1715796210; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=UuIDLrQb+owlRJ/gx2ZXt+/arthnurEKaJG7ORcrsC4=; b=QAZaRdnjk9JKUiygMvIP1KZQlQ6X1dXPjjw7U39amTkxX53qrZoO1XIiy0k8Ewm8ZeY6ps Aa60Aki2TiQVpnv7Po3CL5Mj0LfJJ7PL9YwF+TMZ/191q/YLxL4uKmxTLDKqcnSNuDwL4V SSW2qnUuTYsDRTcYYa13RMzueHOoNcOL1BGQ+S8y4DnuveNRq2jWoB/aQ1FZWLT1VoEHp1 Ien5ukFrkSdxAKsZaYjhkVjpBKBRgg1/hhNurd1sp8TUe9l45RZhzPdYIgTrhh1UU0cmi7 Efvj/EFUNb+ZPQmDVRzE4lXWinBdXTqomXBi4GUJuiErDgrOG+PoKa2W3ip9hw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=rimm.ee header.s=herman header.b=EFZwgDI2; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=pass (policy=none) header.from=gnu.org ARC-Seal: i=1; s=key1; d=yhetil.org; t=1715796210; a=rsa-sha256; cv=none; b=BAML+AWRq9g25b9jpi5m1kftOu3e8lCl+kSTZXDaCgSaMoshCWD9/jdyh3eTCttlyanNRE hSfUcvPCdAEpGp+Ps87tt59PtNTyrXwPSkb1HD6ACWnP/Ot17ONsnCd0CmHVCjP3YMCMDl l4K2k4WzqKHDeAReWg+25SQ9Ji8x4aDuYIIvsKH9aBAfXcBAG8Mgn0jrvZGy9gIS22CZGZ fzyYdAB3LxHJIU29oXM6H1rRm3MDliIezfGQAu1iQp/ew4nE97OS5Bp+kJhiMvw/Yp5qTd Ah0Zfb1qOa8elDA+k7jesx372XkLf0uVVZ1KkwClRO2qX3GgPJiGIWWiph2aMw== Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id A194571FA6 for ; Wed, 15 May 2024 20:03:30 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1s7Iy5-0003lQ-BT; Wed, 15 May 2024 14:03:09 -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 1s7Ixz-0003jK-A6 for guix-patches@gnu.org; Wed, 15 May 2024 14:03: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 ) id 1s7Ixz-00006a-1q for guix-patches@gnu.org; Wed, 15 May 2024 14:03:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1s7Ixz-0002OC-Cm; Wed, 15 May 2024 14:03:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70087] [PATCH 1/3] gnu: gecode: Update to 6.2.0-1.f7f0d7c. Resent-From: Herman Rimm Original-Sender: "Debbugs-submit" Resent-CC: andreas@enge.fr, bavier@posteo.net, sharlatanus@gmail.com, guix-patches@gnu.org Resent-Date: Wed, 15 May 2024 18:03:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 70087 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 70087@debbugs.gnu.org Cc: Andreas Enge , Eric Bavier , Sharlatan Hellseher X-Debbugs-Original-Xcc: Andreas Enge , Eric Bavier , Sharlatan Hellseher Received: via spool by 70087-submit@debbugs.gnu.org id=B70087.17157961649146 (code B ref 70087); Wed, 15 May 2024 18:03:03 +0000 Received: (at 70087) by debbugs.gnu.org; 15 May 2024 18:02:44 +0000 Received: from localhost ([127.0.0.1]:43567 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s7Ixf-0002NS-7L for submit@debbugs.gnu.org; Wed, 15 May 2024 14:02:44 -0400 Received: from 81-205-150-117.fixed.kpn.net ([81.205.150.117]:44905 helo=email.rimm.ee) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s7IxN-0002Mb-Um for 70087@debbugs.gnu.org; Wed, 15 May 2024 14:02:41 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rimm.ee; s=herman; t=1715796136; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=UuIDLrQb+owlRJ/gx2ZXt+/arthnurEKaJG7ORcrsC4=; b=EFZwgDI22vx2x82RjMHclqFFg3HnWqqlAn0MhDqrvFebBHDDI9KfqBUSu+2z7dt7g+Z7R6 P4sf3yLNvgVWIsXbGRW374hcu6GAAUQ2lFz9NoyjM/7q4/S4wt689ryD3fJYCxwFas2ltr bEsQ7vKCVMlYeAL4IyAThdKzVfwSSfD8geViWXlxVXI0bMAdxNuMv8wgQmTBNqFOaMcyGk Wck/E/oFKliCzo6UFAdOkft+wSnoU+TWl/r81SgM2YQ8carr/aB7xq3hP9Y5xvvFHn5F7w /3YZFcMwrO0tTAnJx6oaODaS6+QZ2OLa4Js0rG7B4looiriuaN3v5NFFR/KjEA== Received: by 81-205-150-117.fixed.kpn.net (OpenSMTPD) with ESMTPSA id 27cefa58 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO) for <70087@debbugs.gnu.org>; Wed, 15 May 2024 18:02:16 +0000 (UTC) Date: Wed, 15 May 2024 20:01:58 +0200 Message-ID: <5f72bf3db2123b5e1a7b724a09b87325661ad103.1715795372.git.herman@rimm.ee> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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: Herman Rimm X-ACL-Warn: , Herman Rimm via Guix-patches From: Herman Rimm via Guix-patches via Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN X-Spam-Score: -6.37 X-Migadu-Queue-Id: A194571FA6 X-Migadu-Scanner: mx10.migadu.com X-Migadu-Spam-Score: -6.37 X-TUID: 5/Gq3o4F13FA * gnu/packages/maths.scm (gecode): Update to 6.2.0-1.f7f0d7c. [version]: Use version. [arguments]: Add patch-msc-and-version phase. Install examples to the examples output again. (minizinc)[arguments]: Copy provided gecode.msc file instead. Change-Id: I5e89105f3fef61d6aa677a4a118225679220ce5d --- gnu/packages/maths.scm | 105 +++++++++++++++++------------------------ 1 file changed, 43 insertions(+), 62 deletions(-) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 1feabe5f1c..6cb3bdbfb0 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -2703,28 +2703,26 @@ (define-public clp (license license:epl1.0))) (define-public gecode - ;; The current release is not compatible with minizinc anymore. - ;; Use a commit that has been tested with minizinc. - (let ((commit "2d20e88cae176584b6e09d909aca3eb72ae76829") - (revision "2")) + (let* ((commit "f7f0d7c273d6844698f01cec8229ebe0b66a016a") + (version (git-version "6.2.0" "1" commit))) (package (name "gecode") - (version (git-version "6.2.0" revision commit)) + (version version) (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/Gecode/gecode") - (commit commit))) + (url "https://github.com/Gecode/gecode") + (commit commit))) (file-name (git-file-name name version)) (sha256 - (base32 "0hf7hd7m5p26xwn8f561f0gn2a6q33xz818jg3ivmvp2ysmmmm4r")) + (base32 + "16gzwa64w90vifaflmii515rsrqclf2y7nziq621m4ad9cjgcixj")) (modules '((guix build utils))) - (snippet '(begin - ;; delete generated sources - (for-each delete-file - '("gecode/kernel/var-imp.hpp" - "gecode/kernel/var-type.hpp")))))) + ;; delete generated sources + (snippet '(for-each delete-file + '("gecode/kernel/var-imp.hpp" + "gecode/kernel/var-type.hpp"))))) (outputs '("out" "examples")) (build-system gnu-build-system) (arguments @@ -2738,6 +2736,16 @@ (define-public gecode (ice-9 popen)) #:phases #~(modify-phases %standard-phases + (add-before 'configure 'patch-msc-and-version + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (substitute* "tools/flatzinc/gecode.msc.in" + (("\\.\\./../..") out) + (("\\.\\.") + (string-append out "/share/minizinc"))) + (substitute* "configure" + (("(PACKAGE_[^0-9]*)[0-9\\.]+" all match) + (string-append match #$version)))))) (add-after 'build 'build-examples (lambda _ (invoke "make" "compileexamples"))) @@ -2746,33 +2754,27 @@ (define-public gecode (add-after 'install 'fix-rpath (lambda _ (let ((libdir (string-append #$output "/lib"))) - (for-each (lambda (file) - (let* ((pipe (open-pipe* OPEN_READ - "patchelf" - "--print-rpath" file)) - (line (read-line pipe))) - (and (zero? (close-pipe pipe)) - (invoke "patchelf" "--set-rpath" - (string-append libdir - ":" line) - file)))) - (find-files libdir ".*\\.so$"))))) + (for-each + (lambda (file) + (let* ((pipe (open-pipe* OPEN_READ "patchelf" + "--print-rpath" file)) + (line (read-line pipe))) + (and (zero? (close-pipe pipe)) + (invoke "patchelf" "--set-rpath" + (string-append libdir ":" line) + file)))) + (find-files libdir ".*\\.so$"))))) (add-after 'install 'install-examples - (lambda _ - (invoke "make" "installexamples" - (string-append "bindir=" - #$output "/bin")))) - ;; Tests depend on installed libraries. - (delete 'check) - (add-after 'fix-rpath 'check - (assoc-ref %standard-phases - 'check))))) + (lambda* (#:key outputs #:allow-other-keys) + (let* ((examples (assoc-ref outputs "examples")) + (bindir (format #f "bindir=~a/bin" examples))) + (invoke "make" "installexamples" bindir))))))) (native-inputs (list patchelf perl sed)) (home-page "https://www.gecode.org") (synopsis "Toolkit for developing constraint-based systems") (description - "Gecode is a C++ toolkit for developing constraint-based -systems and applications. It provides a modular and extensible solver.") + "Gecode is a C++ toolkit for developing constraint-based systems +and applications. It provides a modular and extensible solver.") (license license:expat)))) (define-public libfixmath @@ -4180,33 +4182,12 @@ (define-public minizinc }" port) (newline port))) - - (copy-recursively - (string-append chuffed "/share/minizinc/solvers") - (string-append pkgdatadir "/solvers")) - (call-with-output-file (string-append pkgdatadir - "/solvers/gecode.msc") - (lambda (port) - (format port - "\ -{ - \"id\": \"org.gecode.gecode\", - \"name\": \"Gecode\", - \"description\": \"Gecode FlatZinc executable\", - \"version\": ~s, - \"mznlib\": ~s, - \"executable\": ~s, - \"supportsMzn\": false, - \"supportsFzn\": true, - \"needsSolns2Out\": true, - \"needsMznExecutable\": false, - \"needsStdlibDir\": false, - \"isGUIApplication\": false -}" - (last (string-split gecode #\-)) - (string-append gecode "/share/gecode/mznlib") - (string-append gecode "/bin/fzn-gecode")) - (newline port))))))))) + (for-each + (lambda (solver) + (copy-recursively + (string-append solver "/share/minizinc/solvers") + (string-append pkgdatadir "/solvers"))) + (list gecode chuffed)))))))) (native-inputs (list bison flex)) (inputs -- 2.41.0