From a7b14a1b391fcd1365441da1298d425d520e7b57 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 24 Aug 2018 02:58:23 +0200 Subject: [PATCH] gnu: capstone: Update to 3.0.5. * gnu/packages/engineering.scm (capstone): Update to 3.0.5. [arguments]: Set cstool's LDFLAGS in the environment instead of SUBSTITUTE*ing the Makefile. --- gnu/packages/engineering.scm | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index b66b8d72bf..f11ce71f5a 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -1008,7 +1008,7 @@ language, ADMS transforms Verilog-AMS code into other target languages.") (define-public capstone (package (name "capstone") - (version "3.0.5-rc2") + (version "3.0.5") (source (origin (method url-fetch) (uri (string-append "https://github.com/aquynh/capstone/archive/" @@ -1016,22 +1016,20 @@ language, ADMS transforms Verilog-AMS code into other target languages.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1cqms9r2p43aiwp5spd84zaccp16ih03r7sjhrv16nddahj0jz2q")))) + "1wbd1g3r32ni6zd9vwrq3kn7fdp9y8qwn9zllrrbk8n5wyaxcgci")))) (build-system gnu-build-system) (arguments `(#:tests? #f - #:make-flags (list (string-append "PREFIX=" %output) + #:make-flags (list (string-append "PREFIX=" (assoc-ref %outputs "out")) "CC=gcc") #:phases (modify-phases %standard-phases - (delete 'configure) - ;; cstool's Makefile overrides LDFLAGS, so we cannot pass it as a make flag. + (delete 'configure) ; no configure script + ;; cstool's Makefile ‘+=’s LDFLAGS, so we cannot pass it as a make flag. (add-before 'build 'fix-cstool-ldflags (lambda* (#:key outputs #:allow-other-keys) - (substitute* "cstool/Makefile" - (("LDFLAGS =") - (string-append "LDFLAGS = -Wl,-rpath=" (assoc-ref outputs "out") - "/lib"))) + (setenv "LDFLAGS" (string-append "-Wl,-rpath=" + (assoc-ref outputs "out") "/lib")) #t))))) (home-page "http://www.capstone-engine.org") (synopsis "Lightweight multi-platform, multi-architecture disassembly framework")