diff options
| author | Matthew Waters <matthew@centricular.com> | 2024-01-25 22:13:59 +1100 |
|---|---|---|
| committer | Matthew Waters <matthew@centricular.com> | 2024-01-25 22:24:41 +1100 |
| commit | 952fbfffad7e1925605d8efbeefffd105a1e7878 (patch) | |
| tree | 3ae74e4e28796b6a010185fff85b26e3d1e8babb | |
| parent | b08ebc06167d4d69a4a86d78ec9872b32871fa83 (diff) | |
osx: remove XML::Parser intltool from bootstrap1.22.9
XML::Parser currently fails installing and is not needed anymore.
Error is very similar to that outlined in where -lexpat does not seem
to be added to the link command:
https://stackoverflow.com/questions/65383579/cant-install-xmlparser-on-m1-mac-with-homebrew-perl-5-32
Part-of: <https://gitlab.freedesktop.org/gstreamer/cerbero/-/merge_requests/1327>
| -rw-r--r-- | cerbero/bootstrap/build_tools.py | 2 | ||||
| -rw-r--r-- | cerbero/bootstrap/osx.py | 15 |
2 files changed, 1 insertions, 16 deletions
diff --git a/cerbero/bootstrap/build_tools.py b/cerbero/bootstrap/build_tools.py index b2b98a56..9c2c628e 100644 --- a/cerbero/bootstrap/build_tools.py +++ b/cerbero/bootstrap/build_tools.py @@ -40,7 +40,7 @@ class BuildTools (BootstrapperBase, Fetch): BUILD_TOOLS = ['automake', 'autoconf', 'libtool', 'pkg-config', 'orc', 'gettext-m4', 'meson'] PLAT_BUILD_TOOLS = { - Platform.DARWIN: ['intltool', 'sed', 'gperf', 'bison', 'flex', + Platform.DARWIN: ['sed', 'gperf', 'bison', 'flex', 'moltenvk-tools'], Platform.WINDOWS: ['nasm'], Platform.LINUX: ['intltool-m4'], diff --git a/cerbero/bootstrap/osx.py b/cerbero/bootstrap/osx.py index 3666209a..d6ed9469 100644 --- a/cerbero/bootstrap/osx.py +++ b/cerbero/bootstrap/osx.py @@ -24,31 +24,16 @@ from cerbero.config import Distro from cerbero.utils import shell from cerbero.utils import messages as m -CPANM_VERSION = '1.7044' -CPANM_URL_TPL = 'https://raw.githubusercontent.com/miyagawa/cpanminus/{}/cpanm' -CPANM_CHECKSUM = '22b92506243649a73cfb55c5990cedd24cdbb20b15b4530064d2496d94d1642b' - class OSXBootstrapper (BootstrapperBase): def __init__(self, config, offline, assume_yes): super().__init__(config, offline) - url = CPANM_URL_TPL.format(CPANM_VERSION) - self.fetch_urls.append((url, None, CPANM_CHECKSUM)) async def start(self, jobs=0): # skip system package install if not needed if not self.config.distro_packages_install: return - self._install_perl_deps() - - def _install_perl_deps(self): - cpanm_installer = os.path.join(self.config.local_sources, 'cpanm') - shell.new_call(['chmod', '+x', cpanm_installer]) - # Install XML::Parser, required for intltool - cmd = ['sudo', cpanm_installer, 'XML::Parser'] - m.message("Installing XML::Parser, may require a password for running \'" + " ".join(cmd) + "\'") - shell.new_call(cmd, interactive=True) def register_all(): |