diff options
author | A. Wilcox <AWilcox@Wilcox-Tech.com> | 2023-12-04 05:56:26 -0600 |
---|---|---|
committer | A. Wilcox <AWilcox@Wilcox-Tech.com> | 2023-12-07 20:50:21 -0600 |
commit | f6153b23bf3372d6d8093c2a8ef158d626f75018 (patch) | |
tree | c0b0449ccacadfc932472abdfbced1a3ab2e6876 /user/mozjs/0009-build-Include-configure-script-be-nicer-about-option.patch | |
parent | 7a2994761b1b0c34f270a808330d297dfd0d5eb2 (diff) | |
download | packages-f6153b23bf3372d6d8093c2a8ef158d626f75018.tar.gz packages-f6153b23bf3372d6d8093c2a8ef158d626f75018.tar.bz2 packages-f6153b23bf3372d6d8093c2a8ef158d626f75018.tar.xz packages-f6153b23bf3372d6d8093c2a8ef158d626f75018.zip |
user/mozjs: Move to legacy/
We do not need years-old SpiderMonkey any more.
Diffstat (limited to 'user/mozjs/0009-build-Include-configure-script-be-nicer-about-option.patch')
-rw-r--r-- | user/mozjs/0009-build-Include-configure-script-be-nicer-about-option.patch | 53 |
1 files changed, 0 insertions, 53 deletions
diff --git a/user/mozjs/0009-build-Include-configure-script-be-nicer-about-option.patch b/user/mozjs/0009-build-Include-configure-script-be-nicer-about-option.patch deleted file mode 100644 index 1a27b9ab5..000000000 --- a/user/mozjs/0009-build-Include-configure-script-be-nicer-about-option.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 83374895c64a673acfc7a1898f134a04c1a45d15 Mon Sep 17 00:00:00 2001 -From: Philip Chimento <philip.chimento@gmail.com> -Date: Wed, 5 Jul 2017 22:57:09 -0700 -Subject: [PATCH 09/10] build: Include configure script, be nicer about options - -A configure script is not included in the SpiderMonkey tarball by -default. Also, we have to account for JHbuild passing extra unknown -options like --disable-Werror. - -https://bugzilla.mozilla.org/show_bug.cgi?id=1379540 - -MODIFIED by Ian Stakenvicius, to *not* attempt to overwrite the existing -js/src/configure that 'make-source-package.sh' apparently adds to the -tarball. - ---- - python/mozbuild/mozbuild/configure/__init__.py | 2 +- - python/mozbuild/mozbuild/configure/options.py | 6 +++++- - 2 files changed - -diff --git a/python/mozbuild/mozbuild/configure/__init__.py b/python/mozbuild/mozbuild/configure/__init__.py -index 0fe640ca..09b460d3 100644 ---- a/python/mozbuild/mozbuild/configure/__init__.py -+++ b/python/mozbuild/mozbuild/configure/__init__.py -@@ -356,7 +356,7 @@ class ConfigureSandbox(dict): - # All options should have been removed (handled) by now. - for arg in self._helper: - without_value = arg.split('=', 1)[0] -- raise InvalidOptionError('Unknown option: %s' % without_value) -+ print('Ignoring', without_value, ': Unknown option') - - # Run the execution queue - for func, args in self._execution_queue: -diff --git a/python/mozbuild/mozbuild/configure/options.py b/python/mozbuild/mozbuild/configure/options.py -index 4310c862..15bfe425 100644 ---- a/python/mozbuild/mozbuild/configure/options.py -+++ b/python/mozbuild/mozbuild/configure/options.py -@@ -402,7 +402,11 @@ class CommandLineHelper(object): - - def add(self, arg, origin='command-line', args=None): - assert origin != 'default' -- prefix, name, values = Option.split_option(arg) -+ try: -+ prefix, name, values = Option.split_option(arg) -+ except InvalidOptionError as e: -+ print('Ignoring', arg, ':', e) -+ return - if args is None: - args = self._extra_args - if args is self._extra_args and name in self._extra_args: --- -2.13.0 - |