summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNirbheek Chauhan <nirbheek@centricular.com>2020-09-30 22:26:19 +0530
committerGStreamer Merge Bot <gitlab-merge-bot@gstreamer-foundation.org>2020-09-30 20:25:25 +0000
commitb6095c7d9f134f4a13476b2cbccd4599f29e42cc (patch)
treea679a2b6ef91b3d62bce892fc494e126e1d9e887
parenta05e5373ec68d030adabdac724870cea3fd43c71 (diff)
bootstrap: Don't use autotools build-tools on Windows
We should never run autoreconf because it hangs on the Windows CI runner. Part-of: <https://gitlab.freedesktop.org/gstreamer/cerbero/-/merge_requests/622>
-rw-r--r--cerbero/bootstrap/build_tools.py9
-rw-r--r--cerbero/build/build.py4
-rw-r--r--recipes/libcroco.recipe4
-rw-r--r--recipes/libdca.recipe6
-rw-r--r--recipes/libkate.recipe7
-rw-r--r--recipes/libmms.recipe7
-rw-r--r--recipes/libtheora.recipe9
-rw-r--r--recipes/sbc.recipe4
-rw-r--r--recipes/spandsp.recipe1
-rw-r--r--recipes/vo-aacenc.recipe7
10 files changed, 24 insertions, 34 deletions
diff --git a/cerbero/bootstrap/build_tools.py b/cerbero/bootstrap/build_tools.py
index 96aac381..554cbe2a 100644
--- a/cerbero/bootstrap/build_tools.py
+++ b/cerbero/bootstrap/build_tools.py
@@ -47,11 +47,16 @@ class BuildTools (BootstrapperBase, Fetch):
# Used by ffmpeg and x264 on iOS, and by openn264 on Windows-ARM64
self.BUILD_TOOLS.append('gas-preprocessor')
- if self.config.variants.uwp:
- # UWP config does not build any autotools recipes
+ if self.config.platform == Platform.WINDOWS:
+ # We must not run automake/autoconf/libtoolize when building on
+ # windows because they hang on the Windows CI runner
+ self.BUILD_TOOLS.remove('gettext-m4')
self.BUILD_TOOLS.remove('automake')
self.BUILD_TOOLS.remove('autoconf')
self.BUILD_TOOLS.remove('libtool')
+
+ if self.config.variants.uwp:
+ # UWP config does not build any autotools recipes
self.PLAT_BUILD_TOOLS[Platform.WINDOWS].remove('intltool')
self.PLAT_BUILD_TOOLS[Platform.WINDOWS].remove('gperf')
diff --git a/cerbero/build/build.py b/cerbero/build/build.py
index b885a4d4..ec9ed017 100644
--- a/cerbero/build/build.py
+++ b/cerbero/build/build.py
@@ -566,6 +566,10 @@ class Autotools (MakefilesBase):
await shell.async_call(self.autoreconf_sh, self.config_src_dir,
logfile=self.logfile, env=self.env)
+ # We don't build libtool on Windows
+ if self.config.platform == Platform.WINDOWS:
+ self.override_libtool = False
+
# Use our own config.guess and config.sub
config_datadir = os.path.join(self.config._relative_path('data'), 'autotools')
cfs = {'config.guess': config_datadir, 'config.sub': config_datadir}
diff --git a/recipes/libcroco.recipe b/recipes/libcroco.recipe
index fecd5e3b..7cded2e7 100644
--- a/recipes/libcroco.recipe
+++ b/recipes/libcroco.recipe
@@ -17,7 +17,5 @@ class Recipe(recipe.Recipe):
def prepare(self):
if self.config.target_platform in [Platform.DARWIN, Platform.IOS]:
self.configure_options += ' --disable-Bsymbolic'
- if self.config.platform == Platform.WINDOWS:
- self.override_libtool = False
- else:
+ if self.config.platform != Platform.WINDOWS:
self.autoreconf = True
diff --git a/recipes/libdca.recipe b/recipes/libdca.recipe
index 8df00fce..c8cccdaf 100644
--- a/recipes/libdca.recipe
+++ b/recipes/libdca.recipe
@@ -7,7 +7,6 @@ class Recipe(recipe.Recipe):
url = 'https://download.videolan.org/pub/videolan/libdca/%(version)s/libdca-%(version)s.tar.bz2'
tarball_checksum = 'dba022e022109a5bacbe122d50917769ff27b64a7bba104bd38ced8de8510642'
licenses = [License.GPLv2Plus]
- autoreconf = True
files_libs = ['libdca']
files_bins = ['extract_dca', 'extract_dcs', 'dcadec', 'dcsdec']
@@ -17,9 +16,8 @@ class Recipe(recipe.Recipe):
def prepare(self):
if self.config.target_platform == Platform.ANDROID:
self.configure_options += ' --disable-oss'
- if self.config.platform == Platform.WINDOWS:
- self.override_libtool = False
- self.autoreconf = False
+ if self.config.platform != Platform.WINDOWS:
+ self.autoreconf = True
# Don't enable always-inline, breaks the build on macos (space is significant)
self.set_env('ac_cv_c_inline', 'inline ')
diff --git a/recipes/libkate.recipe b/recipes/libkate.recipe
index a50679c2..a28da25f 100644
--- a/recipes/libkate.recipe
+++ b/recipes/libkate.recipe
@@ -13,7 +13,6 @@ class Recipe(recipe.Recipe):
files_libs = ['libkate', 'liboggkate']
files_devel = ['include/kate', 'lib/pkgconfig/kate.pc', 'lib/pkgconfig/oggkate.pc']
- autoreconf = True
def prepare(self):
# Tell internal script to call python3 instead of python on non-Windows
@@ -22,9 +21,7 @@ class Recipe(recipe.Recipe):
self.append_env('PYTHON', 'python3')
if self.config.target_distro == Distro.ARCH:
self.append_env('LDFLAGS', '-Wl,-O1,--sort-common,--as-needed,-z,relro')
- if self.config.platform == Platform.WINDOWS:
- self.autoreconf = False
- self.override_libtool = False
- else:
+ if self.config.platform != Platform.WINDOWS:
+ self.autoreconf = True
self.patches += ['libkate/0001-be-more-permissive-with-automake-errors-now-that-we-.patch']
self.append_env('CFLAGS', '-Wno-error')
diff --git a/recipes/libmms.recipe b/recipes/libmms.recipe
index 756df035..23efb203 100644
--- a/recipes/libmms.recipe
+++ b/recipes/libmms.recipe
@@ -12,9 +12,6 @@ class Recipe(recipe.Recipe):
files_libs = ['libmms']
files_devel = ['include/libmms', 'lib/pkgconfig/libmms.pc']
- autoreconf = True
-
def prepare(self):
- if self.config.platform == Platform.WINDOWS:
- self.autoreconf = False
- self.override_libtool = False
+ if self.config.platform != Platform.WINDOWS:
+ self.autoreconf = True
diff --git a/recipes/libtheora.recipe b/recipes/libtheora.recipe
index 31913375..c73971af 100644
--- a/recipes/libtheora.recipe
+++ b/recipes/libtheora.recipe
@@ -20,15 +20,12 @@ class Recipe(recipe.Recipe):
files_bins = ['dvconnect', 'encodedv', 'dubdv']
files_devel = ['include/theora', 'lib/pkgconfig/theora.pc',
'lib/pkgconfig/theoraenc.pc', 'lib/pkgconfig/theoradec.pc']
- autoreconf = True
- autoreconf_sh = 'NOCONFIGURE=1 ./autogen.sh'
def prepare(self):
- if self.config.platform == Platform.WINDOWS:
- self.autoreconf = False
- self.override_libtool = False
- else:
+ if self.config.platform != Platform.WINDOWS:
# Don't build documentation even if doxygen is available
+ self.autoreconf = True
+ self.autoreconf_sh = 'NOCONFIGURE=1 ./autogen.sh'
self.configure_options += ' --disable-doc'
self.patches += [
'libtheora/0001-Add-option-to-disable-doc.patch',
diff --git a/recipes/sbc.recipe b/recipes/sbc.recipe
index 12f73bf5..119abcbe 100644
--- a/recipes/sbc.recipe
+++ b/recipes/sbc.recipe
@@ -15,9 +15,7 @@ class Recipe(recipe.Recipe):
'sbc/0003-sbc.h-Define-ssize_t-when-building-with-MSVC.patch',]
def prepare(self):
- if self.config.platform == Platform.WINDOWS:
- self.override_libtool = False
- else:
+ if self.config.platform != Platform.WINDOWS:
self.autoreconf = True
async def compile(self):
diff --git a/recipes/spandsp.recipe b/recipes/spandsp.recipe
index d284bb64..2f716e45 100644
--- a/recipes/spandsp.recipe
+++ b/recipes/spandsp.recipe
@@ -27,7 +27,6 @@ class Recipe(recipe.Recipe):
self.patches += ['spandsp/0001-Fix-build-for-windows-using-mingw.patch']
if self.config.platform == Platform.WINDOWS:
- self.override_libtool = False
self.patches += ['spandsp/0001-Avoid-running-autoreconf-on-windows.patch']
else:
self.config_sh = 'sh ./autogen.sh && sh ./configure'
diff --git a/recipes/vo-aacenc.recipe b/recipes/vo-aacenc.recipe
index 1a89cb65..28226d9a 100644
--- a/recipes/vo-aacenc.recipe
+++ b/recipes/vo-aacenc.recipe
@@ -13,9 +13,6 @@ class Recipe(recipe.Recipe):
files_devel = ['include/vo-aacenc',
'lib/pkgconfig/vo-aacenc.pc']
- autoreconf = True
-
def prepare(self):
- if self.config.platform == Platform.WINDOWS:
- self.autoreconf = False
- self.override_libtool = False
+ if self.config.platform != Platform.WINDOWS:
+ self.autoreconf = True