From: Zheng Junjie <zhengjunjie@iscas.ac.cn>
To: 67065@debbugs.gnu.org
Subject: [bug#67065] [PATCH] gnu: protobuf: fix cross-compilation.
Date: Sat, 11 Nov 2023 16:45:46 +0800 [thread overview]
Message-ID: <6ea2ea59a9c0262c67b73c69abba96ae29b63b73.1699692346.git.zhengjunjie@iscas.ac.cn> (raw)
[-- 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
next reply other threads:[~2023-11-11 8:48 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-11-11 8:45 Zheng Junjie [this message]
2023-11-25 13:34 ` bug#67065: [PATCH] gnu: protobuf: fix cross-compilation Mathieu Othacehe
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=6ea2ea59a9c0262c67b73c69abba96ae29b63b73.1699692346.git.zhengjunjie@iscas.ac.cn \
--to=zhengjunjie@iscas.ac.cn \
--cc=67065@debbugs.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).