Merge bitcoin/bitcoin#27296: guix: import/sync python-lief (0.12.3) package definition from upstream
24f26e08ccguix: use cmake-minimal for python-lief (fanquake)43d8173f99guix: import LIEF from upstream (0.12.3) (fanquake) Pull request description: Update to version 0.12.3. Retain our PPC64 patch. Mention when we can drop our local definition. Also switch to using cmake-minimal (see #27172), which fixes atleast one build failure I've seen on aarch64, where cmake dependencies fail to build. Fix that by using the cmake without all the dependencies we don't actually need: ```bash The following derivations will be built: /gnu/store/7qqvqq2g7l5ylrjv0gn6zha565a12kar-python-lief-0.12.1.drv /gnu/store/f9zwh1ldy63ga0i5w6cbbqlj6sfq226j-cmake-3.21.4.drv /gnu/store/3wg6ya847id503m5izhzhn1qqs464lfk-python-sphinx-4.2.0.drv building /gnu/store/3wg6ya847id503m5izhzhn1qqs464lfk-python-sphinx-4.2.0.drv... / 'check' phasenote: keeping build directory `/tmp/guix-build-python-sphinx-4.2.0.drv-5' builder for `/gnu/store/3wg6ya847id503m5izhzhn1qqs464lfk-python-sphinx-4.2.0.drv' failed with exit code 1 build of /gnu/store/3wg6ya847id503m5izhzhn1qqs464lfk-python-sphinx-4.2.0.drv failed View build log at '/var/log/guix/drvs/3w/g6ya847id503m5izhzhn1qqs464lfk-python-sphinx-4.2.0.drv.gz'. cannot build derivation `/gnu/store/f9zwh1ldy63ga0i5w6cbbqlj6sfq226j-cmake-3.21.4.drv': 1 dependencies couldn't be built cannot build derivation `/gnu/store/7qqvqq2g7l5ylrjv0gn6zha565a12kar-python-lief-0.12.1.drv': 1 dependencies couldn't be built guix environment: error: build of `/gnu/store/7qqvqq2g7l5ylrjv0gn6zha565a12kar-python-lief-0.12.1.drv' failed ``` ACKs for top commit: TheCharlatan: ACK24f26e08ccTree-SHA512: d4260cdf5121686fd2fa36c1fc85687848eeb26cabaad2c6566feb71a18ea7fb013cfc6353c99f6f74bc89108a9505adce513c1cfa22a0a67450e6a1c451d209
This commit is contained in:
1 file changed
+34
-29
+34
-29
@@ -208,35 +208,40 @@ chain for " target " development."))
|
|||||||
(package-with-extra-patches lief
|
(package-with-extra-patches lief
|
||||||
(search-our-patches "lief-fix-ppc64-nx-default.patch")))
|
(search-our-patches "lief-fix-ppc64-nx-default.patch")))
|
||||||
|
|
||||||
(define-public lief
|
;; Our python-lief package can be removed once we are using
|
||||||
|
;; guix 83bfdb409787cb2737e68b093a319b247b7858e6 or later.
|
||||||
|
;; Note we currently use cmake-minimal.
|
||||||
|
(define-public python-lief
|
||||||
(package
|
(package
|
||||||
(name "python-lief")
|
(name "python-lief")
|
||||||
(version "0.12.1")
|
(version "0.12.3")
|
||||||
(source
|
(source (origin
|
||||||
(origin
|
(method git-fetch)
|
||||||
(method git-fetch)
|
(uri (git-reference
|
||||||
(uri (git-reference
|
(url "https://github.com/lief-project/LIEF")
|
||||||
(url "https://github.com/lief-project/LIEF.git")
|
(commit version)))
|
||||||
(commit version)))
|
(file-name (git-file-name name version))
|
||||||
(file-name (git-file-name name version))
|
(sha256
|
||||||
(sha256
|
(base32
|
||||||
(base32
|
"11i6hqmcjh56y554kqhl61698n9v66j2qk1c1g63mv2w07h2z661"))))
|
||||||
"1xzbh3bxy4rw1yamnx68da1v5s56ay4g081cyamv67256g0qy2i1"))))
|
(build-system python-build-system)
|
||||||
(build-system python-build-system)
|
(native-inputs (list cmake-minimal))
|
||||||
(arguments
|
(arguments
|
||||||
`(#:phases
|
(list
|
||||||
(modify-phases %standard-phases
|
#:tests? #f ;needs network
|
||||||
(add-after 'unpack 'parallel-jobs
|
#:phases #~(modify-phases %standard-phases
|
||||||
;; build with multiple cores
|
(replace 'build
|
||||||
(lambda _
|
(lambda _
|
||||||
(substitute* "setup.py" (("self.parallel if self.parallel else 1") (number->string (parallel-job-count)))))))))
|
(invoke
|
||||||
(native-inputs
|
"python" "setup.py" "--sdk" "build"
|
||||||
`(("cmake" ,cmake)))
|
(string-append
|
||||||
(home-page "https://github.com/lief-project/LIEF")
|
"-j" (number->string (parallel-job-count)))))))))
|
||||||
(synopsis "Library to Instrument Executable Formats")
|
(home-page "https://github.com/lief-project/LIEF")
|
||||||
(description "Python library to to provide a cross platform library which can
|
(synopsis "Library to instrument executable formats")
|
||||||
parse, modify and abstract ELF, PE and MachO formats.")
|
(description
|
||||||
(license license:asl2.0)))
|
"@code{python-lief} is a cross platform library which can parse, modify
|
||||||
|
and abstract ELF, PE and MachO formats.")
|
||||||
|
(license license:asl2.0)))
|
||||||
|
|
||||||
(define osslsigncode
|
(define osslsigncode
|
||||||
(package
|
(package
|
||||||
@@ -596,7 +601,7 @@ inspecting signatures in Mach-O binaries.")
|
|||||||
;; Git
|
;; Git
|
||||||
git-minimal
|
git-minimal
|
||||||
;; Tests
|
;; Tests
|
||||||
(fix-ppc64-nx-default lief))
|
(fix-ppc64-nx-default python-lief))
|
||||||
(let ((target (getenv "HOST")))
|
(let ((target (getenv "HOST")))
|
||||||
(cond ((string-suffix? "-mingw32" target)
|
(cond ((string-suffix? "-mingw32" target)
|
||||||
;; Windows
|
;; Windows
|
||||||
|
|||||||
Reference in new issue
Block a user