gnu: jimtcl: Update to 0.82.

* gnu/packages/embedded (jimtcl): Update to 0.82.
[arguments]: Use G-Expressions and update failing test, TTY test doesn't
fail anymore.
[inputs]: Add openssl as an input as now by default jimtcl enables the
SSL configuration option.
* gnu/packages/embedded (openocd): Support jimtcl 0.82.
[arguments]: Link against libssl and libcrypto.
[inputs]: Add openssl.

Signed-off-by: Efraim Flashner <efraim@flashner.co.il>
This commit is contained in:
Jean-Pierre De Jesus DIAZ 2023-06-01 15:32:35 +02:00 committed by Efraim Flashner
parent cdbd87b6f3
commit f351f2aaf2
No known key found for this signature in database
GPG key ID: 41AAE7DCCA3D8351

View file

@ -69,6 +69,7 @@
#:use-module (gnu packages readline) #:use-module (gnu packages readline)
#:use-module (gnu packages swig) #:use-module (gnu packages swig)
#:use-module (gnu packages texinfo) #:use-module (gnu packages texinfo)
#:use-module (gnu packages tls)
#:use-module (gnu packages version-control) #:use-module (gnu packages version-control)
#:use-module (gnu packages xorg) #:use-module (gnu packages xorg)
#:use-module (srfi srfi-1)) #:use-module (srfi srfi-1))
@ -535,7 +536,7 @@ SEGGER J-Link and compatible devices.")
(define-public jimtcl (define-public jimtcl
(package (package
(name "jimtcl") (name "jimtcl")
(version "0.80") (version "0.82")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@ -544,23 +545,22 @@ SEGGER J-Link and compatible devices.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"06rn60cx9sapc175vxvan87b8j5rkhh5gvvz7343xznzwlr0wcgk")))) "01nxqzn41797ypph1vpwjfh3zqgks0l8ihh6932b4kb83apy6f08"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:phases (list #:phases
(modify-phases %standard-phases #~(modify-phases %standard-phases
(replace 'configure (replace 'configure
;; This package doesn't use autoconf. ;; This package doesn't use autoconf.
(lambda* (#:key outputs #:allow-other-keys) (lambda _
(let ((out (assoc-ref outputs "out"))) (invoke "./configure"
(invoke "./configure" (string-append "--prefix=" #$output))))
(string-append "--prefix=" out))))) (add-before 'check 'delete-failing-tests
(add-before 'check 'delete-failing-tests (lambda _
(lambda _ ;; XXX All but 1 SSL tests fail (tries connecting to Google
;; XXX All but 1 TTY tests fail (Inappropriate ioctl for device). ;; servers).
(delete-file "tests/tty.test") (delete-file "tests/ssl.test"))))))
#t)) (inputs (list openssl))
)))
(native-inputs (native-inputs
;; For tests. ;; For tests.
(list inetutils)) ; for hostname (list inetutils)) ; for hostname
@ -592,10 +592,10 @@ language.")
pkg-config pkg-config
texinfo)) texinfo))
(inputs (inputs
(list hidapi jimtcl libftdi libjaylink libusb-compat)) (list hidapi jimtcl libftdi libjaylink libusb-compat openssl))
(arguments (arguments
'(#:configure-flags '(#:configure-flags
(append (list "LIBS=-lutil" (append (list "LIBS=-lutil -lcrypto -lssl"
"--disable-werror" "--disable-werror"
"--enable-sysfsgpio" "--enable-sysfsgpio"
"--disable-internal-jimtcl" "--disable-internal-jimtcl"