diff options
| author |   Patrick J Volkerding <volkerdi@slackware.com> | 2019-12-11 21:03:27 +0000 |
|---|---|---|
| committer |   Eric Hameleers <alien@slackware.com> | 2019-12-12 08:59:50 +0100 |
| commit | e37e24f7e55a4939e41cb59ed0ca29b1dccc2fec (patch) | |
| tree | e0db23a168f93fa4574d38cfa8ac938c35e7803b /source/l/mozjs52/patches/include-configure-script.patch | |
| parent | c42086b90c8f4ddf8de656cd3d155ddaabb6ace1 (diff) | |
| download | current-e37e24f7e55a4939e41cb59ed0ca29b1dccc2fec.tar.gz current-e37e24f7e55a4939e41cb59ed0ca29b1dccc2fec.tar.xz | |
Wed Dec 11 21:03:27 UTC 201920191211210327
ap/mariadb-10.4.11-x86_64-1.txz: Upgraded.
d/cmake-3.16.1-x86_64-1.txz: Upgraded.
d/git-2.24.1-x86_64-1.txz: Upgraded.
l/mozjs52-52.9.0esr-x86_64-2.txz: Removed.
This was used only by polkit-0.115.
l/mozjs60-60.9.0esr-x86_64-1.txz: Added.
This is needed for polkit-0.116.
l/polkit-0.116-x86_64-1.txz: Upgraded.
n/ModemManager-1.12.2-x86_64-1.txz: Upgraded.
xap/xine-ui-0.99.12-x86_64-1.txz: Upgraded.
Diffstat (limited to 'source/l/mozjs52/patches/include-configure-script.patch')
| -rw-r--r-- | source/l/mozjs52/patches/include-configure-script.patch | 48 |
1 files changed, 0 insertions, 48 deletions
diff --git a/source/l/mozjs52/patches/include-configure-script.patch b/source/l/mozjs52/patches/include-configure-script.patch deleted file mode 100644 index c24d7b157..000000000 --- a/source/l/mozjs52/patches/include-configure-script.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 4a06a1a6a71293decb83aee7adb74bc709493106 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] 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 ---- - js/src/configure | 9 +++++++++ - python/mozbuild/mozbuild/configure/__init__.py | 2 +- - python/mozbuild/mozbuild/configure/options.py | 6 +++++- - 3 files changed, 15 insertions(+), 2 deletions(-) - create mode 100755 js/src/configure - -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 @@ def run(self, path=None): - # 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 @@ def __init__(self, environ=os.environ, argv=sys.argv): - - 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: - |