File 0162-ssl-Fix-sed-of-ssl-ssh-deps-file.patch of Package erlang

Overview Repositories Revisions Requests Users Attributes Meta

File 0162-ssl-Fix-sed-of-ssl-ssh-deps-file.patch of Package erlang (Revision fe162c0c563b11430d77cc39dc990d22)

Currently displaying revision fe162c0c563b11430d77cc39dc990d22 , Show latest

From 81dc511ebf76b133b2b29301c22515a1687bab8a Mon Sep 17 00:00:00 2001
From: Lukas Larsson <lukas@erlang.org>
Date: Mon, 3 Jan 2022 15:00:49 +0100
Subject: [PATCH] ssl: Fix sed of ssl/ssh deps file

Closes #5548
---
 lib/ssh/src/Makefile | 2 +-
 lib/ssl/src/Makefile | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/ssh/src/Makefile b/lib/ssh/src/Makefile
index 88126f6289..f5ed6d78c3 100644
--- a/lib/ssh/src/Makefile
+++ b/lib/ssh/src/Makefile
@@ -152,7 +152,7 @@ $(BEHAVIOUR_TARGET_FILES_2): $(BEHAVIOUR_TARGET_FILES_1)
 $(DEP_FILE): $(ERL_FILES)
 	@echo SED $(TARGET) $(ERL_TOP_NATIVE)
 	$(gen_verbose)erlc -M $(ERL_FILES) \
-	| sed "s@[a-zA-Z]\?$(ERL_TOP_NATIVE)@../../..@g" \
+	| perl -pe "s@ [a-zA-Z]?$(ERL_TOP_NATIVE)/(?:bootstrap/)?lib/([^/]+)@ ../../\1@g" 2> /dev/null \
 	| sed "s/\.$(EMULATOR)/\.$$$EMULATOR$/" \
 	| sed 's@^ssh_@$$(EBIN)/ssh_@' \
 	| sed 's@^sshc_@$$(EBIN)/sshc_@' \
diff --git a/lib/ssl/src/Makefile b/lib/ssl/src/Makefile
index c8d0d6f12f..2d28320ad0 100644
--- a/lib/ssl/src/Makefile
+++ b/lib/ssl/src/Makefile
@@ -182,7 +182,7 @@ $(TARGET_FILES): $(BEHAVIOUR_TARGET_FILES)
 $(DEP_FILE): $(ERL_FILES)
 	@echo SED $(TARGET) $(ERL_TOP_NATIVE)
 	$(gen_verbose)erlc -M $(ERL_FILES) \
-	| sed "s@[a-zA-Z]\?$(ERL_TOP_NATIVE)/$bootstrap/$\?lib/$[^/]\+/$@../../\2@g" \
+	| perl -pe "s@ [a-zA-Z]?$(ERL_TOP_NATIVE)/(?:bootstrap/)?lib/([^/]+)@ ../../\1@g" 2> /dev/null \
 	| sed "s/\.$(EMULATOR)/\.$$$EMULATOR$/" \
 	| sed 's@^dtls_@$$(EBIN)/dtls_@' \
 	| sed 's@^inet_@$$(EBIN)/inet_@' \
-- 
2.31.1

Places

File 0162-ssl-Fix-sed-of-ssl-ssh-deps-file.patch of Package erlang (Revision fe162c0c563b11430d77cc39dc990d22)

Places