From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59327) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dOfLW-0000EG-5B for guix-patches@gnu.org; Sat, 24 Jun 2017 03:19:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dOfLS-0000tq-61 for guix-patches@gnu.org; Sat, 24 Jun 2017 03:19:06 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:60677) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dOfLS-0000tm-21 for guix-patches@gnu.org; Sat, 24 Jun 2017 03:19:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1dOfLR-0002zd-Mt for guix-patches@gnu.org; Sat, 24 Jun 2017 03:19:01 -0400 Subject: [bug#27344] [PATCH v2 06/12] gnu: Add freehdl. Resent-Message-ID: Date: Sat, 24 Jun 2017 09:18:37 +0200 From: Danny Milosavljevic Message-ID: <20170624091837.4097c371@scratchpost.org> In-Reply-To: <20170622191005.25422-6-theodoros.for@openmailbox.org> References: <20170622191005.25422-1-theodoros.for@openmailbox.org> <20170622191005.25422-6-theodoros.for@openmailbox.org> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit 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 Hi Theodoros, > + (add-before 'configure 'patch-pkg-config > + (lambda _ > + (substitute* "freehdl/freehdl-config" > + (("pkg-config") (which "pkg-config")) > + (("cat") (which "cat"))) > + #t)) freehdl-config is installed, but it uses a path to pkg-config which is from a native-input (so it will not be retained). Does this ever work again after removing pkg-config from your profile and then doing "guix gc" ? I doubt it... > + (add-after 'configure 'patch-freehdl-pc > + (lambda _ > + (substitute* "freehdl.pc" > + (("=g\\+\\+") (string-append "=" (which "g++"))) > + (("=libtool") (string-append "=" (which "libtool")))) > + #t)) Same here... > + (add-after 'install-scripts 'make-wrapper > + (lambda* (#:key outputs #:allow-other-keys) > + (let ((out (assoc-ref outputs "out"))) > + (wrap-program (string-append out "/bin/freehdl-config") > + `("PKG_CONFIG_PATH" ":" prefix (,(string-append out "/lib/pkgconfig"))))) > + #t))))) > + (inputs > + `(("perl" ,perl))) > + (native-inputs > + `(("pkg-config" ,pkg-config) > + ("libtool" ,libtool))) I've pushed PATCH v2 01 to 05 (inclusive) to master as: - bf6e6c39646e6180f57a5146dd77a3a01d870c9e (adms) - c5c380100635b47afb11c9bbb213ad1fc4cb5f64 (meep) - 66c3639c468c822a33c746065bcbbae698d5900d (mpb) - 5738ebee1b5e50e8e876c103be7afc2ec4f4daf0 (guile-libctl) - 196627c2757c6dd6d2ef792e69eb6a969728cecf (harminv) I'm not sure how to proceed so I'll stop at this point (with freehdl not in) until the path is clear :)