packaging
/
ostree
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

compile-one: Fix build of modules that don't support srcdir != builddir 

We need to run configure and make/make install in the _build
directory.
This commit is contained in:
Colin Walters 2012-01-09 19:56:03 -05:00
parent 492f0777f2
commit 46d09b1501
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/ostbuild/pyostbuild/builtin_compile_one.py
View File

@ -137,6 +137,8 @@ class OstbuildCompileOne(builtins.Builtin):
else: else:
log("Using existing 'configure' script") log("Using existing 'configure' script")
builddir = '_build'
use_builddir = True use_builddir = True
doesnot_support_builddir = self._has_buildapi_configure_variable('no-builddir') doesnot_support_builddir = self._has_buildapi_configure_variable('no-builddir')
if doesnot_support_builddir: if doesnot_support_builddir:
@ -146,10 +148,8 @@ class OstbuildCompileOne(builtins.Builtin):
shutil.copytree('.', '_build', symlinks=True, shutil.copytree('.', '_build', symlinks=True,
ignore=shutil.ignore_patterns('_build')) ignore=shutil.ignore_patterns('_build'))
use_builddir = False use_builddir = False
builddir = '.'
if use_builddir: if use_builddir:
builddir = '_build'
log("Using build directory %r" % (builddir, )) log("Using build directory %r" % (builddir, ))
if not os.path.isdir(builddir): if not os.path.isdir(builddir):
os.mkdir(builddir) os.mkdir(builddir)
@ -159,10 +159,7 @@ class OstbuildCompileOne(builtins.Builtin):
else: else:
args = ['./configure'] args = ['./configure']
args.extend(self.configargs) args.extend(self.configargs)
if use_builddir: run_sync(args, cwd=builddir)
run_sync(args, cwd=builddir)
else:
run_sync(args)
makefile_path = os.path.join(builddir, 'Makefile') makefile_path = os.path.join(builddir, 'Makefile')
if not os.path.exists(makefile_path): if not os.path.exists(makefile_path):