* [bug#67065] [PATCH] gnu: protobuf: fix cross-compilation.
@ 2023-11-11 8:45 Zheng Junjie
2023-11-25 13:34 ` bug#67065: " Mathieu Othacehe
0 siblings, 1 reply; 2+ messages in thread
From: Zheng Junjie @ 2023-11-11 8:45 UTC (permalink / raw)
To: 67065
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain; charset=y, Size: 1467 bytes --]
* gnu/packages/protobuf.scm (protobuf): fix cross-compilation.
[native-inputs]: when cross-compilation, add this-package.
[inputs]: add googletest.
Change-Id: Id7d3a8be9d4211249c0adc3a99a7a07206f9c495
---
gnu/packages/protobuf.scm | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/protobuf.scm b/gnu/packages/protobuf.scm
index 8cd805799e..c157eabce0 100644
--- a/gnu/packages/protobuf.scm
+++ b/gnu/packages/protobuf.scm
@@ -8,6 +8,7 @@
;;; Copyright © 2020 Vinicius Monego <monego@posteo.net>
;;; Copyright © 2020 Brett Gilio <brettg@gnu.org>
;;; Copyright © 2021 Felix Gruber <felgru@posteo.net>
+;;; Copyright © 2023 Zheng Junjie <873216071@qq.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -156,8 +157,11 @@ (define-public protobuf
(install-file file slib)
(delete-file file))
(find-files lib "\\.a$"))))))))
- (native-inputs (list googletest))
- (inputs (list zlib))
+ (native-inputs (append (if (%current-target-system)
+ (list this-package)
+ '())
+ (list googletest)))
+ (inputs (list zlib googletest))
(home-page "https://github.com/protocolbuffers/protobuf")
(synopsis "Data encoding for remote procedure calls (RPCs)")
(description
base-commit: 61c527227ceebdad8da2d52214b253a48323cbb9
--
2.41.0
^ permalink raw reply related [flat|nested] 2+ messages in thread
* bug#67065: [PATCH] gnu: protobuf: fix cross-compilation.
2023-11-11 8:45 [bug#67065] [PATCH] gnu: protobuf: fix cross-compilation Zheng Junjie
@ 2023-11-25 13:34 ` Mathieu Othacehe
0 siblings, 0 replies; 2+ messages in thread
From: Mathieu Othacehe @ 2023-11-25 13:34 UTC (permalink / raw)
To: Zheng Junjie; +Cc: 67065-done
> * gnu/packages/protobuf.scm (protobuf): fix cross-compilation.
> [native-inputs]: when cross-compilation, add this-package.
> [inputs]: add googletest.
Applied, thanks!
Mathieu
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2023-11-25 13:35 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-11-11 8:45 [bug#67065] [PATCH] gnu: protobuf: fix cross-compilation Zheng Junjie
2023-11-25 13:34 ` bug#67065: " Mathieu Othacehe
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.