|
Peter Lemenkov |
9cd955 |
From: Peter Lemenkov <lemenkov@gmail.com>
|
|
Peter Lemenkov |
9cd955 |
Date: Thu, 25 Feb 2010 16:57:43 +0300
|
|
Hans Ulrich Niedermann |
696873 |
Subject: [PATCH] Remove rpath
|
|
Peter Lemenkov |
9cd955 |
|
|
Peter Lemenkov |
9cd955 |
Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
|
|
Peter Lemenkov |
9cd955 |
|
|
Peter Lemenkov |
9cd955 |
diff --git a/lib/crypto/c_src/Makefile.in b/lib/crypto/c_src/Makefile.in
|
|
|
68c6fc |
index d06dc95aa4..c9d5a7064a 100644
|
|
Peter Lemenkov |
9cd955 |
--- a/lib/crypto/c_src/Makefile.in
|
|
Peter Lemenkov |
9cd955 |
+++ b/lib/crypto/c_src/Makefile.in
|
|
|
68c6fc |
@@ -114,7 +114,7 @@ TEST_ENGINE_LIB = $(LIBDIR)/otp_test_engine$(TYPEMARKER).@DED_EXT@
|
|
Peter Lemenkov |
9cd955 |
DYNAMIC_CRYPTO_LIB=@SSL_DYNAMIC_ONLY@
|
|
Peter Lemenkov |
9cd955 |
|
|
Peter Lemenkov |
9cd955 |
ifeq ($(DYNAMIC_CRYPTO_LIB),yes)
|
|
Peter Lemenkov |
9cd955 |
-SSL_DED_LD_RUNTIME_LIBRARY_PATH = @SSL_DED_LD_RUNTIME_LIBRARY_PATH@
|
|
Peter Lemenkov |
9cd955 |
+SSL_DED_LD_RUNTIME_LIBRARY_PATH =
|
|
|
61833a |
CRYPTO_LINK_LIB=$(SSL_DED_LD_RUNTIME_LIBRARY_PATH) -L$(SSL_LIBDIR) -l$(SSL_CRYPTO_LIBNAME)
|
|
|
a6c182 |
EXTRA_FLAGS = -DHAVE_DYNAMIC_CRYPTO_LIB
|
|
Peter Lemenkov |
9cd955 |
else
|
|
Peter Lemenkov |
9cd955 |
diff --git a/lib/crypto/priv/Makefile b/lib/crypto/priv/Makefile
|
|
|
57b0bc |
index ff9d3e1dc9..d3aba77808 100644
|
|
Peter Lemenkov |
9cd955 |
--- a/lib/crypto/priv/Makefile
|
|
Peter Lemenkov |
9cd955 |
+++ b/lib/crypto/priv/Makefile
|
|
|
844843 |
@@ -61,7 +61,7 @@ OBJS = $(OBJDIR)/crypto.o
|
|
Peter Lemenkov |
9cd955 |
# ----------------------------------------------------
|
|
Peter Lemenkov |
9cd955 |
|
|
Peter Lemenkov |
96952b |
$(SO_NIFLIB): $(OBJS)
|
|
Peter Lemenkov |
9cd955 |
- $(SO_LD) $(SO_LDFLAGS) -L$(SO_SSL_LIBDIR) -Wl,-R$(SO_SSL_LIBDIR) \
|
|
Peter Lemenkov |
9cd955 |
+ $(SO_LD) $(SO_LDFLAGS) -L$(SO_SSL_LIBDIR) \
|
|
Peter Lemenkov |
9cd955 |
-o $@ $^ -lcrypto
|
|
Peter Lemenkov |
9cd955 |
|
|
Peter Lemenkov |
96952b |
$(DLL_NIFLIB): $(OBJS)
|