File 0188-crypto-Remove-installed-priv-obj-directory... of Package erlang

Overview Repositories Revisions Requests Users Attributes Meta

File 0188-crypto-Remove-installed-priv-obj-directory-and-all-i.patch of Package erlang (Revision fab5cf9be99874816e9cecc0e0f8d85e)

Currently displaying revision fab5cf9be99874816e9cecc0e0f8d85e , Show latest

From 5806ccacce796c888857e423193ae2b214bfcbb6 Mon Sep 17 00:00:00 2001
From: Sverker Eriksson <sverker@erlang.org>
Date: Wed, 4 Nov 2020 18:10:27 +0100
Subject: [PATCH] crypto: Remove installed priv/obj directory and all its files

This is a residue from the time of binary only releases,
now just consuming disk space.
---
 lib/crypto/c_src/Makefile.in |  6 ---
 lib/crypto/priv/Makefile     | 79 ------------------------------------
 2 files changed, 85 deletions(-)
 delete mode 100644 lib/crypto/priv/Makefile

diff --git a/lib/crypto/c_src/Makefile.in b/lib/crypto/c_src/Makefile.in
index 786fbc1031..71f6f5bf0f 100644
--- a/lib/crypto/c_src/Makefile.in
+++ b/lib/crypto/c_src/Makefile.in
@@ -100,7 +100,6 @@ CRYPTO_OBJS = $(OBJDIR)/crypto$(TYPEMARKER).o \
 	$(OBJDIR)/rsa$(TYPEMARKER).o \
 	$(OBJDIR)/srp$(TYPEMARKER).o
 CALLBACK_OBJS = $(OBJDIR)/crypto_callback$(TYPEMARKER).o
-NIF_MAKEFILE = $(PRIVDIR)/Makefile
 CRYPTO_STATIC_OBJS = $(patsubst $(OBJDIR)/%$(TYPEMARKER).o,$(OBJDIR)/%_static$(TYPEMARKER).o,$(CRYPTO_OBJS) $(CALLBACK_OBJS))
 
 NIF_ARCHIVE = $(LIBDIR)/crypto$(TYPEMARKER).a
@@ -225,16 +224,11 @@ docs:
 include $(ERL_TOP)/make/otp_release_targets.mk
 
 release_spec: opt
-	$(INSTALL_DIR) "$(RELSYSDIR)/priv/obj"
 	$(INSTALL_DIR) "$(RELSYSDIR)/priv/lib"
-	$(INSTALL_DATA) $(NIF_MAKEFILE) "$(RELSYSDIR)/priv/obj"
-	$(INSTALL_PROGRAM) $(CRYPTO_OBJS) "$(RELSYSDIR)/priv/obj"
 	$(INSTALL_PROGRAM) $(NIF_LIB) "$(RELSYSDIR)/priv/lib"
 ifeq ($(DYNAMIC_CRYPTO_LIB),yes)
-	$(INSTALL_PROGRAM) $(CALLBACK_OBJS) "$(RELSYSDIR)/priv/obj"
 	$(INSTALL_PROGRAM) $(CALLBACK_LIB) "$(RELSYSDIR)/priv/lib"
 endif
-	$(INSTALL_PROGRAM) $(TEST_ENGINE_OBJS) "$(RELSYSDIR)/priv/obj"
 	$(INSTALL_PROGRAM) $(TEST_ENGINE_LIB) "$(RELSYSDIR)/priv/lib"
 
 release_docs_spec:
diff --git a/lib/crypto/priv/Makefile b/lib/crypto/priv/Makefile
deleted file mode 100644
index ff9d3e1dc9..0000000000
--- a/lib/crypto/priv/Makefile
+++ /dev/null
@@ -1,79 +0,0 @@
-# ``Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# 
-# The Initial Developer of the Original Code is Ericsson Utvecklings AB.
-# Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
-# AB. All Rights Reserved.''
-# 
-#     $Id$
-#
-
-# ----------------------------------------------------
-#        THIS MAKEFILE SERVES AS AN EXAMPLE OF
-#        HOW TO RELINK THE CRYPTO NIF LIBRARY
-# ----------------------------------------------------
-
-# ----------------------------------------------------
-# Variables for linking a .so library on unix.
-# Note: These may differ between systems.
-# ----------------------------------------------------
-
-SO_LD = gcc
-SO_LDFLAGS = -G 
-SO_SSL_LIBDIR = /usr/local/lib
-SO_NIFLIB = $(LIBDIR)/$(LIB_NAME).so
-
-# ----------------------------------------------------
-# Variables for linking a win32 .dll library.
-# Note: These may differ between systems.
-# ----------------------------------------------------
-
-DLL_LD = link.exe
-DLL_LDFLAGS = -release -nologo -incremental:no -dll
-DLL_LIBDIR = "c:\\OpenSSL\\lib\\VC"
-DLL_LIBS = libeay32.lib MSVCRT.LIB kernel32.lib \
-	   advapi32.lib gdi32.lib user32.lib \
-	   comctl32.lib comdlg32.lib shell32.lib
-DLL_NIFLIB = $(LIBDIR)/$(LIB_NAME).dll
-DLL_EXP = $(LIBDIR)/$(LIB_NAME).exp
-DLL_LIB = $(LIBDIR)/$(LIB_NAME).lib
-
-# ----------------------------------------------------
-# Common variables
-# ----------------------------------------------------
-
-OBJDIR = ./
-LIBDIR = ../lib
-LIB_NAME = crypto
-OBJS = $(OBJDIR)/crypto.o
-
-# ----------------------------------------------------
-# Targets
-# ----------------------------------------------------
-
-$(SO_NIFLIB): $(OBJS)
-	$(SO_LD) $(SO_LDFLAGS) -L$(SO_SSL_LIBDIR) -Wl,-R$(SO_SSL_LIBDIR) \
-	-o $@ $^ -lcrypto
-
-$(DLL_NIFLIB): $(OBJS)
-	$(DLL_LD) $(DLL_LDFLAGS) -out:$@ -libpath:$(DLL_LIBDIR) $(OBJS) \
-	$(DLL_LIBS)
-
-so:	$(SO_NIFLIB)
-
-dll:	$(DLL_NIFLIB)
-
-clean:
-	rm -f $(SO_NIFLIB) $(DLL_NIFLIB) 
-	rm -f $(DLL_EXP) $(DLL_LIB)
-	rm -f core *~
-
-- 
2.26.2

Places

File 0188-crypto-Remove-installed-priv-obj-directory-and-all-i.patch of Package erlang (Revision fab5cf9be99874816e9cecc0e0f8d85e)

Places