From patchwork Mon Aug 7 14:03:03 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: pjals--- via Guix-patches via X-Patchwork-Id: 52605 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 49BB727BBEA; Mon, 7 Aug 2023 15:04:56 +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=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS autolearn=ham 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 74DD327BBE2 for ; Mon, 7 Aug 2023 15:04:54 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qT0qD-0004uC-VW; Mon, 07 Aug 2023 10:04:14 -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 1qT0q4-0004re-FN for guix-patches@gnu.org; Mon, 07 Aug 2023 10:04:04 -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 1qT0q3-0002cY-09 for guix-patches@gnu.org; Mon, 07 Aug 2023 10:04:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qT0q2-0004Qj-JO for guix-patches@gnu.org; Mon, 07 Aug 2023 10:04:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65126] [PATCH] gnu: exiv2: Get rid of reference to GCC. Resent-From: iyzsong@envs.net Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 07 Aug 2023 14:04:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 65126 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 65126@debbugs.gnu.org Cc: =?utf-8?b?5a6L5paH5q2m?= X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.169141700916968 (code B ref -1); Mon, 07 Aug 2023 14:04:02 +0000 Received: (at submit) by debbugs.gnu.org; 7 Aug 2023 14:03:29 +0000 Received: from localhost ([127.0.0.1]:34006 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qT0pV-0004Pc-59 for submit@debbugs.gnu.org; Mon, 07 Aug 2023 10:03:29 -0400 Received: from lists.gnu.org ([2001:470:142::17]:56458) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qT0pR-0004PK-Og for submit@debbugs.gnu.org; Mon, 07 Aug 2023 10:03:27 -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 1qT0pM-0004oS-CL for guix-patches@gnu.org; Mon, 07 Aug 2023 10:03:20 -0400 Received: from mail.envs.net ([5.199.136.28]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qT0pK-0002UE-3I for guix-patches@gnu.org; Mon, 07 Aug 2023 10:03:20 -0400 Received: from localhost (mail.envs.net [127.0.0.1]) by mail.envs.net (Postfix) with ESMTP id CD5DC38A0021; Mon, 7 Aug 2023 14:03:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=envs.net; s=modoboa; t=1691416994; bh=68tnc8X6IiqwvCnFW2po4gFDGBolZRNiFuSiBPG/ppo=; h=From:To:Cc:Subject:Date:From; b=dh0mVLw5dQV89PEKFYzBcI6NHYIYgUnqN9zK1X2uCLqxJApBDUhngV+P344jEU5Mw bbLtvaWCXYzWagM8Xe773A6bMfTEICLi1h9hvcvNvPE9NFHJvrv6Uy6k7Kq6VLO7hI iBMybsRZKwP4OCqESjrDt4SXoravZfWAe7G4VnmyGmnmrpwPFFxgq+NJ2b0w/fTEET FK/NUZc/ky2V5Npx77SBlUI+Af69jEPr8LmP46frOEfztf5G1p55DoVQ3Y6AMgQglj vGl5NZZ4v9Zr5ucFy2t4pnL+jvJTszn8fVbHNtcMTjyDXE0EKrw6LwboXKBDub8JaC rA5PCjIHZohHLpH5sJXLeuGKZwQPDPuieujyYTyXLFmpsQoK2mHP5PMNm5wI+q7jCB 4PljS9ef72LYHrT7V5CRf72f7lXMJLI89a5ZcUR/zjFmgnWeNXZnsvlMe8VhxIKQF1 UIUe41uyZ5o+dAFNuMnfxNVvKnGxT2A6EcOA/SrwUOtq57JajSRyOKcVKI0RFmuM7p 3LlVjOb8EM70fVhOEadHQPApsrvimeYSxSIdJ6EDPvSGQhBc6gwjEOKE+VPmMVcyOM 9R2v0b6VsVHtkzyM+8WQBwLBJjk/3GM3EL6urQcIic2Tm6UqkuclfdO6M1n+TUpqmE /LGxvgIHaFHg6PSmGt47FXYw= X-Virus-Scanned: Debian amavisd-new at mail.envs.net Received: from mail.envs.net ([127.0.0.1]) by localhost (mail.envs.net [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id SqW3YjFBJx4I; Mon, 7 Aug 2023 14:03:10 +0000 (UTC) Received: from localhost (unknown [36.170.44.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mail.envs.net (Postfix) with ESMTPSA; Mon, 7 Aug 2023 14:03:10 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by localhost (OpenSMTPD) with ESMTP id 40d73277; Mon, 7 Aug 2023 14:03:12 +0000 (UTC) Date: Mon, 7 Aug 2023 22:03:03 +0800 Message-ID: <3eba9a4c0ca80fa57106cd50ba827915b9bd91a0.1691416969.git.iyzsong@member.fsf.org> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 Received-SPF: pass client-ip=5.199.136.28; envelope-from=iyzsong@envs.net; helo=mail.envs.net X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable 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: , Reply-to: iyzsong@envs.net X-ACL-Warn: , iyzsong--- via Guix-patches X-Patchwork-Original-From: iyzsong--- via Guix-patches via From: pjals--- via Guix-patches via 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 From: 宋文武 This fixes . * gnu/packages/image.scm (exiv2)[arguments]: Add phase to remove _GLIBCXX_ASSERTIONS from compiler flags. --- gnu/packages/image.scm | 6 ++++++ 1 file changed, 6 insertions(+) base-commit: 56667ee55cd7f3368cbff169352fe440f4f93da5 diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index 3336e38852..1dbf3cbdd6 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -1511,6 +1511,12 @@ (define-public exiv2 "-DEXIV2_ENABLE_BMFF=ON") #:phases (modify-phases %standard-phases + (add-after 'unpack 'patch-gcc-reference + (lambda _ + ;; _GLIBCXX_ASSERTIONS brings reference to GCC. + (substitute* "cmake/compilerFlags.cmake" + (("add_compile_options[(]-Wp,-D_GLIBCXX_ASSERTIONS[)]") + "")))) (add-after 'install 'delete-static-libraries (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out"))