GNU bug report logs -
#67065
[PATCH] gnu: protobuf: fix cross-compilation.
Previous Next
Reported by: Zheng Junjie <zhengjunjie <at> iscas.ac.cn>
Date: Sat, 11 Nov 2023 08:49:02 UTC
Severity: normal
Tags: patch
Done: Mathieu Othacehe <othacehe <at> gnu.org>
Bug is archived. No further changes may be made.
Full log
View this message in rfc822 format
[Message part 1 (text/plain, inline)]
Your message dated Sat, 25 Nov 2023 14:34:07 +0100
with message-id <87il5qufcg.fsf <at> gnu.org>
and subject line Re: [bug#67065] [PATCH] gnu: protobuf: fix cross-compilation.
has caused the debbugs.gnu.org bug report #67065,
regarding [PATCH] gnu: protobuf: fix cross-compilation.
to be marked as done.
(If you believe you have received this mail in error, please contact
help-debbugs <at> gnu.org.)
--
67065: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=67065
GNU Bug Tracking System
Contact help-debbugs <at> gnu.org with problems
[Message part 2 (message/rfc822, inline)]
* 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 <at> posteo.net>
;;; Copyright © 2020 Brett Gilio <brettg <at> gnu.org>
;;; Copyright © 2021 Felix Gruber <felgru <at> posteo.net>
+;;; Copyright © 2023 Zheng Junjie <873216071 <at> 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
[Message part 3 (message/rfc822, inline)]
> * gnu/packages/protobuf.scm (protobuf): fix cross-compilation.
> [native-inputs]: when cross-compilation, add this-package.
> [inputs]: add googletest.
Applied, thanks!
Mathieu
This bug report was last modified 1 year and 180 days ago.
Previous Next
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997,2003 nCipher Corporation Ltd,
1994-97 Ian Jackson.