Skip to content

Commit 43d8173

Browse files
committed
guix: import LIEF from upstream (0.12.3)
Updates to version 0.12.3. Retain our PPC64 patch. Mention when we can drop our local definition.
1 parent 34551cb commit 43d8173

File tree

1 file changed

+33
-29
lines changed

1 file changed

+33
-29
lines changed

contrib/guix/manifest.scm

Lines changed: 33 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -208,35 +208,39 @@ chain for " target " development."))
208208
(package-with-extra-patches lief
209209
(search-our-patches "lief-fix-ppc64-nx-default.patch")))
210210

211-
(define-public lief
211+
;; Our python-lief package can be removed once we are using
212+
;; guix 83bfdb409787cb2737e68b093a319b247b7858e6 or later.
213+
(define-public python-lief
212214
(package
213-
(name "python-lief")
214-
(version "0.12.1")
215-
(source
216-
(origin
217-
(method git-fetch)
218-
(uri (git-reference
219-
(url "https://github.com/lief-project/LIEF.git")
220-
(commit version)))
221-
(file-name (git-file-name name version))
222-
(sha256
223-
(base32
224-
"1xzbh3bxy4rw1yamnx68da1v5s56ay4g081cyamv67256g0qy2i1"))))
225-
(build-system python-build-system)
226-
(arguments
227-
`(#:phases
228-
(modify-phases %standard-phases
229-
(add-after 'unpack 'parallel-jobs
230-
;; build with multiple cores
231-
(lambda _
232-
(substitute* "setup.py" (("self.parallel if self.parallel else 1") (number->string (parallel-job-count)))))))))
233-
(native-inputs
234-
`(("cmake" ,cmake)))
235-
(home-page "https://github.com/lief-project/LIEF")
236-
(synopsis "Library to Instrument Executable Formats")
237-
(description "Python library to to provide a cross platform library which can
238-
parse, modify and abstract ELF, PE and MachO formats.")
239-
(license license:asl2.0)))
215+
(name "python-lief")
216+
(version "0.12.3")
217+
(source (origin
218+
(method git-fetch)
219+
(uri (git-reference
220+
(url "https://github.com/lief-project/LIEF")
221+
(commit version)))
222+
(file-name (git-file-name name version))
223+
(sha256
224+
(base32
225+
"11i6hqmcjh56y554kqhl61698n9v66j2qk1c1g63mv2w07h2z661"))))
226+
(build-system python-build-system)
227+
(native-inputs (list cmake))
228+
(arguments
229+
(list
230+
#:tests? #f ;needs network
231+
#:phases #~(modify-phases %standard-phases
232+
(replace 'build
233+
(lambda _
234+
(invoke
235+
"python" "setup.py" "--sdk" "build"
236+
(string-append
237+
"-j" (number->string (parallel-job-count)))))))))
238+
(home-page "https://github.com/lief-project/LIEF")
239+
(synopsis "Library to instrument executable formats")
240+
(description
241+
"@code{python-lief} is a cross platform library which can parse, modify
242+
and abstract ELF, PE and MachO formats.")
243+
(license license:asl2.0)))
240244

241245
(define osslsigncode
242246
(package
@@ -596,7 +600,7 @@ inspecting signatures in Mach-O binaries.")
596600
;; Git
597601
git-minimal
598602
;; Tests
599-
(fix-ppc64-nx-default lief))
603+
(fix-ppc64-nx-default python-lief))
600604
(let ((target (getenv "HOST")))
601605
(cond ((string-suffix? "-mingw32" target)
602606
;; Windows

0 commit comments

Comments
 (0)