From: Florian Weimer <fweimer@redhat.com>
To: libc-alpha@sourceware.org
Subject: [PATCH 4/5] build-many-glibcs.py: Introduce glibc build policy classes
Date: Tue, 17 Dec 2019 15:31:05 +0100 [thread overview]
Message-ID: <bd3b31eeea97a4d7fb38d73e164a6c3caf6c4d22.1576588849.git.fweimer@redhat.com> (raw)
In-Reply-To: <cover.1576588849.git.fweimer@redhat.com>
The new classes GlibcPolicyForCompiler and GlibcPolicyForBuild allow
customization of the Glibc.build_glibc method, replacing the existing
for_compiler flag.
---
scripts/build-many-glibcs.py | 129 ++++++++++++++++++++++-------------
1 file changed, 80 insertions(+), 49 deletions(-)
diff --git a/scripts/build-many-glibcs.py b/scripts/build-many-glibcs.py
index 56160a16fc..58f2409b1d 100755
--- a/scripts/build-many-glibcs.py
+++ b/scripts/build-many-glibcs.py
@@ -1274,7 +1274,7 @@ class Config(object):
for g in self.compiler_glibcs:
cmdlist.push_subdesc('glibc')
cmdlist.push_subdesc(g.name)
- g.build_glibc(cmdlist, True)
+ g.build_glibc(cmdlist, GlibcPolicyForCompiler(g))
cmdlist.pop_subdesc()
cmdlist.pop_subdesc()
self.build_gcc(cmdlist, False)
@@ -1395,6 +1395,76 @@ class Config(object):
'--enable-shared', '--enable-threads']
self.build_cross_tool(cmdlist, 'gcc', tool_build, cfg_opts)
+class GlibcPolicyDefault(object):
+ """Build policy for glibc: common defaults."""
+
+ def __init__(self, glibc):
+ self.srcdir = glibc.ctx.component_srcdir('glibc')
+ self.use_usr = glibc.os != 'gnu'
+ self.prefix = '/usr' if self.use_usr else ''
+ self.configure_args = [
+ '--prefix=%s' % self.prefix,
+ '--enable-profile',
+ '--build=%s' % glibc.ctx.build_triplet,
+ '--host=%s' % glibc.triplet,
+ 'CC=%s' % glibc.tool_name('gcc'),
+ 'CXX=%s' % glibc.tool_name('g++'),
+ 'AR=%s' % glibc.tool_name('ar'),
+ 'AS=%s' % glibc.tool_name('as'),
+ 'LD=%s' % glibc.tool_name('ld'),
+ 'NM=%s' % glibc.tool_name('nm'),
+ 'OBJCOPY=%s' % glibc.tool_name('objcopy'),
+ 'OBJDUMP=%s' % glibc.tool_name('objdump'),
+ 'RANLIB=%s' % glibc.tool_name('ranlib'),
+ 'READELF=%s' % glibc.tool_name('readelf'),
+ 'STRIP=%s' % glibc.tool_name('strip'),
+ ]
+ if glibc.os == 'gnu':
+ self.configure_args.append('MIG=%s' % glibc.tool_name('mig'))
+ self.configure_args += glibc.cfg
+
+ def configure(self, cmdlist):
+ """Invoked to add the configure command to the command list."""
+ cmdlist.add_command('configure',
+ [os.path.join(self.srcdir, 'configure'),
+ *self.configure_args])
+
+ def extra_commands(self, cmdlist):
+ """Invoked to inject additional commands (make check) after build."""
+ pass
+
+class GlibcPolicyForCompiler(GlibcPolicyDefault):
+ """Build policy for glibc during the compilers stage."""
+
+ def __init__(self, glibc):
+ super().__init__(glibc)
+ self.builddir = glibc.ctx.component_builddir(
+ 'compilers', glibc.compiler.name, 'glibc', glibc.name)
+ self.installdir = glibc.compiler.sysroot
+
+class GlibcPolicyForBuild(GlibcPolicyDefault):
+ """Build policy for glibc during the glibcs stage."""
+
+ def __init__(self, glibc):
+ super().__init__(glibc)
+ self.builddir = glibc.ctx.component_builddir(
+ 'glibcs', glibc.name, 'glibc')
+ self.installdir = glibc.ctx.glibc_installdir(glibc.name)
+ if glibc.ctx.strip:
+ self.strip = glibc.tool_name('strip')
+ else:
+ self.strip = None
+ self.save_logs = glibc.ctx.save_logs
+
+ def extra_commands(self, cmdlist):
+ if self.strip:
+ cmdlist.add_command('strip',
+ ['sh', '-c',
+ ('%s $(find %s/lib* -name "*.so")' %
+ (self.strip, self.installdir))])
+ cmdlist.add_command('check', ['make', 'check'])
+ cmdlist.add_command('save-logs', [self.save_logs], always_run=True)
+
class Glibc(object):
"""A configuration for building glibc."""
@@ -1442,66 +1512,27 @@ class Glibc(object):
['test', '-f',
os.path.join(self.compiler.installdir, 'ok')])
cmdlist.use_path(self.compiler.bindir)
- self.build_glibc(cmdlist, False)
+ self.build_glibc(cmdlist, GlibcPolicyForBuild(self))
self.ctx.add_makefile_cmdlist('glibcs-%s' % self.name, cmdlist,
logsdir)
- def build_glibc(self, cmdlist, for_compiler):
+ def build_glibc(self, cmdlist, policy):
"""Generate commands to build this glibc, either as part of a compiler
build or with the bootstrapped compiler (and in the latter case, run
tests as well)."""
- srcdir = self.ctx.component_srcdir('glibc')
- if for_compiler:
- builddir = self.ctx.component_builddir('compilers',
- self.compiler.name, 'glibc',
- self.name)
- installdir = self.compiler.sysroot
- else:
- builddir = self.ctx.component_builddir('glibcs', self.name,
- 'glibc')
- installdir = self.ctx.glibc_installdir(self.name)
- cmdlist.create_use_dir(builddir)
- use_usr = self.os != 'gnu'
- prefix = '/usr' if use_usr else ''
- cfg_cmd = [os.path.join(srcdir, 'configure'),
- '--prefix=%s' % prefix,
- '--enable-profile',
- '--build=%s' % self.ctx.build_triplet,
- '--host=%s' % self.triplet,
- 'CC=%s' % self.tool_name('gcc'),
- 'CXX=%s' % self.tool_name('g++'),
- 'AR=%s' % self.tool_name('ar'),
- 'AS=%s' % self.tool_name('as'),
- 'LD=%s' % self.tool_name('ld'),
- 'NM=%s' % self.tool_name('nm'),
- 'OBJCOPY=%s' % self.tool_name('objcopy'),
- 'OBJDUMP=%s' % self.tool_name('objdump'),
- 'RANLIB=%s' % self.tool_name('ranlib'),
- 'READELF=%s' % self.tool_name('readelf'),
- 'STRIP=%s' % self.tool_name('strip')]
- if self.os == 'gnu':
- cfg_cmd += ['MIG=%s' % self.tool_name('mig')]
- cfg_cmd += self.cfg
- cmdlist.add_command('configure', cfg_cmd)
+ cmdlist.create_use_dir(policy.builddir)
+ policy.configure(cmdlist)
cmdlist.add_command('build', ['make'])
cmdlist.add_command('install', ['make', 'install',
- 'install_root=%s' % installdir])
+ 'install_root=%s' % policy.installdir])
# GCC uses paths such as lib/../lib64, so make sure lib
# directories always exist.
mkdir_cmd = ['mkdir', '-p',
- os.path.join(installdir, 'lib')]
- if use_usr:
- mkdir_cmd += [os.path.join(installdir, 'usr', 'lib')]
+ os.path.join(policy.installdir, 'lib')]
+ if policy.use_usr:
+ mkdir_cmd += [os.path.join(policy.installdir, 'usr', 'lib')]
cmdlist.add_command('mkdir-lib', mkdir_cmd)
- if not for_compiler:
- if self.ctx.strip:
- cmdlist.add_command('strip',
- ['sh', '-c',
- ('%s $(find %s/lib* -name "*.so")' %
- (self.tool_name('strip'), installdir))])
- cmdlist.add_command('check', ['make', 'check'])
- cmdlist.add_command('save-logs', [self.ctx.save_logs],
- always_run=True)
+ policy.extra_commands(cmdlist)
cmdlist.cleanup_dir()
--
2.23.0
next prev parent reply other threads:[~2019-12-17 14:31 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-17 14:30 [PATCH 0/5] Implement built-in system call tables Florian Weimer
2019-12-17 14:30 ` [PATCH 1/5] Linux: Add tables with system call numbers Florian Weimer
2019-12-28 12:39 ` Siddhesh Poyarekar
2019-12-31 11:22 ` Florian Weimer
2019-12-31 13:57 ` Adhemerval Zanella
2019-12-31 16:48 ` Florian Weimer
2019-12-31 15:50 ` Siddhesh Poyarekar
2019-12-31 16:04 ` Florian Weimer
2019-12-31 16:11 ` Siddhesh Poyarekar
2019-12-31 17:43 ` Florian Weimer
2019-12-31 20:51 ` Florian Weimer
2020-01-02 5:55 ` Siddhesh Poyarekar
2020-01-02 9:22 ` Florian Weimer
2019-12-17 14:30 ` [PATCH 2/5] Linux: Use system call tables during build Florian Weimer
2019-12-28 12:39 ` Siddhesh Poyarekar
2019-12-17 14:30 ` [PATCH 3/5] build-many-glibcs.py: Introduce LinuxHeadersPolicyForBuild Florian Weimer
2019-12-28 12:39 ` Siddhesh Poyarekar
2019-12-17 14:31 ` Florian Weimer [this message]
2019-12-28 12:39 ` [PATCH 4/5] build-many-glibcs.py: Introduce glibc build policy classes Siddhesh Poyarekar
2019-12-17 14:31 ` [PATCH 5/5] build-many-glibcs.py: Implement update-syscalls command Florian Weimer
2019-12-28 12:39 ` Siddhesh Poyarekar
2020-01-01 10:35 ` [PATCH 0/5] Implement built-in system call tables Florian Weimer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.gnu.org/software/libc/involved.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=bd3b31eeea97a4d7fb38d73e164a6c3caf6c4d22.1576588849.git.fweimer@redhat.com \
--to=fweimer@redhat.com \
--cc=libc-alpha@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).