From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51198) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e86QY-0004FJ-QF for guix-patches@gnu.org; Fri, 27 Oct 2017 11:20:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1e86QV-00081d-Kr for guix-patches@gnu.org; Fri, 27 Oct 2017 11:20:06 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:57076) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1e86QV-00081C-Fn for guix-patches@gnu.org; Fri, 27 Oct 2017 11:20:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1e86QU-0003m8-EM for guix-patches@gnu.org; Fri, 27 Oct 2017 11:20:03 -0400 Subject: [bug#27344] [PATCH v4 1/3] gnu: freehdl: Fix gvhdl and freehdl-gennodes scripts. Resent-Message-ID: From: ludo@gnu.org (Ludovic =?UTF-8?Q?Court=C3=A8s?=) References: <87tvyksmyt.fsf@foradis.org> <20171027141819.21006-1-theodoros@foradis.org> Date: Fri, 27 Oct 2017 08:19:16 -0700 In-Reply-To: <20171027141819.21006-1-theodoros@foradis.org> (Theodoros Foradis's message of "Fri, 27 Oct 2017 17:18:17 +0300") Message-ID: <87k1zgaaa3.fsf@gnu.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: Theodoros Foradis Cc: 27344@debbugs.gnu.org --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Hi Theodoros, Theodoros Foradis skribis: > * gnu/packages/engineering.scm (freehdl): > [arguments] : Add patch-gvhdl and patch-freehdl-gennodes phases. > Wrap-program "/bin/gvhdl" in make-wrapper phase. > [inputs]: Add guile-2.2. Applied with this change, which makes sure we=E2=80=99re referring to the r= ight =E2=80=9Cguile=E2=80=9D: --=-=-= Content-Type: text/x-patch Content-Disposition: inline diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index 92745852d..1d686271d 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -1456,9 +1456,10 @@ parallel computing platforms. It also supports serial execution.") (("-lm") "-lm FREEHDL/lib/freehdl/libieee.la")) #t)) (add-after 'patch-gvhdl 'patch-freehdl-gennodes - (lambda _ + (lambda* (#:key inputs #:allow-other-keys) (substitute* "freehdl/freehdl-gennodes.in" - (("guile") (which "guile")) + (("guile") + (string-append (assoc-ref inputs "guile") "/bin/guile")) (("\\(debug") ";(debug") (("\\(@ ") "(apply-emit") (("\\(@@ ") "(apply-mini-format")) @@ -1476,6 +1477,8 @@ parallel computing platforms. It also supports serial execution.") (add-after 'install-scripts 'make-wrapper (lambda* (#:key inputs outputs #:allow-other-keys) (let ((out (assoc-ref outputs "out"))) + ;; 'gvhdl' invokes the C compiler directly, so hard-code its + ;; file name. (wrap-program (string-append out "/bin/gvhdl") `("CPLUS_INCLUDE_PATH" ":" prefix (,(string-append (assoc-ref inputs "gcc-toolchain") --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable > + ("gcc-toolchain" ,gcc-toolchain-5) Did you choose version 5 on purpose or would any version work? In the latter case, I=E2=80=99d replace it with =E2=80=98gcc-toolchain=E2= =80=99. Thanks! Ludo=E2=80=99. --=-=-=--