File 4704-Fix-deps-generation-on-Windows.patch of Package erlang
From 7261729a79396696270286d6d5cd5732a2f1ce1a Mon Sep 17 00:00:00 2001 From: Dan Gudmundsson <dgud@erlang.org> Date: Wed, 6 Nov 2019 08:38:39 +0100 Subject: [PATCH 4/6] Fix deps generation on Windows Did not work --- lib/ssl/src/Makefile | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/lib/ssl/src/Makefile b/lib/ssl/src/Makefile index 8dc76f2638..7ef7151ed2 100644 --- a/lib/ssl/src/Makefile +++ b/lib/ssl/src/Makefile @@ -135,6 +135,13 @@ DEPDIR=$(ERL_TOP)/lib/ssl/src/deps DEP_FILE=$(DEPDIR)/ssl.d $(shell mkdir -p $(dir $(DEP_FILE)) >/dev/null) +ifeq ($(TARGET), win32) + # Native path without C: ignore driveletter case + ERL_TOP_NATIVE = $(shell w32_path.sh -m $(ERL_TOP) | sed "s@[a-zA-Z]:@:@") +else + ERL_TOP_NATIVE = $(ERL_TOP) +endif + # ---------------------------------------------------- # FLAGS # ---------------------------------------------------- @@ -144,7 +151,6 @@ ERL_COMPILE_FLAGS += -I$(ERL_TOP)/lib/kernel/src \ -pz $(ERL_TOP)/lib/public_key/ebin \ $(EXTRA_ERLC_FLAGS) - # ---------------------------------------------------- # Targets # ---------------------------------------------------- @@ -152,8 +158,9 @@ ERL_COMPILE_FLAGS += -I$(ERL_TOP)/lib/kernel/src \ $(TARGET_FILES): $(BEHAVIOUR_TARGET_FILES) $(DEP_FILE): $(ERL_FILES) + @echo SED $(TARGET) $(ERL_TOP_NATIVE) $(gen_verbose)erlc -M $(ERL_FILES) \ - | sed "s@$(ERL_TOP)@../../..@g" \ + | sed "s@[a-zA-Z]\?$(ERL_TOP_NATIVE)@../../..@g" \ | sed "s/\.$(EMULATOR)/\.$$\(EMULATOR\)/" \ | sed 's@^dtls_@$$(EBIN)/dtls_@' \ | sed 's@^inet_@$$(EBIN)/inet_@' \ -- 2.16.4
