Fix symbol errors with zlib-ng (part 1.1 in generic arch build)

js/src/moz.build

@@ -669,9 +669,17 @@ else:
 
 USE_LIBS += [
     'nspr',
-    'zlib',
 ]
 
+if CONFIG['ZLIB_IN_MOZGLUE']:
+    USE_LIBS += [
+        'mozglue',
+    ]
+else:
+    USE_LIBS += [
+        'zlib',
+    ]
+
 
 if CONFIG['_MSC_VER']:
     if CONFIG['CPU_ARCH'] == 'x86':

modules/zlib/src/moz.build

@@ -55,6 +55,4 @@ SOURCES += [
     'trees.c',
     'uncompr.c',
     'zutil.c',
-]
+]
-
-

mozglue/build/mozglue.def.in

@@ -41,4 +41,87 @@ EXPORTS
 #endif
   ; A hack to work around the CRT (see giant comment in Makefile.in)
   frex=dumb_free_thunk
+
+#ifdef ZLIB_IN_MOZGLUE
+  ; zlib symbols
+  MOZ_Z_zlibVersion
+  MOZ_Z_deflate
+  MOZ_Z_deflateEnd
+  MOZ_Z_inflate
+  MOZ_Z_inflateEnd
+  MOZ_Z_deflateSetDictionary
+  MOZ_Z_deflateCopy
+  MOZ_Z_deflateReset
+  MOZ_Z_deflateParams
+  MOZ_Z_deflateTune
+  MOZ_Z_deflateBound
+  MOZ_Z_deflatePending
+  MOZ_Z_deflatePrime
+  MOZ_Z_deflateSetHeader
+  MOZ_Z_inflateGetDictionary
+  MOZ_Z_inflateSetDictionary
+  MOZ_Z_inflateSync
+  MOZ_Z_inflateCopy
+  MOZ_Z_inflateReset
+  MOZ_Z_inflateReset2
+  MOZ_Z_inflatePrime
+  MOZ_Z_inflateMark
+  MOZ_Z_inflateGetHeader
+  MOZ_Z_inflateBack
+  MOZ_Z_inflateBackEnd
+  MOZ_Z_zlibCompileFlags
+  MOZ_Z_compress
+  MOZ_Z_compress2
+  MOZ_Z_compressBound
+  MOZ_Z_uncompress
+  MOZ_Z_gzopen
+  MOZ_Z_gzdopen
+  MOZ_Z_gzbuffer
+  MOZ_Z_gzsetparams
+  MOZ_Z_gzread
+  MOZ_Z_gzwrite
+  MOZ_Z_gzprintf
+  MOZ_Z_gzvprintf
+  MOZ_Z_gzputs
+  MOZ_Z_gzgets
+  MOZ_Z_gzputc
+  MOZ_Z_gzgetc=gzgetc
+  MOZ_Z_gzungetc
+  MOZ_Z_gzflush
+  MOZ_Z_gzseek
+  MOZ_Z_gzrewind
+  MOZ_Z_gztell
+  MOZ_Z_gzoffset
+  MOZ_Z_gzeof
+  MOZ_Z_gzdirect
+  MOZ_Z_gzclose
+  MOZ_Z_gzclose_r
+  MOZ_Z_gzclose_w
+  MOZ_Z_gzerror
+  MOZ_Z_gzclearerr
+  MOZ_Z_gzopen64
+  MOZ_Z_gzseek64
+  MOZ_Z_gztell64
+  MOZ_Z_gzoffset64
+  MOZ_Z_adler32_combine64
+  MOZ_Z_crc32_combine64
+  MOZ_Z_adler32
+  MOZ_Z_crc32
+  MOZ_Z_adler32_combine
+  MOZ_Z_crc32_combine
+  MOZ_Z_deflateInit_
+  MOZ_Z_deflateInit2_
+  MOZ_Z_inflateInit_
+  MOZ_Z_inflateInit2_
+  MOZ_Z_inflateBackInit_
+  MOZ_Z_zError
+  MOZ_Z_inflateSyncPoint
+  MOZ_Z_get_crc_table
+  MOZ_Z_inflateUndermine
+  MOZ_Z_inflateResetKeep
+  MOZ_Z_deflateResetKeep
+  MOZ_Z_gzgetc_
+  MOZ_Z_gzopen_w
+  inflateValidate
+#endif
 #endif