2010-03-15 09:41:42 +00:00
|
|
|
From: Peter Lemenkov <lemenkov@gmail.com>
|
|
|
|
|
Date: Thu, 25 Feb 2010 16:57:43 +0300
|
2011-01-31 15:27:55 +00:00
|
|
|
Subject: [PATCH] Remove rpath
|
2010-03-15 09:41:42 +00:00
|
|
|
|
|
|
|
|
Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
|
|
|
|
|
|
|
|
|
|
diff --git a/lib/crypto/c_src/Makefile.in b/lib/crypto/c_src/Makefile.in
|
2014-08-27 13:38:36 +00:00
|
|
|
index 8c92b5b..5b36c19 100644
|
2010-03-15 09:41:42 +00:00
|
|
|
--- a/lib/crypto/c_src/Makefile.in
|
|
|
|
|
+++ b/lib/crypto/c_src/Makefile.in
|
2014-08-27 13:38:36 +00:00
|
|
|
@@ -89,7 +89,7 @@ endif
|
2010-03-15 09:41:42 +00:00
|
|
|
DYNAMIC_CRYPTO_LIB=@SSL_DYNAMIC_ONLY@
|
|
|
|
|
|
|
|
|
|
ifeq ($(DYNAMIC_CRYPTO_LIB),yes)
|
|
|
|
|
-SSL_DED_LD_RUNTIME_LIBRARY_PATH = @SSL_DED_LD_RUNTIME_LIBRARY_PATH@
|
|
|
|
|
+SSL_DED_LD_RUNTIME_LIBRARY_PATH =
|
2012-09-10 13:47:14 +00:00
|
|
|
CRYPTO_LINK_LIB=$(SSL_DED_LD_RUNTIME_LIBRARY_PATH) -L$(SSL_LIBDIR) -l$(SSL_CRYPTO_LIBNAME)
|
2013-02-04 08:22:32 +00:00
|
|
|
EXTRA_FLAGS = -DHAVE_DYNAMIC_CRYPTO_LIB
|
2010-03-15 09:41:42 +00:00
|
|
|
else
|
|
|
|
|
diff --git a/lib/crypto/priv/Makefile b/lib/crypto/priv/Makefile
|
2010-06-23 07:42:20 +00:00
|
|
|
index 0989f14..0d29444 100644
|
2010-03-15 09:41:42 +00:00
|
|
|
--- a/lib/crypto/priv/Makefile
|
|
|
|
|
+++ b/lib/crypto/priv/Makefile
|
2010-06-23 07:42:20 +00:00
|
|
|
@@ -60,7 +60,7 @@ OBJS = $(OBJDIR)/crypto.o
|
2010-03-15 09:41:42 +00:00
|
|
|
# ----------------------------------------------------
|
|
|
|
|
|
2010-06-23 07:42:20 +00:00
|
|
|
$(SO_NIFLIB): $(OBJS)
|
2010-03-15 09:41:42 +00:00
|
|
|
- $(SO_LD) $(SO_LDFLAGS) -L$(SO_SSL_LIBDIR) -Wl,-R$(SO_SSL_LIBDIR) \
|
|
|
|
|
+ $(SO_LD) $(SO_LDFLAGS) -L$(SO_SSL_LIBDIR) \
|
|
|
|
|
-o $@ $^ -lcrypto
|
|
|
|
|
|
2010-06-23 07:42:20 +00:00
|
|
|
$(DLL_NIFLIB): $(OBJS)
|
