diff options
| author | Andoni Morales Alastruey <ylatuya@gmail.com> | 2014-01-02 01:15:25 +0100 |
|---|---|---|
| committer | Andoni Morales Alastruey <ylatuya@gmail.com> | 2014-01-04 19:57:57 +0100 |
| commit | bfccebc0cfbc93836cc71b8d06e720fa852a01e1 (patch) | |
| tree | 9d627c4833cba770814b0901e2af95845c933c18 | |
| parent | c44208bd85965ba1e49dccd41a1e2c62debfcb13 (diff) | |
autotools: always run configure script
| -rw-r--r-- | cerbero/build/build.py | 6 | ||||
| -rw-r--r-- | recipes/freetype.recipe | 1 | ||||
| -rw-r--r-- | recipes/gnome-vfs.recipe | 1 | ||||
| -rw-r--r-- | recipes/x264.recipe | 1 | ||||
| -rw-r--r-- | recipes/zlib.recipe | 1 |
5 files changed, 0 insertions, 10 deletions
diff --git a/cerbero/build/build.py b/cerbero/build/build.py index a8f18bda..09b2599e 100644 --- a/cerbero/build/build.py +++ b/cerbero/build/build.py @@ -99,7 +99,6 @@ class MakefilesBase (Build): config_sh = '' configure_tpl = '' configure_options = '' - force_configure = False make = 'make' make_install = 'make install' make_check = None @@ -223,11 +222,6 @@ class Autotools (MakefilesBase): def configure(self): if self.supports_non_src_build: self.config_sh = os.path.join(self.repo_dir, self.config_sh) - # skip configure if we are already configured - if os.path.exists(os.path.join(self.make_dir, 'configure')) and\ - os.path.exists(os.path.join(self.make_dir, 'Makefile')): - if not self.force_configure and not self.force: - return # Only use --disable-maintainer mode for real autotools based projects if os.path.exists(os.path.join(self.make_dir, 'configure.in')) or\ diff --git a/recipes/freetype.recipe b/recipes/freetype.recipe index 7d3235cf..bcf28f08 100644 --- a/recipes/freetype.recipe +++ b/recipes/freetype.recipe @@ -8,7 +8,6 @@ class Recipe(recipe.Recipe): url = 'http://download.savannah.gnu.org/releases/freetype/freetype-2.4.12.tar.bz2' licenses = [License.FreeType] configure_tpl = "%(config-sh)s --prefix=%(prefix)s --libdir=%(libdir)s" - force_configure = True deps = ['zlib', 'bzip2'] files_libs = ['libfreetype'] diff --git a/recipes/gnome-vfs.recipe b/recipes/gnome-vfs.recipe index f4b86192..4c9c8df6 100644 --- a/recipes/gnome-vfs.recipe +++ b/recipes/gnome-vfs.recipe @@ -8,7 +8,6 @@ class Recipe(recipe.Recipe): licenses = [License.LGPL] stype = SourceType.TARBALL url = 'http://ftp.gnome.org/pub/GNOME/sources/gnome-vfs/2.24/gnome-vfs-2.24.4.tar.bz2' - force_configure = True deps = ['libxml', 'zlib', 'glib', 'gconf', 'gnome-mime-data', 'dbus'] files_bins = [ diff --git a/recipes/x264.recipe b/recipes/x264.recipe index 790aec6e..041ee033 100644 --- a/recipes/x264.recipe +++ b/recipes/x264.recipe @@ -10,7 +10,6 @@ class Recipe(recipe.Recipe): configure_tpl = "%(config-sh)s --prefix=%(prefix)s "\ "--libdir=%(libdir)s %(options)s" configure_options = '--enable-shared --enable-static --enable-pic --disable-strip' - force_configure = True url = 'http://ftp.videolan.org/pub/x264/snapshots/x264-snapshot-20120827-2245-stable.tar.bz2' tarball_dirname= 'x264-snapshot-20120827-2245-stable' new_env = {'AS': 'yasm'} diff --git a/recipes/zlib.recipe b/recipes/zlib.recipe index 6ced507c..1286e580 100644 --- a/recipes/zlib.recipe +++ b/recipes/zlib.recipe @@ -8,7 +8,6 @@ class Recipe(recipe.Recipe): stype = SourceType.TARBALL url = 'http://zlib.net/zlib-1.2.8.tar.xz' licenses = [License.BSD_like] - force_configure = True add_host_build_target = False can_use_configure_cache = False patches = ['zlib/0001-win32-fix-dll-name.patch'] |