From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.groups.io with SMTP id smtpd.web11.13334.1638547686349741022 for ; Fri, 03 Dec 2021 08:08:06 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=XvZxJ3ad; spf=pass (domain: redhat.com, ip: 170.10.133.124, mailfrom: kraxel@redhat.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1638547685; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=plSOff/9cIHoL0w0zeLNS5PCSh9cPPhuEj1QOsUYxyE=; b=XvZxJ3ad2kFyFfjeY7cqRz0CLXt0CkeOUhLjhVYUjjkYhljsXuy8vm6Yrfeet9cVekOWrE 5QC1i95bXFkYaYwBUdJJxoMVglY0xZWJJ2zIQ2VlLtc0rlDoLCMyzrNsGJFqGkzo8tuRlG +k5FZPfudsVG8lzsWdD42PZPxG3kFbA= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-596-HbfV6Ez6PS-Xec9SbpbNCg-1; Fri, 03 Dec 2021 11:08:02 -0500 X-MC-Unique: HbfV6Ez6PS-Xec9SbpbNCg-1 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 93D9384B9A4; Fri, 3 Dec 2021 16:08:01 +0000 (UTC) Received: from sirius.home.kraxel.org (unknown [10.39.193.170]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 5918F19724; Fri, 3 Dec 2021 16:08:01 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id C8DEA1800397; Fri, 3 Dec 2021 17:07:48 +0100 (CET) From: "Gerd Hoffmann" To: devel@edk2.groups.io Cc: Jiewen Yao , Jian J Wang , Guomin Jiang , Pawel Polawski , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Xiaoyu Lu , Gerd Hoffmann Subject: [PATCH 03/24] CryptoPkg/openssl: process_files.pl: expand *.a Date: Fri, 3 Dec 2021 17:07:27 +0100 Message-Id: <20211203160748.866150-4-kraxel@redhat.com> In-Reply-To: <20211203160748.866150-1-kraxel@redhat.com> References: <20211203160748.866150-1-kraxel@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=kraxel@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" When finding a library (*.a) in the list of objects go expand it, i.e. get the list of library objects and append them. Signed-off-by: Gerd Hoffmann --- CryptoPkg/Library/OpensslLib/process_files.pl | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/CryptoPkg/Library/OpensslLib/process_files.pl b/CryptoPkg/Library/OpensslLib/process_files.pl index b320ac9b59a6..6e2b98e4a9ae 100755 --- a/CryptoPkg/Library/OpensslLib/process_files.pl +++ b/CryptoPkg/Library/OpensslLib/process_files.pl @@ -248,7 +248,12 @@ my @asmfilelist = (); my @asmbuild = (); foreach my $product ((@{$unified_info{libraries}}, @{$unified_info{engines}})) { - foreach my $o (@{$unified_info{sources}->{$product}}) { + my @objs = @{$unified_info{sources}->{$product}}; + while (my $o = pop @objs) { + if ($o =~ m/\.a$/) { + push @objs, @{$unified_info{sources}->{$o}}; + next; + } foreach my $s (@{$unified_info{sources}->{$o}}) { # No need to add unused files in UEFI. # So it can reduce porting time, compile time, library size. -- 2.33.1