lib/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-08-01 10:06:57 +03:00
Code Activity

Make build-many-glibcs.py clean git source directories.

Browse Source 
With the git checkouts of Hurd components in build-many-glibcs.py
involving running autoreconf, there's a risk that generated files
could be left behind by an old autoreconf run (if an old version of
the sources generates those files in the source directory but a new
version does not).

This patch avoids that by using git clean -dxfq when updating git
checkouts.  In this patch, that's conditional on --replace-sources, to
avoid removing any local not-checked-in files someone may have in
their checkout unless the option has been specifically passed that
says it's OK to blow old checkouts away, complete with any local
changes to them.

	* scripts/build-many-glibcs.py (Context.git_checkout): Use git
	clean -dxfq for git updates when replacing sources.
This commit is contained in:
Joseph Myers
2018-01-29 13:59:33 +00:00
parent 088de7d009
commit e3aa6999d7
2 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -1,5 +1,8 @@
2018-01-29 Joseph Myers <joseph@codesourcery.com> 2018-01-29 Joseph Myers <joseph@codesourcery.com>
* scripts/build-many-glibcs.py (Context.git_checkout): Use git
clean -dxfq for git updates when replacing sources.
* scripts/build-many-glibcs.py (Config.build_gcc): Use * scripts/build-many-glibcs.py (Config.build_gcc): Use
--disable-libcilkrts unconditionally, not just for the final GCC --disable-libcilkrts unconditionally, not just for the final GCC
build for Hurd. build for Hurd.

3
scripts/build-many-glibcs.py
View File

@ -816,6 +816,9 @@ class Context(object):
if update: if update:
subprocess.run(['git', 'remote', 'prune', 'origin'], subprocess.run(['git', 'remote', 'prune', 'origin'],
cwd=self.component_srcdir(component), check=True) cwd=self.component_srcdir(component), check=True)
if self.replace_sources:
subprocess.run(['git', 'clean', '-dxfq'],
cwd=self.component_srcdir(component), check=True)
subprocess.run(['git', 'pull', '-q'], subprocess.run(['git', 'pull', '-q'],
cwd=self.component_srcdir(component), check=True) cwd=self.component_srcdir(component), check=True)
else: else: