From f69742b7ed7fe843f6ca44179675b9d9bc63efdc Mon Sep 17 00:00:00 2001
From: Micael Karlberg <bmk@erlang.org>
Date: Thu, 7 Mar 2019 18:10:35 +0100
Subject: [socket] Socket module to be optional

The SASL file systools_make has a hardcoded list of the
preloaded modules (yuck). This now can handle that the
socket module has been disabled (this is temporary).

OTP-15658
---
 lib/sasl/src/Makefile          | 4 ++++
 lib/sasl/src/systools_make.erl | 9 ++++++++-
 2 files changed, 12 insertions(+), 1 deletion(-)

(limited to 'lib')

diff --git a/lib/sasl/src/Makefile b/lib/sasl/src/Makefile
index 7338bdf016..fd62588f5c 100644
--- a/lib/sasl/src/Makefile
+++ b/lib/sasl/src/Makefile
@@ -61,7 +61,11 @@ TARGET_FILES= $(MODULES:%=$(EBIN)/%.$(EMULATOR)) $(APP_TARGET) $(APPUP_TARGET)
 # ----------------------------------------------------
 # FLAGS
 # ----------------------------------------------------
+
 ERL_COMPILE_FLAGS += -I../../stdlib/include -Werror
+ifeq ($(USE_ESOCK), yes)
+ERL_COMPILE_FLAGS += -DUSE_ESOCK=true
+endif
 
 
 # ----------------------------------------------------
diff --git a/lib/sasl/src/systools_make.erl b/lib/sasl/src/systools_make.erl
index c2c91fd667..29395b3c82 100644
--- a/lib/sasl/src/systools_make.erl
+++ b/lib/sasl/src/systools_make.erl
@@ -45,6 +45,13 @@
 
 -compile({inline,[{badarg,2}]}).
 
+-ifdef(USE_ESOCK).
+-define(ESOCK_MODS, [socket]).
+-else.
+-define(ESOCK_MODS, []).
+-endif.
+
+
 %%-----------------------------------------------------------------
 %% Create a boot script from a release file.
 %% Options is a list of {path, Path} | silent | local
@@ -1566,7 +1573,7 @@ preloaded() ->
      erts_code_purger,erts_dirty_process_signal_handler,
      erts_internal,erts_literal_area_collector,
      init,net,persistent_term,prim_buffer,prim_eval,prim_file,
-     prim_inet,prim_zip,socket,zlib].
+     prim_inet,prim_zip] ++ ?ESOCK_MODS ++ [zlib].
 
 %%______________________________________________________________________
 %% Kernel processes; processes that are specially treated by the init
-- 
cgit v1.2.3


From b49f68d5d8a256a7a0847d939b2da8a4be6c728a Mon Sep 17 00:00:00 2001
From: Micael Karlberg <bmk@erlang.org>
Date: Tue, 2 Apr 2019 15:36:18 +0200
Subject: [net] Improvements (ahum) when --disable-esock

The net module uses socket, but when the system has
been built with --disable-esock, there is no socket...
---
 lib/sasl/src/systools_make.erl | 1 +
 1 file changed, 1 insertion(+)

(limited to 'lib')

diff --git a/lib/sasl/src/systools_make.erl b/lib/sasl/src/systools_make.erl
index 29395b3c82..b5a6b44f93 100644
--- a/lib/sasl/src/systools_make.erl
+++ b/lib/sasl/src/systools_make.erl
@@ -33,6 +33,7 @@
 -export([read_application/4]).
 
 -export([make_hybrid_boot/4]).
+-export([preloaded/0]). % Exported just for testing
 
 -import(lists, [filter/2, keysort/2, keysearch/3, map/2, reverse/1,
 		append/1, foldl/3,  member/2, foreach/2]).
-- 
cgit v1.2.3