bug#67065: closed ([PATCH] gnu: protobuf: fix cross-compilation.)

[GNU bug Tracking System]

Your message dated Sat, 25 Nov 2023 14:34:07 +0100
with message-id <87il5qufcg.fsf@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@gnu.org.)


-- 
67065: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=67065
GNU Bug Tracking System
Contact help-debbugs@gnu.org with problems
> --- Begin Message ---
>
>
>
> Subject: 
>
> [PATCH] gnu: protobuf: fix cross-compilation.
>
>
>
>
> Date: 
>
> Sat, 11 Nov 2023 16:45:46 +0800
>
>
>
>
> * 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
>
>
>
>
> --- End Message ---
> --- Begin Message ---
>
>
>
> Subject: 
>
> Re: [bug#67065] [PATCH] gnu: protobuf: fix cross-compilation.
>
>
>
>
> Date: 
>
> Sat, 25 Nov 2023 14:34:07 +0100
>
>
>
>
> User-agent: 
>
> Gnus/5.13 (Gnus v5.13)
>
>
>
>
> > * gnu/packages/protobuf.scm (protobuf): fix cross-compilation.
> > [native-inputs]: when cross-compilation, add this-package.
> > [inputs]: add googletest.
>
> Applied, thanks!
>
> Mathieu
>
>
> --- End Message ---