guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

04/09: gnu: protobuf: Fix cross-compilation.


From: guix-commits
Subject: 04/09: gnu: protobuf: Fix cross-compilation.
Date: Sat, 25 Nov 2023 08:48:25 -0500 (EST)

mothacehe pushed a commit to branch master
in repository guix.

commit a077907226d2f0d1345a661f7b285336ee858c10
Author: Zheng Junjie <zhengjunjie@iscas.ac.cn>
AuthorDate: Sat Nov 11 16:45:46 2023 +0800

    gnu: protobuf: Fix cross-compilation.
    
    * gnu/packages/protobuf.scm (protobuf): Fix cross-compilation.
    [native-inputs]: When cross-compiling, add this-package.
    [inputs]: Add googletest.
    
    Change-Id: Id7d3a8be9d4211249c0adc3a99a7a07206f9c495
    Signed-off-by: Mathieu Othacehe <othacehe@gnu.org>
---
 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 @@ data in motion, or as a file format for data at rest.")
                             (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



reply via email to

[Prev in Thread] Current Thread [Next in Thread]