diff options
| author | Thomas Groman <tgroman@nuegia.net> | 2020-08-23 17:15:35 -0700 |
|---|---|---|
| committer | Thomas Groman <tgroman@nuegia.net> | 2020-08-23 18:10:05 -0700 |
| commit | e8dada8eff0b36a98b514af6adc039d2920a2109 (patch) | |
| tree | 4afe7a19db71a0ab714faac45ced87a457c36c77 /build | |
| parent | aaeaf52308b698084c978636b4f56f87d0603f49 (diff) | |
| download | UXP-e8dada8eff0b36a98b514af6adc039d2920a2109.tar UXP-e8dada8eff0b36a98b514af6adc039d2920a2109.tar.gz UXP-e8dada8eff0b36a98b514af6adc039d2920a2109.tar.lz UXP-e8dada8eff0b36a98b514af6adc039d2920a2109.tar.xz UXP-e8dada8eff0b36a98b514af6adc039d2920a2109.zip | |
Dick, YOU'RE FIRED!
Revert "Issue #1342 - Remove support for system libevent"
This reverts commit 90c5288fef22004d6e4d441b3ae10b9cd1836103.
Diffstat (limited to 'build')
| -rw-r--r-- | build/directive4.py | 60 | ||||
| -rw-r--r-- | build/moz.configure/old.configure | 3 |
2 files changed, 3 insertions, 60 deletions
diff --git a/build/directive4.py b/build/directive4.py deleted file mode 100644 index 009009bf0..000000000 --- a/build/directive4.py +++ /dev/null @@ -1,60 +0,0 @@ -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. - -# Imports -from __future__ import print_function, unicode_literals - -import os -import sys - -# Sanity check -if not len(sys.argv) > 1: - print("Incorrect number of arguments") - sys.exit(1) - -# Vars -listConfigure = sys.argv[1:] -listConfig = [] -strBrandingDirectory = "" -listViolations = [] - -# Build a list of set configure variables -for _value in listConfigure: - _splitString = _value.split("=") - - if _splitString[1] == "1": - listConfig += [ _splitString[0] ] - elif _splitString[0] == "MOZ_BRANDING_DIRECTORY": - strBrandingDirectory = _splitString[1] - -# Only applies if using Official Branding or specific branding directories -if ('MOZ_OFFICIAL_BRANDING' in listConfig) or (strBrandingDirectory.endswith("branding/official")) or (strBrandingDirectory.endswith("branding/unstable")): - # Applies to Pale Moon and Basilisk - if ('MC_BASILISK' in listConfig) or ('MC_PALEMOON' in listConfig): - listViolations += [ - 'MOZ_SYSTEM_JPEG', - 'MOZ_SYSTEM_ZLIB', - 'MOZ_SYSTEM_BZ2', - 'MOZ_SYSTEM_LIBVPX', - 'MOZ_SYSTEM_SQLITE', - 'MOZ_SYSTEM_JEMALLOC' - ] - - # Applies to Pale Moon Only - if 'MC_PALEMOON' in listConfig: - listViolations += [ - 'MOZ_EME', - 'MOZ_WEBRTC' - ] - - # Iterate through enabled violations and output 1 to DIRECTIVE4 if any are found - for _value in listViolations: - if _value in listConfig: - sys.stdout.write("1") - sys.exit(1) - -# Exit outputting nothing to DIRECTIVE4 being empty because there are no violations -sys.exit(0) - - diff --git a/build/moz.configure/old.configure b/build/moz.configure/old.configure index c416c18d2..499f668d7 100644 --- a/build/moz.configure/old.configure +++ b/build/moz.configure/old.configure @@ -291,7 +291,10 @@ def old_configure_options(*options): '--with-soft-float', '--with-system-bz2', '--with-system-jpeg', + '--with-system-libevent', '--with-system-libvpx', + '--with-system-nspr', + '--with-system-nss', '--with-system-zlib', '--with-thumb', '--with-thumb-interwork', |