From patchwork Tue Aug 20 09:08:03 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Z572 X-Patchwork-Id: 30218 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id C840E27BBE9; Tue, 20 Aug 2024 10:09:48 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_VALIDITY_CERTIFIED, RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE,SPF_HELO_PASS, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 772AE27BBE2 for ; Tue, 20 Aug 2024 10:09:46 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sgKri-00036A-PF; Tue, 20 Aug 2024 05:09:22 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sgKrf-00035h-Cu for guix-patches@gnu.org; Tue, 20 Aug 2024 05:09:20 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sgKrf-0001HX-3b for guix-patches@gnu.org; Tue, 20 Aug 2024 05:09:19 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:Date:From:To:Subject; bh=5m8vachGZS+nfDZx6ogaBd3pA3xJvrw6sEjDSVAP5vc=; b=dLt0UMP3twJW0a4xwOBnuz9syhN31uXK3IRn3IYJsXOzL4vHk0MGXQQzRf0T/S42zr6Xtsvpv0CYyU0wkKlEThEi6UZ4iBfnnlasix8HolpG/7dS20p2ktAR7F1GrBHF0BXxViwnsQd3ieDXd4pPtoc+pzxt9SuyBer4m9FhFPztd7deYkxBDqXSmz16OJCJ5qiyIziaYhrHWEVnO0k1CvLD46wHqmgsjWKNgXiN+VzsvPtxXBxZ1Pkjg/VYufDqK2+koLH6JkegZ2Fgxs0mE6qA/h9ftJi2wUVk6B2M63WVoAY2mp0TEcT8k286o6UX82XNHgKdADkEfDqSvzPDSQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sgKsL-0003S2-S1 for guix-patches@gnu.org; Tue, 20 Aug 2024 05:10:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#72729] [PATCH] gnu: protobuf-c: Fix cross-compilation. Resent-From: Zheng Junjie Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 20 Aug 2024 09:10:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 72729 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 72729@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.172414495413194 (code B ref -1); Tue, 20 Aug 2024 09:10:01 +0000 Received: (at submit) by debbugs.gnu.org; 20 Aug 2024 09:09:14 +0000 Received: from localhost ([127.0.0.1]:59885 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sgKra-0003Qj-5T for submit@debbugs.gnu.org; Tue, 20 Aug 2024 05:09:14 -0400 Received: from lists.gnu.org ([209.51.188.17]:58634) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sgKrY-0003Qa-1f for submit@debbugs.gnu.org; Tue, 20 Aug 2024 05:09:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sgKqr-0002z0-0E for guix-patches@gnu.org; Tue, 20 Aug 2024 05:08:29 -0400 Received: from smtp84.cstnet.cn ([159.226.251.84] helo=cstnet.cn) by eggs.gnu.org with esmtps (TLS1.2:DHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1sgKqo-0001CW-7a for guix-patches@gnu.org; Tue, 20 Aug 2024 05:08:28 -0400 Received: from m.tailaa68d.ts.net (unknown [107.174.64.25]) by APP-05 (Coremail) with SMTP id zQCowAB3Xjn2XMRmmhVaCA--.50255S2; Tue, 20 Aug 2024 17:08:12 +0800 (CST) From: Zheng Junjie Date: Tue, 20 Aug 2024 17:08:03 +0800 Message-ID: X-Mailer: git-send-email 2.45.2 MIME-Version: 1.0 X-CM-TRANSID: zQCowAB3Xjn2XMRmmhVaCA--.50255S2 X-Coremail-Antispam: 1UD129KBjvJXoW7tFW8CF1DCF1xtr4UZw1UWrg_yoW8WF4xpa 4fKw15Aan7Gw4xtFsxKF42gF4Yqa4kJF4Yvw47Aa18C3909Fs2grW3tF43tF1fuF1xGa15 WF1DWF4DGFW8JFJanT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUySb7Iv0xC_tr1lb4IE77IF4wAFF20E14v26r1j6r4UM7CY07I2 0VC2zVCF04k26cxKx2IYs7xG6rWj6s0DM7CIcVAFz4kK6r1j6r18M28lY4IEw2IIxxk0rw A2F7IY1VAKz4vEj48ve4kI8wA2z4x0Y4vE2Ix0cI8IcVAFwI0_JFI_Gr1l84ACjcxK6xII jxv20xvEc7CjxVAFwI0_Gr0_Cr1l84ACjcxK6I8E87Iv67AKxVW8Jr0_Cr1UM28EF7xvwV C2z280aVCY1x0267AKxVWxJr0_GcWle2I262IYc4CY6c8Ij28IcVAaY2xG8wAqx4xG64xv F2IEw4CE5I8CrVC2j2WlYx0E2Ix0cI8IcVAFwI0_Jr0_Jr4lYx0Ex4A2jsIE14v26r1j6r 4UMcvjeVCFs4IE7xkEbVWUJVW8JwACjcxG0xvY0x0EwIxGrwCF04k20xvY0x0EwIxGrwCF x2IqxVCFs4IE7xkEbVWUJVW8JwC20s026c02F40E14v26r1j6r18MI8I3I0E7480Y4vE14 v26r106r1rMI8E67AF67kF1VAFwI0_Jr0_JrylIxkGc2Ij64vIr41lIxAIcVC0I7IYx2IY 67AKxVWUJVWUCwCI42IY6xIIjxv20xvEc7CjxVAFwI0_Jr0_Gr1lIxAIcVCF04k26cxKx2 IYs7xG6r1j6r1xMIIF0xvEx4A2jsIE14v26r1j6r4UMIIF0xvEx4A2jsIEc7CjxVAFwI0_ Gr0_Gr1UYxBIdaVFxhVjvjDU0xZFpf9x07jY6wZUUUUU= X-Originating-IP: [107.174.64.25] X-CM-SenderInfo: x2kh0wxmxqyx3h6l2u1dvotugofq/ Received-SPF: pass client-ip=159.226.251.84; envelope-from=zhengjunjie@iscas.ac.cn; helo=cstnet.cn X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/protobuf.scm (protobuf-c): Fix cross-compilation. [native-inputs]: When cross-compilation, add protobuf. [arguments]<#:configure-flags>: When cross-compilation, Set PROTOC variable. Change-Id: Idd660f526b7c90277cb4399997cdb7ce72e4f1c5 --- gnu/packages/protobuf.scm | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) base-commit: 7f14eda95f5f5694cb62decb1bcff46685b9c287 diff --git a/gnu/packages/protobuf.scm b/gnu/packages/protobuf.scm index d47b67fa61..b8679eff25 100644 --- a/gnu/packages/protobuf.scm +++ b/gnu/packages/protobuf.scm @@ -8,7 +8,7 @@ ;;; Copyright © 2020 Vinicius Monego ;;; Copyright © 2020 Brett Gilio ;;; Copyright © 2021 Felix Gruber -;;; Copyright © 2023 Zheng Junjie <873216071@qq.com> +;;; Copyright © 2023, 2024 Zheng Junjie <873216071@qq.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -262,7 +262,17 @@ (define-public protobuf-c "17rk42r3gcc46c2svd1mxs542wnl4mi77a6klkhg6wl1a36zmi2c")))) (build-system gnu-build-system) (inputs (list protobuf)) - (native-inputs (list pkg-config)) + (native-inputs (append (if (%current-target-system) + (list protobuf) + '()) + (list pkg-config))) + (arguments (if (%current-target-system) + (list #:configure-flags + #~(list + (string-append + "PROTOC=" + (search-input-file %build-inputs "bin/protoc")))) + (list))) (home-page "https://github.com/protobuf-c/protobuf-c") (synopsis "Protocol Buffers implementation in C") (description