From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS31976 209.132.180.0/23 X-Spam-Status: No, score=-4.0 required=3.0 tests=AWL,BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED, RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,SPF_PASS shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dcvr.yhbt.net (Postfix) with ESMTPS id 6BE341F463 for ; Tue, 17 Dec 2019 14:31:22 +0000 (UTC) DomainKey-Signature: a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:subject:in-reply-to:references :message-id:date:mime-version:content-type :content-transfer-encoding; q=dns; s=default; b=xJQ0nFHLnFVFLFCd l6LsZsan0GiGGUMpXQKeVKt8gUJgNYV6cGFNSQliMPr9etnlXQm7hMKsU/kSxpNh 1QHOuuQ8V6QWtxlks6EaN0L4xGKC8fSulRabeYV/a/vFug8EZMMu5z8OTQ0NYzlH hcglyMu1Trl2aH8qP8JXEaac5so= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:subject:in-reply-to:references :message-id:date:mime-version:content-type :content-transfer-encoding; s=default; bh=KJYCb4255anE034D0PCxkt hhy40=; b=OEwMKeqyKArRV7IkGyIXwIfsGvw7NotzO+3IASt5PCXck0zKDHl1Uw EoJzHU5ewnGxLtk8O4ZGQdgoNU3MHJD2m/FtsNBz4HQmGrA7cASzyO6tVhBHw5L3 ZQ1e+b07Y4zrYIW+KYQVX8PXZJwrNfojPZPClOB9nlboin03bL1pQ= Received: (qmail 5498 invoked by alias); 17 Dec 2019 14:31:09 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Received: (qmail 5439 invoked by uid 89); 17 Dec 2019 14:31:09 -0000 Authentication-Results: sourceware.org; auth=none X-HELO: us-smtp-1.mimecast.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1576593065; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=5ns4Erz68NJLczXpXa2QucZ7aHPR3pKMyLE6sYrbyEU=; b=FDPZLx0GkEvWO8Ng5/ShCLTtfLldkozH5eYr+LS1PfC5/n/GbaGbIkgXCmkvMuBIwYjAo8 seaRduHzY/ZuukC02GVEY0zXBjAwMVYAjwWNXsMsY1sxuOKZa6LJeiLOE/f9bD01ELXhnG 4aWiIkNKKAhJa+Ow7BDhimCdS9XRFrU= From: Florian Weimer To: libc-alpha@sourceware.org Subject: [PATCH 3/5] build-many-glibcs.py: Introduce LinuxHeadersPolicyForBuild In-Reply-To: References: Message-Id: Date: Tue, 17 Dec 2019 15:30:59 +0100 User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 Content-Type: text/plain Content-Transfer-Encoding: quoted-printable And move install_linux_headers to the top level. --- scripts/build-many-glibcs.py | 91 +++++++++++++++++++----------------- 1 file changed, 48 insertions(+), 43 deletions(-) diff --git a/scripts/build-many-glibcs.py b/scripts/build-many-glibcs.py index 193d49727b..56160a16fc 100755 --- a/scripts/build-many-glibcs.py +++ b/scripts/build-many-glibcs.py @@ -1160,6 +1160,53 @@ class Context(object): print('Script changed, bot re-execing.') self.exec_self() =20 +class LinuxHeadersPolicyForBuild(object): + """Names and directories for installing Linux headers. Build variant.= """ + + def __init__(self, config): + self.arch =3D config.arch + self.srcdir =3D config.ctx.component_srcdir('linux') + self.builddir =3D config.component_builddir('linux') + self.headers_dir =3D os.path.join(config.sysroot, 'usr') + +def install_linux_headers(policy, cmdlist): + """Install Linux kernel headers.""" + arch_map =3D {'aarch64': 'arm64', + 'alpha': 'alpha', + 'arm': 'arm', + 'csky': 'csky', + 'hppa': 'parisc', + 'i486': 'x86', + 'i586': 'x86', + 'i686': 'x86', + 'i786': 'x86', + 'ia64': 'ia64', + 'm68k': 'm68k', + 'microblaze': 'microblaze', + 'mips': 'mips', + 'nios2': 'nios2', + 'powerpc': 'powerpc', + 's390': 's390', + 'riscv32': 'riscv', + 'riscv64': 'riscv', + 'sh': 'sh', + 'sparc': 'sparc', + 'x86_64': 'x86'} + linux_arch =3D None + for k in arch_map: + if policy.arch.startswith(k): + linux_arch =3D arch_map[k] + break + assert linux_arch is not None + cmdlist.push_subdesc('linux') + cmdlist.create_use_dir(policy.builddir) + cmdlist.add_command('install-headers', + ['make', '-C', policy.srcdir, 'O=3D%s' % policy.bu= ilddir, + 'ARCH=3D%s' % linux_arch, + 'INSTALL_HDR_PATH=3D%s' % policy.headers_dir, + 'headers_install']) + cmdlist.cleanup_dir() + cmdlist.pop_subdesc() =20 class Config(object): """A configuration for building a compiler and associated libraries.""= " @@ -1218,7 +1265,7 @@ class Config(object): '--disable-readline', '--disable-sim']) if self.os.startswith('linux'): - self.install_linux_headers(cmdlist) + install_linux_headers(LinuxHeadersPolicyForBuild(self), cmdlis= t) self.build_gcc(cmdlist, True) if self.os =3D=3D 'gnu': self.install_gnumach_headers(cmdlist) @@ -1266,48 +1313,6 @@ class Config(object): cmdlist.cleanup_dir() cmdlist.pop_subdesc() =20 - def install_linux_headers(self, cmdlist): - """Install Linux kernel headers.""" - arch_map =3D {'aarch64': 'arm64', - 'alpha': 'alpha', - 'arm': 'arm', - 'csky': 'csky', - 'hppa': 'parisc', - 'i486': 'x86', - 'i586': 'x86', - 'i686': 'x86', - 'i786': 'x86', - 'ia64': 'ia64', - 'm68k': 'm68k', - 'microblaze': 'microblaze', - 'mips': 'mips', - 'nios2': 'nios2', - 'powerpc': 'powerpc', - 's390': 's390', - 'riscv32': 'riscv', - 'riscv64': 'riscv', - 'sh': 'sh', - 'sparc': 'sparc', - 'x86_64': 'x86'} - linux_arch =3D None - for k in arch_map: - if self.arch.startswith(k): - linux_arch =3D arch_map[k] - break - assert linux_arch is not None - srcdir =3D self.ctx.component_srcdir('linux') - builddir =3D self.component_builddir('linux') - headers_dir =3D os.path.join(self.sysroot, 'usr') - cmdlist.push_subdesc('linux') - cmdlist.create_use_dir(builddir) - cmdlist.add_command('install-headers', - ['make', '-C', srcdir, 'O=3D%s' % builddir, - 'ARCH=3D%s' % linux_arch, - 'INSTALL_HDR_PATH=3D%s' % headers_dir, - 'headers_install']) - cmdlist.cleanup_dir() - cmdlist.pop_subdesc() - def install_gnumach_headers(self, cmdlist): """Install GNU Mach headers.""" srcdir =3D self.ctx.component_srcdir('gnumach') --=20 2.23.0