From e2a478072a0c814d4e83e6c46a01c901f1cf3a94 Mon Sep 17 00:00:00 2001
From: wolfbeast <mcwerewolf@wolfbeast.com>
Date: Wed, 29 Jan 2020 15:13:55 +0100
Subject: Issue #1342 - Remove support for system ICU

---
 config/Makefile.in            |  1 -
 config/external/icu/moz.build | 22 ++++++++++------------
 config/moz.build              |  3 ---
 config/system-headers         | 16 ----------------
 4 files changed, 10 insertions(+), 32 deletions(-)

(limited to 'config')

diff --git a/config/Makefile.in b/config/Makefile.in
index 1512520e4..5fe0162f2 100644
--- a/config/Makefile.in
+++ b/config/Makefile.in
@@ -47,7 +47,6 @@ export:: $(export-preqs)
 		-DMOZ_SYSTEM_PNG=$(MOZ_SYSTEM_PNG) \
 		-DMOZ_SYSTEM_JPEG=$(MOZ_SYSTEM_JPEG) \
 		-DMOZ_SYSTEM_LIBVPX=$(MOZ_SYSTEM_LIBVPX) \
-		-DMOZ_SYSTEM_ICU=$(MOZ_SYSTEM_ICU) \
 		$(srcdir)/system-headers $(srcdir)/stl-headers | $(PERL) $(topsrcdir)/nsprpub/config/make-system-wrappers.pl system_wrappers
 	$(INSTALL) system_wrappers $(DIST)
 
diff --git a/config/external/icu/moz.build b/config/external/icu/moz.build
index 248652a85..488a02159 100644
--- a/config/external/icu/moz.build
+++ b/config/external/icu/moz.build
@@ -6,16 +6,14 @@
 
 Library('icu')
 
-if CONFIG['MOZ_SYSTEM_ICU']:
-    OS_LIBS += CONFIG['MOZ_ICU_LIBS']
+DIRS += [
+    'common',
+    'data',
+    'i18n',
+]
+
+if CONFIG['MOZ_ICU_DATA_ARCHIVE']:
+    DIRS += ['stubdata']
+    USE_LIBS += ['icustubdata']
 else:
-    DIRS += [
-        'common',
-        'data',
-        'i18n',
-    ]
-    if CONFIG['MOZ_ICU_DATA_ARCHIVE']:
-        DIRS += ['stubdata']
-        USE_LIBS += ['icustubdata']
-    else:
-        USE_LIBS += ['icudata']
+    USE_LIBS += ['icudata']
diff --git a/config/moz.build b/config/moz.build
index 7bcac7992..c512bd07d 100644
--- a/config/moz.build
+++ b/config/moz.build
@@ -29,9 +29,6 @@ if CONFIG['HOST_OS_ARCH'] != 'WINNT':
     # while the program here is in C.
     HostProgram('nsinstall_real', c_only=True)
 
-if CONFIG['MOZ_SYSTEM_ICU']:
-    DEFINES['MOZ_SYSTEM_ICU'] = True
-
 PYTHON_UNIT_TESTS += [
     'tests/test_mozbuild_reading.py',
     'tests/unit-expandlibs.py',
diff --git a/config/system-headers b/config/system-headers
index 29eef3210..a2d3b813d 100644
--- a/config/system-headers
+++ b/config/system-headers
@@ -1312,22 +1312,6 @@ kvm.h
 spawn.h
 err.h
 xlocale.h
-#ifdef MOZ_SYSTEM_ICU
-unicode/locid.h
-unicode/numsys.h
-unicode/timezone.h
-unicode/ucal.h
-unicode/uchar.h
-unicode/uclean.h
-unicode/ucol.h
-unicode/udat.h
-unicode/udatpg.h
-unicode/uenum.h
-unicode/unorm.h
-unicode/unum.h
-unicode/ustring.h
-unicode/utypes.h
-#endif
 libutil.h
 unwind.h
 fenv.h
-- 
cgit v1.2.3