[jhbuild] autotools: after a distclean configure needs to happen before build
- From: Frederic Peters <fpeters src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [jhbuild] autotools: after a distclean configure needs to happen before build
- Date: Wed, 29 Jan 2014 11:10:27 +0000 (UTC)
commit aaead91d71405c153ac4ba0dfef9e4b8e789f373
Author: Alban Browaeys <prahal yahoo com>
Date: Mon Jan 13 11:12:42 2014 +0100
autotools: after a distclean configure needs to happen before build
Therefor check for srcdir/configure exists. If not run configure.
https://bugzilla.gnome.org/show_bug.cgi?id=722098
jhbuild/modtypes/autotools.py | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
---
diff --git a/jhbuild/modtypes/autotools.py b/jhbuild/modtypes/autotools.py
index e8dbd3f..56e7fb8 100644
--- a/jhbuild/modtypes/autotools.py
+++ b/jhbuild/modtypes/autotools.py
@@ -181,6 +181,11 @@ class AutogenModule(MakeModule, DownloadableModule):
if buildscript.config.alwaysautogen:
return False
+ srcdir = self.get_srcdir(buildscript)
+ configure_path = os.path.join(srcdir, 'configure')
+ if not os.path.exists(configure_path):
+ return False
+
# if autogen.sh args has changed, re-run configure
db_entry = buildscript.moduleset.packagedb.get(self.name)
if db_entry:
@@ -202,7 +207,6 @@ class AutogenModule(MakeModule, DownloadableModule):
# https://bugzilla.gnome.org/show_bug.cgi?id=660844
if not isinstance(self.branch, TarballBranch):
configsrc = None
- srcdir = self.get_srcdir(buildscript)
for name in ['configure.ac', 'configure.in']:
path = os.path.join(srcdir, name)
if os.path.exists(path):
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]