From nobody Mon Sep 16 20:27:06 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+101069+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+101069+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1678696234; cv=none; d=zohomail.com; s=zohoarc; b=bcV2h5qqYr6fcAlKZ0xCJ4YagIzVM8ApgYNXju5IRuU5xJxPeOuXO2k1ChdSAKen7pK5OUZgTFPxXWFz+uQ2Y0Qek/fZAlSGZopHMCanri/WXNoh4OPNHupMTlqcaMfZfD+5IakUerbqcZpYpnICa4+NfK/oz3yISLIsgzLUDy8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1678696234; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=J9sbdPhwKw4NUoeUp1y7NVJFmAUj1WCR0TI+fE5O1IA=; b=mgo1umttWPtdIPSsWgMoSACK3V5+Gmk2VdbZTV+LiX+ZPu2MvLkfV/rYXSBizlVo02lOcuBTeTlYNNJfS4fEvVOw+k3vf9Weyh2cuBkixyCXPO7PzxD19vNaK1YnPfus3N2u62PZgv1E6nGWOHmgyixmrtjA/50cvgA+kFHMNy4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+101069+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 16786962344455.089995254976429; Mon, 13 Mar 2023 01:30:34 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id pA9CYY1788612xy9uod9plEk; Mon, 13 Mar 2023 01:30:34 -0700 X-Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mx.groups.io with SMTP id smtpd.web11.15100.1678696233089791246 for ; Mon, 13 Mar 2023 01:30:33 -0700 X-Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-159-x0p2hnfTPwmplwJDCoQUww-1; Mon, 13 Mar 2023 04:30:30 -0400 X-MC-Unique: x0p2hnfTPwmplwJDCoQUww-1 X-Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 06402185A794; Mon, 13 Mar 2023 08:30:30 +0000 (UTC) X-Received: from sirius.home.kraxel.org (unknown [10.39.192.142]) by smtp.corp.redhat.com (Postfix) with ESMTPS id C2267400F4F; Mon, 13 Mar 2023 08:30:29 +0000 (UTC) X-Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 6B0E71801E8D; Mon, 13 Mar 2023 09:30:16 +0100 (CET) From: "Gerd Hoffmann" To: devel@edk2.groups.io Cc: Jian J Wang , Pawel Polawski , Xiaoyu Lu , Ard Biesheuvel , Guomin Jiang , Gerd Hoffmann , Jiewen Yao , Oliver Steffen , Jordan Justen Subject: [edk2-devel] [PATCH 13/22] CryptoPkg/openssl: move compiler_flags to buildinf.c Date: Mon, 13 Mar 2023 09:30:07 +0100 Message-Id: <20230313083016.136448-14-kraxel@redhat.com> In-Reply-To: <20230313083016.136448-1-kraxel@redhat.com> References: <20230313083016.136448-1-kraxel@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.10 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Precedence: Bulk List-Unsubscribe: List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,kraxel@redhat.com X-Gm-Message-State: 3jM5cOGFlRwChF5bTxkbXvFFx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1678696234; bh=lrd4y8FDHIqqRfn4LnHjeqHjpWXaewD3F+kbkW9j4zg=; h=Cc:Content-Type:Date:From:Reply-To:Subject:To; b=G/EYVD9GEkn2tXQbZaGW0xJ7kD3IgoluyggyABiAkm/2DoB6qMcCuI7NwFkQvnUdslQ xH8Cs6JGrhXiIu3d+KhmYuZNRWUXRGU/CN/Li84WRITTgN/je+zhE8FHx0ZR5gwdec6BR ZmiS0MhH8GI7gUtGqch2BwJT3xaIje8nKDM= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1678696234903100039 Content-Type: text/plain; charset="utf-8"; x-default="true" Seems with openssl 3.0 this is used by multiple source files, so we get duplicate symbol errors when linking. Fix that by moving compiler_flags from header file to a source file. Signed-off-by: Gerd Hoffmann --- CryptoPkg/Library/OpensslLib/OpensslLib.inf | 1 + CryptoPkg/Library/OpensslLib/OpensslLibAccel.inf | 1 + CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf | 1 + CryptoPkg/Library/OpensslLib/OpensslLibFull.inf | 1 + CryptoPkg/Library/OpensslLib/buildinf.h | 2 +- CryptoPkg/Library/OpensslLib/{buildinf.h =3D> buildinf.c} | 4 ++-- 6 files changed, 7 insertions(+), 3 deletions(-) copy CryptoPkg/Library/OpensslLib/{buildinf.h =3D> buildinf.c} (50%) diff --git a/CryptoPkg/Library/OpensslLib/OpensslLib.inf b/CryptoPkg/Librar= y/OpensslLib/OpensslLib.inf index 57058d20d1db..b92b1daf2096 100644 --- a/CryptoPkg/Library/OpensslLib/OpensslLib.inf +++ b/CryptoPkg/Library/OpensslLib/OpensslLib.inf @@ -34,6 +34,7 @@ [Sources] # Autogenerated files list starts here # Autogenerated files list ends here buildinf.h + buildinf.c ossl_store.c rand_pool.c # SslNull.c diff --git a/CryptoPkg/Library/OpensslLib/OpensslLibAccel.inf b/CryptoPkg/L= ibrary/OpensslLib/OpensslLibAccel.inf index 899e243a6db6..59c5d42bc78e 100644 --- a/CryptoPkg/Library/OpensslLib/OpensslLibAccel.inf +++ b/CryptoPkg/Library/OpensslLib/OpensslLibAccel.inf @@ -37,6 +37,7 @@ [Sources] # Autogenerated files list starts here # Autogenerated files list ends here buildinf.h + buildinf.c ossl_store.c rand_pool.c # SslNull.c diff --git a/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf b/CryptoPkg/= Library/OpensslLib/OpensslLibCrypto.inf index 7b7650fc001f..c796effe23fd 100644 --- a/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf +++ b/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf @@ -35,6 +35,7 @@ [Sources] # Autogenerated files list starts here # Autogenerated files list ends here buildinf.h + buildinf.c ossl_store.c rand_pool.c SslNull.c diff --git a/CryptoPkg/Library/OpensslLib/OpensslLibFull.inf b/CryptoPkg/Li= brary/OpensslLib/OpensslLibFull.inf index 9309fe35fa38..aaea1bab5b26 100644 --- a/CryptoPkg/Library/OpensslLib/OpensslLibFull.inf +++ b/CryptoPkg/Library/OpensslLib/OpensslLibFull.inf @@ -39,6 +39,7 @@ [Sources] # Autogenerated files list starts here # Autogenerated files list ends here buildinf.h + buildinf.c ossl_store.c rand_pool.c # SslNull.c diff --git a/CryptoPkg/Library/OpensslLib/buildinf.h b/CryptoPkg/Library/Op= ensslLib/buildinf.h index 9042c7526fd6..7cf0eae008ed 100644 --- a/CryptoPkg/Library/OpensslLib/buildinf.h +++ b/CryptoPkg/Library/OpensslLib/buildinf.h @@ -1,4 +1,4 @@ #define PLATFORM "UEFI" #define DATE "Fri Dec 22 01:23:45 PDT 2017" =20 -const char *compiler_flags =3D "compiler: information not available from = edk2"; +extern const char *compiler_flags; diff --git a/CryptoPkg/Library/OpensslLib/buildinf.h b/CryptoPkg/Library/Op= ensslLib/buildinf.c similarity index 50% copy from CryptoPkg/Library/OpensslLib/buildinf.h copy to CryptoPkg/Library/OpensslLib/buildinf.c index 9042c7526fd6..cd7fe9322ed4 100644 --- a/CryptoPkg/Library/OpensslLib/buildinf.h +++ b/CryptoPkg/Library/OpensslLib/buildinf.c @@ -1,4 +1,4 @@ -#define PLATFORM "UEFI" -#define DATE "Fri Dec 22 01:23:45 PDT 2017" +/* SPDX-License-Identifier: BSD-2-Clause-Patent */ +#include "buildinf.h" =20 const char *compiler_flags =3D "compiler: information not available from = edk2"; --=20 2.39.2 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#101069): https://edk2.groups.io/g/devel/message/101069 Mute This Topic: https://groups.io/mt/97576415/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-