[PATCH] gnu: libatasmart: Fix cross-compiling to riscv64-linux.

  • Done
  • quality assurance status badge
Details
2 participants
  • Christopher Baines
  • Zheng Junjie
Owner
unassigned
Submitted by
Zheng Junjie
Severity
normal

Debbugs page

Z
Z
Zheng Junjie wrote on 22 Mar 09:44 -0700
(address . guix-patches@gnu.org)
2a5a54bdec875b00607eb33eb69f10493ec228f0.1711125850.git.zhengjunjie@iscas.ac.cn
* gnu/packages/freedesktop.scm (libatasmart)
[native-inputs]: When cross compiling to riscv64-linux-gnu, add config.
[arguments]: When target riscv64-linux-gnu, add update-config phase.

Change-Id: I491c43a6ce2c3fc3aed43ecab9d4a2ab251038bb
---
gnu/packages/freedesktop.scm | 20 +++++++++++++++++++-
1 file changed, 19 insertions(+), 1 deletion(-)

Toggle diff (35 lines)
diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm
index 8a4f490be2..5518d38af5 100644
--- a/gnu/packages/freedesktop.scm
+++ b/gnu/packages/freedesktop.scm
@@ -1525,7 +1525,25 @@ (define-public libatasmart
"138gvgdwk6h4ljrjsr09pxk1nrki4b155hqdzyr8mlk3bwsfmw31"))))
(build-system gnu-build-system)
(native-inputs
- (list pkg-config))
+ (append (if (and (%current-target-system)
+ (target-riscv64?))
+ (list config)
+ '())
+ (list pkg-config)))
+ (arguments
+ (if (and (%current-target-system)
+ (target-riscv64?))
+ (list #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'update-config
+ (lambda* (#:key native-inputs inputs #:allow-other-keys)
+ (for-each (lambda (file)
+ (install-file
+ (search-input-file
+ (or native-inputs inputs)
+ (string-append "/bin/" file)) "build-aux"))
+ '("config.guess" "config.sub"))))))
+ '()))
(inputs
(list eudev))
(home-page "https://0pointer.de/blog/projects/being-smart.html")

base-commit: 40f53e8fb5b867e3a1e8fa798328423718282aac
--
2.41.0
C
C
Christopher Baines wrote on 27 Mar 06:01 -0700
(name . Zheng Junjie)(address . zhengjunjie@iscas.ac.cn)
87jzlng76o.fsf@cbaines.net
Zheng Junjie <zhengjunjie@iscas.ac.cn> writes:

Toggle quote (9 lines)
> * gnu/packages/freedesktop.scm (libatasmart)
> [native-inputs]: When cross compiling to riscv64-linux-gnu, add config.
> [arguments]: When target riscv64-linux-gnu, add update-config phase.
>
> Change-Id: I491c43a6ce2c3fc3aed43ecab9d4a2ab251038bb
> ---
> gnu/packages/freedesktop.scm | 20 +++++++++++++++++++-
> 1 file changed, 19 insertions(+), 1 deletion(-)

Thanks! I've pushed this to master as
d9e693df75ffb8f0333c990d947540261613f72b.

Chris
-----BEGIN PGP SIGNATURE-----

iQKlBAEBCgCPFiEEPonu50WOcg2XVOCyXiijOwuE9XcFAmYEGJ9fFIAAAAAALgAo
aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDNF
ODlFRUU3NDU4RTcyMEQ5NzU0RTBCMjVFMjhBMzNCMEI4NEY1NzcRHG1haWxAY2Jh
aW5lcy5uZXQACgkQXiijOwuE9Xdw/BAAhhdbkBIVJYPYiyIY85R/Ms1H3O9Ca2bY
BcrYPTcKHe6Fo9BMVPl231fHRbI6UiSX0OHnhLol3pZVWLwUzWHDJOsx4gNhK6lJ
Pt1H5ql/94GygL2yoXMDZGW4NzL654SGqkGou+cI+fahvxofoIAPuh5imtCe1RuG
xSNMdKnmcu3zJxkcjyCTStZpnGriSslVI4u/EFbtKpDd66ryoWUDLqzCtSzXarTG
8GQJLqjTOOxm/gH9phqdcomI0HOnbbC84c06+hYeatj082gR3DqtB7TLGQnNHrv6
idfKDjzY6GHjnsLarVErsnxoLw7D3HpL0z+Nb8GlKugdP+N5QsgGe4Q+XoisFhqu
P0HIBoEdS5oopSwemYPb+iMbJjX4s+IeaYqH7+CZOr1jkoDnYHmADKZFUgiNytxs
7kf9vzK4Z2L70swxzTGeNRABvpBk8+F0wxK0runcgrInQwwYCuKSGTCRWa9UdEaX
Kl/3qFZq84rVJhA9+U+EbS8BDDEhOIIh5z6LxuhPIKVgSpOrw/Ce8To5zJQuacct
UxIGqwzktxZJ6KNoxDoo5zAaSuytLijRYGJPxdpCZxEiaVXQq1lPVsP40YpRbWSF
ZeQaOPXNihwiHJzxte/CE8gqChusdKgYb+VaG5yz7Bs+u2uprVpKwFyzYkv4banP
By3tPOwFrJw=
=51wY
-----END PGP SIGNATURE-----

?
Your comment

This issue is archived.

To comment on this conversation send an email to 69946@patchwise.org

To respond to this issue using the mumi CLI, first switch to it
mumi current 69946
Then, you may apply the latest patchset in this issue (with sign off)
mumi am -- -s
Or, compose a reply to this issue
mumi compose
Or, send patches to this issue
mumi send-email *.patch