From patchwork Mon May 1 16:18:42 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergey Trofimov X-Patchwork-Id: 49727 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 1B9DA27BBE2; Mon, 1 May 2023 17:20:19 +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=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,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 807BD27BBE9 for ; Mon, 1 May 2023 17:20:16 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ptWFw-0006Xf-Kd; Mon, 01 May 2023 12:20:04 -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 1ptWFu-0006W0-79 for guix-patches@gnu.org; Mon, 01 May 2023 12:20:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ptWFt-0006Oi-UC for guix-patches@gnu.org; Mon, 01 May 2023 12:20:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ptWFt-0006ft-Pu for guix-patches@gnu.org; Mon, 01 May 2023 12:20:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63209] [PATCH] gnu: git-crypt: Fix build issues on openssl 3 Resent-From: Sergey Trofimov Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 01 May 2023 16:20:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 63209 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 63209@debbugs.gnu.org Cc: Sergey Trofimov X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.168295794125576 (code B ref -1); Mon, 01 May 2023 16:20:01 +0000 Received: (at submit) by debbugs.gnu.org; 1 May 2023 16:19:01 +0000 Received: from localhost ([127.0.0.1]:40898 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ptWEv-0006eH-Ac for submit@debbugs.gnu.org; Mon, 01 May 2023 12:19:01 -0400 Received: from lists.gnu.org ([209.51.188.17]:50746) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ptWEt-0006e3-AG for submit@debbugs.gnu.org; Mon, 01 May 2023 12:19:00 -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 1ptWEt-0006On-4J for guix-patches@gnu.org; Mon, 01 May 2023 12:18:59 -0400 Received: from mail-ed1-x52f.google.com ([2a00:1450:4864:20::52f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ptWEq-0006Jg-L2 for guix-patches@gnu.org; Mon, 01 May 2023 12:18:58 -0400 Received: by mail-ed1-x52f.google.com with SMTP id 4fb4d7f45d1cf-50a14564d17so40948160a12.0 for ; Mon, 01 May 2023 09:18:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sarg.org.ru; s=google; t=1682957933; x=1685549933; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=xki+dr/d+gEvYLKHTepaebZ2WMKQN8D3detihRlZ6RA=; b=Ie0DIsdxQPKP21u+SDBB/2G0YBeas4Lt2nxsjEjp1b+fiTsoL8tjMFu1IkAhSv5TfF welIotZ8lh3mKND5ftUyLlClwjwDi260HTyKGHB+j/Ia7/jh2DA1RYTtibn8r0swXT+i pQx+H++zPFda/gZjNPXZw0oghHbC5OJ4jULQg= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682957933; x=1685549933; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=xki+dr/d+gEvYLKHTepaebZ2WMKQN8D3detihRlZ6RA=; b=jLekceF7Zl+OVFoECfIerHCmoCBEMll83vCxVhf1m3bk4T0PiuiRyBYTkG0FU92EmV 8QRhnqX9wss6iOfg+SqQQgXlF255mMsynpnxfSlD01xQUmdLdXj8rVjN+PhRRnmFbwau TXCi8d/s3QgSMpuWhu2ToDgpP6/znRT4d9HDA1KCCDGGCDo2ZoGhUIXmOj24JSolaR3j 8a3D3dLvmf0pfN9B+61OLOzbBi65jKNoFSQWxKl2O/Ia2Ers1+H+4kqAaxmWBfkllcUY Dd37Xhtfb7kByTqZ1q0zXA8Pf079zl1lSXWP9xJZVxBc4RiTDh9l2zg6EWp66duvgs+B xEwQ== X-Gm-Message-State: AC+VfDyg6qQUoNI9ouIPaG6sKyURhhC80CW5RIciIaSmfyMFkLsugbW2 Nz0OzjTJCmvQwJ0Hu9+6yWgXCf0oyRl97vTzpNjnlA== X-Google-Smtp-Source: ACHHUZ4wEMZ2sQ8t/woHlnLraxn7tAi74yIl6dksHIJL4+nNXgLy/S3tiQRu2KVweVR3UYgaA0mOXA== X-Received: by 2002:a17:906:ef0d:b0:94a:643e:9e26 with SMTP id f13-20020a170906ef0d00b0094a643e9e26mr12844875ejs.14.1682957932824; Mon, 01 May 2023 09:18:52 -0700 (PDT) Received: from localhost ([77.64.254.95]) by smtp.gmail.com with ESMTPSA id w27-20020a17090633db00b0094ed0370f8fsm15124673eja.147.2023.05.01.09.18.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 01 May 2023 09:18:52 -0700 (PDT) From: Sergey Trofimov Date: Mon, 1 May 2023 18:18:42 +0200 Message-Id: <20230501161842.5622-1-sarg@sarg.org.ru> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 Received-SPF: none client-ip=2a00:1450:4864:20::52f; envelope-from=sarg@sarg.org.ru; helo=mail-ed1-x52f.google.com 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, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_NONE=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/version-control.scm (git-crypt): Add compilation flag to work around openssl 3 compatibility. See https://github.com/AGWA/git-crypt/issues/232 --- gnu/packages/version-control.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index c2ec490383..ba213bafa6 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -936,6 +936,7 @@ (define-public git-crypt #t)) (replace 'build (lambda _ + (setenv "CXXFLAGS" "-DOPENSSL_API_COMPAT=0x30000000L") (invoke "make" "ENABLE_MAN=yes"))) (replace 'install (lambda* (#:key outputs #:allow-other-keys)