From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36173) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e8AX5-0000mm-G3 for guix-patches@gnu.org; Fri, 27 Oct 2017 15:43:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1e8AX0-0007XA-J5 for guix-patches@gnu.org; Fri, 27 Oct 2017 15:43:07 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:57218) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1e8AX0-0007Wz-F3 for guix-patches@gnu.org; Fri, 27 Oct 2017 15:43:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1e8AX0-0005VO-0g for guix-patches@gnu.org; Fri, 27 Oct 2017 15:43:02 -0400 Subject: [bug#27344] [PATCH v4 2/3] gnu: Add qucs. 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> <20171027141819.21006-2-theodoros@foradis.org> <87fua4aa43.fsf@gnu.org> <87r2tosgt8.fsf@foradis.org> Date: Fri, 27 Oct 2017 12:42:36 -0700 In-Reply-To: <87r2tosgt8.fsf@foradis.org> (Theodoros Foradis's message of "Fri, 27 Oct 2017 19:20:51 +0300") Message-ID: <8737649y37.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 Theodoros Foradis skribis: > Ludovic Court=C3=A8s writes: > >> Theodoros Foradis skribis: >> >>> * gnu/packages/engineering.scm (qucs): New variable. >> >> [...] >> >>> + (wrap-program (string-append out "/bin/qucs") >>> + `("CPLUS_INCLUDE_PATH" ":" prefix >>> + (,(string-append (assoc-ref inputs "gcc-toolchain") >>> + "/include"))) >>> + `("PATH" ":" prefix >>> + (,(string-append (assoc-ref inputs "gcc-toolchain") >>> + "/bin"))) >>> + `("LIBRARY_PATH" ":" prefix >>> + (,(string-append (assoc-ref inputs "gcc-toolchain") >>> + "/lib"))) >> >> Is this still needed now that freehdl wraps things? >> >> If not, could you send an updated patch? > > Yes, it's needed because qucs and qucs-s don't use gvhdl (freehdl's > script that we wrap that calls the compiler). > > They use freehdl-v2cc to compile to C, and have their own scripts to > compile to executable. Sounds good. Committed with the changes below. Thank you! Ludo=E2=80=99. --=-=-= Content-Type: text/x-patch Content-Disposition: inline diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index 3ef1cdfbe..a5e152c40 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -1567,6 +1567,7 @@ parallel computing platforms. It also supports serial execution.") (add-after 'install 'make-wrapper (lambda* (#:key inputs outputs #:allow-other-keys) (let ((out (assoc-ref outputs "out"))) + ;; 'qucs' directly invokes gcc, hence this wrapping. (wrap-program (string-append out "/bin/qucs") `("CPLUS_INCLUDE_PATH" ":" prefix (,(string-append (assoc-ref inputs "gcc-toolchain") @@ -1598,7 +1599,7 @@ parallel computing platforms. It also supports serial execution.") ("asco" ,asco) ("coreutils" ,coreutils) ("freehdl" ,freehdl) - ("gcc-toolchain" ,gcc-toolchain-5) + ("gcc-toolchain" ,gcc-toolchain) ("iverilog" ,iverilog) ("libtool" ,libtool) ("octave" ,octave) @@ -1607,8 +1608,8 @@ parallel computing platforms. It also supports serial execution.") (home-page "http://qucs.sourceforge.net/") (synopsis "Circuit simulator with graphical user interface") (description - "Qucs is a circuit simulator with graphical user interface. - The software aims to support all kinds of circuit simulation types, -e.g. DC, AC, S-parameter, Transient, Noise and Harmonic Balance analysis. - Pure digital simulations are also supported.") + "Qucs is a circuit simulator with graphical user interface. The software +aims to support all kinds of circuit simulation types---e.g. DC, AC, +S-parameter, transient, noise and harmonic balance analysis. Pure digital +simulations are also supported.") (license license:gpl2+))) --=-=-=--