Bug 1883720 - (re)Move checks for socket, gethostbyname_r and demangle to moz.configure r=glandium

Actually remove the check for demangle, no supported target need that
check.

Also make library dependencies explicit instead of relying on "$LIBS".

Differential Revision: https://phabricator.services.mozilla.com/D203637

build/moz.configure/libraries.configure

@@ -71,3 +71,17 @@ with only_when(building_with_gnu_cc):
         set_config(
             "DL_LIBS", ["-ldl"], when=depends(dlopen_check)(lambda check: check.lib)
         )
+
+
+set_config(
+    "C_R_LIBS",
+    ["-lc_r"],
+    when=check_symbol_in_lib(
+        "c_r", symbol="gethostbyname_r", when=building_with_gnu_cc
+    ),
+)
+set_config(
+    "SOCKET_LIBS",
+    ["-lsocket"],
+    when=check_symbol_in_lib("socket", symbol="socket", when=building_with_gnu_cc),
+)

config/external/nspr/pr/moz.build

@@ -15,6 +15,12 @@ AllowCompilerWarnings()
 
 OS_LIBS += CONFIG["DL_LIBS"]
 
+# for gethostbyname_r
+OS_LIBS += CONFIG["C_R_LIBS"]
+
+# for socket
+OS_LIBS += CONFIG["SOCKET_LIBS"]
+
 DEFINES["_NSPR_BUILD_"] = True
 if CONFIG["OS_ARCH"] == "Linux":
     OS_LIBS += CONFIG["REALTIME_LIBS"]

dom/media/webrtc/transport/test/moz.build

@@ -6,6 +6,9 @@
 
 include("/ipc/chromium/chromium-config.mozbuild")
 
+# for socket
+OS_LIBS += CONFIG["SOCKET_LIBS"]
+
 if CONFIG["OS_TARGET"] != "WINNT":
     SOURCES += [
         "buffered_stun_socket_unittest.cpp",

ipc/chromium/src/third_party/moz.build

@@ -13,6 +13,12 @@ if CONFIG["TARGET_KERNEL"] == "WINNT":
 if CONFIG['MOZ_SYSTEM_LIBEVENT']:
     error('should not reach here if we are using a native libevent')
 
+# for gethostbyname_r
+OS_LIBS += CONFIG["C_R_LIBS"]
+
+# for socket
+OS_LIBS += CONFIG["SOCKET_LIBS"]
+
 UNIFIED_SOURCES += [
     'libevent/buffer.c',
     'libevent/bufferevent.c',

js/src/old-configure.in

@@ -442,15 +442,6 @@ AC_LANG_CPLUSPLUS
 
 MOZ_CXX11
 
-dnl Checks for libraries.
-dnl ========================================================
-AC_CHECK_LIB(c_r, gethostbyname_r)
-
-if test ! "$GNU_CXX"; then
-    AC_CHECK_LIB(C, demangle)
-fi
-
-AC_CHECK_LIB(socket, socket)
 
 dnl ========================================================
 dnl = pthread support

netwerk/sctp/src/moz.build

@@ -8,6 +8,9 @@ EXPORTS.mozilla.net += [
     'usrsctp.h',
 ]
 
+# for socket
+OS_LIBS += CONFIG["SOCKET_LIBS"]
+
 UNIFIED_SOURCES += [
     'netinet/sctp_asconf.c',
     'netinet/sctp_auth.c',

netwerk/socket/moz.build

@@ -41,6 +41,9 @@ if CONFIG["MOZ_WIDGET_TOOLKIT"] == "windows":
     ]
     UNIFIED_SOURCES += ["nsNamedPipeIOLayer.cpp", "nsNamedPipeService.cpp"]
 
+# for socket
+OS_LIBS += CONFIG["SOCKET_LIBS"]
+
 FINAL_LIBRARY = "xul"
 
 CONFIGURE_SUBST_FILES += ["neqo/extra-bindgen-flags"]

netwerk/system/netlink/moz.build

@@ -9,4 +9,7 @@ if CONFIG["OS_ARCH"] == "Linux":
         "NetlinkService.cpp",
     ]
 
+# for socket
+OS_LIBS += CONFIG["SOCKET_LIBS"]
+
 FINAL_LIBRARY = "xul"

netwerk/wifi/moz.build

@@ -12,6 +12,9 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = "necko_wifi"
 
+# for socket
+OS_LIBS += CONFIG["SOCKET_LIBS"]
+
 UNIFIED_SOURCES += [
     "nsWifiAccessPoint.cpp",
     "nsWifiMonitor.cpp",

old-configure.in

@@ -459,15 +459,6 @@ MOZ_CXX11
 
 AC_LANG_C
 
-dnl Checks for libraries.
-dnl ========================================================
-AC_CHECK_LIB(c_r, gethostbyname_r)
-
-if test ! "$GNU_CXX"; then
-    AC_CHECK_LIB(C, demangle)
-fi
-
-AC_CHECK_LIB(socket, socket)
 
 dnl ========================================================
 dnl = pthread support