gnu: python-libmpsse: Update to 1.4.

* gnu/packages/embedded.scm (python2-libmpsse): Rename to...
(python-libmpsse): ...this.
[version]: Update to 1.4.
[source]: Change repository and version.
[inputs]: Change Python version.
[arguments]: Add #parallel-build?.
(python2-libmpsse): New variable.
This commit is contained in:
Danny Milosavljevic 2019-09-26 15:58:48 +02:00
parent 3972dc5d43
commit 2ea4587d83
No known key found for this signature in database
GPG Key ID: E71A35542C30BAA5
1 changed files with 52 additions and 29 deletions

View File

@ -874,30 +874,31 @@ the Raspberry Pi chip.")
(description "This package provides @code{gcc} for VideoCore IV, (description "This package provides @code{gcc} for VideoCore IV,
the Raspberry Pi chip.")))) the Raspberry Pi chip."))))
(define-public python2-libmpsse (define-public python-libmpsse
(package (package
(name "python2-libmpsse") (name "python-libmpsse")
(version "1.3") (version "1.4")
(source (source
(origin (origin
(method url-fetch) (method git-fetch)
(uri (string-append "https://storage.googleapis.com/" (uri (git-reference
"google-code-archive-downloads/v2/" (url "https://github.com/daym/libmpsse.git")
"code.google.com/libmpsse/" (commit (string-append "v" version))))
"libmpsse-" version ".tar.gz")) (file-name "libmpsse-checkout")
(sha256 (sha256
(base32 (base32
"0jq7nhqq3na8675jnpfcar3pd3dp3adhhc4lw900swkla01a1wh8")))) "14f1kiiia4kfd9mzwx4h63aa8bpz9aknbrrr7mychnsp3arw0z25"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(inputs (inputs
`(("libftdi" ,libftdi) `(("libftdi" ,libftdi)
("python" ,python-2))) ("python" ,python)))
(native-inputs (native-inputs
`(("pkg-config" ,pkg-config) `(("pkg-config" ,pkg-config)
("swig" ,swig) ("swig" ,swig)
("which" ,base:which))) ("which" ,base:which)))
(arguments (arguments
`(#:tests? #f ; No tests exist. `(#:tests? #f ; No tests exist.
#:parallel-build? #f ; Would be buggy.
#:make-flags #:make-flags
(list (string-append "CFLAGS=-Wall -fPIC -fno-strict-aliasing -g -O2 " (list (string-append "CFLAGS=-Wall -fPIC -fno-strict-aliasing -g -O2 "
"$(shell pkg-config --cflags libftdi1)")) "$(shell pkg-config --cflags libftdi1)"))
@ -905,28 +906,20 @@ the Raspberry Pi chip."))))
(modify-phases %standard-phases (modify-phases %standard-phases
(add-after 'unpack 'set-environment-up (add-after 'unpack 'set-environment-up
(lambda* (#:key inputs outputs #:allow-other-keys) (lambda* (#:key inputs outputs #:allow-other-keys)
(chdir "src") (let ((python (assoc-ref inputs "python")))
(setenv "PYDEV" (string-append (assoc-ref inputs "python") (chdir "src")
"/include/python2.7")) (setenv "PYDEV" (string-append python
#t)) "/include/python"
(add-after 'unpack 'patch-global-variable ,(version-major+minor (package-version python))
(lambda _ "m"))
;; fast_rw_buf was defined in a header file which was making #t)))
;; the build not reproducible.
(substitute* "src/fast.c"
(("^int fast_build_block_buffer") "
unsigned char fast_rw_buf[SPI_RW_SIZE + CMD_SIZE];
int fast_build_block_buffer"))
(substitute* "src/mpsse.h"
(("unsigned char fast_rw_buf.*") "
"))
#t))
(replace 'install (replace 'install
(lambda* (#:key outputs make-flags #:allow-other-keys #:rest args) (lambda* (#:key inputs outputs make-flags #:allow-other-keys #:rest args)
(let* ((out (assoc-ref outputs "out")) (let* ((out (assoc-ref outputs "out"))
(out-python (string-append out (out-python (string-append out
"/lib/python2.7/site-packages")) "/lib/python"
,(version-major+minor (package-version python))
"/site-packages"))
(install (assoc-ref %standard-phases 'install))) (install (assoc-ref %standard-phases 'install)))
(install #:make-flags (cons (string-append "PYLIB=" out-python) (install #:make-flags (cons (string-append "PYLIB=" out-python)
make-flags)))))))) make-flags))))))))
@ -937,6 +930,36 @@ MPSSE (Multi-Protocol Synchronous Serial Engine) adapter by FTDI that can do
SPI, I2C, JTAG.") SPI, I2C, JTAG.")
(license license:gpl2+))) (license license:gpl2+)))
(define-public python2-libmpsse
(package
(inherit python-libmpsse)
(name "python2-libmpsse")
(arguments
(substitute-keyword-arguments (package-arguments python-libmpsse)
((#:phases phases)
`(modify-phases ,phases
(replace 'set-environment-up
(lambda* (#:key inputs outputs #:allow-other-keys)
(let ((python (assoc-ref inputs "python")))
(chdir "src")
(setenv "PYDEV" (string-append python
"/include/python"
,(version-major+minor (package-version python-2))))
#t)))
(replace 'install
(lambda* (#:key inputs outputs make-flags #:allow-other-keys #:rest args)
(let* ((out (assoc-ref outputs "out"))
(out-python (string-append out
"/lib/python"
,(version-major+minor (package-version python-2))
"/site-packages"))
(install (assoc-ref %standard-phases 'install)))
(install #:make-flags (cons (string-append "PYLIB=" out-python)
make-flags)))))))))
(inputs
(alist-replace "python" (list python-2)
(package-inputs python-libmpsse)))))
(define-public picprog (define-public picprog
(package (package
(name "picprog") (name "picprog")