|
 |
9cd9552 |
From: Peter Lemenkov <lemenkov@gmail.com>
|
|
|
9cd9552 |
Date: Thu, 25 Feb 2010 16:57:43 +0300
|
|
Hans Ulrich Niedermann |
696873c |
Subject: [PATCH] Remove rpath
|
|
|
9cd9552 |
|
|
|
9cd9552 |
Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
|
|
|
9cd9552 |
---
|
|
|
9cd9552 |
lib/crypto/c_src/Makefile.in | 2 +-
|
|
|
9cd9552 |
lib/crypto/priv/Makefile | 2 +-
|
|
|
9cd9552 |
lib/ssl/c_src/Makefile.in | 6 +++---
|
|
|
9cd9552 |
3 files changed, 5 insertions(+), 5 deletions(-)
|
|
|
9cd9552 |
|
|
|
9cd9552 |
diff --git a/lib/crypto/c_src/Makefile.in b/lib/crypto/c_src/Makefile.in
|
|
|
64bbd25 |
index c2a986c..48ba130 100644
|
|
|
9cd9552 |
--- a/lib/crypto/c_src/Makefile.in
|
|
|
9cd9552 |
+++ b/lib/crypto/c_src/Makefile.in
|
|
|
64bbd25 |
@@ -84,7 +84,7 @@ endif
|
|
|
9cd9552 |
DYNAMIC_CRYPTO_LIB=@SSL_DYNAMIC_ONLY@
|
|
|
9cd9552 |
|
|
|
9cd9552 |
ifeq ($(DYNAMIC_CRYPTO_LIB),yes)
|
|
|
9cd9552 |
-SSL_DED_LD_RUNTIME_LIBRARY_PATH = @SSL_DED_LD_RUNTIME_LIBRARY_PATH@
|
|
|
9cd9552 |
+SSL_DED_LD_RUNTIME_LIBRARY_PATH =
|
|
|
64bbd25 |
CRYPTO_LINK_LIB=$(SSL_DED_LD_RUNTIME_LIBRARY_PATH) -L$(SSL_LIBDIR) -l$(SSL_CRYPTO_LIBNAME) -l$(SSL_SSL_LIBNAME)
|
|
|
9cd9552 |
else
|
|
|
9cd9552 |
SSL_DED_LD_RUNTIME_LIBRARY_PATH=
|
|
|
9cd9552 |
diff --git a/lib/crypto/priv/Makefile b/lib/crypto/priv/Makefile
|
|
|
96952bd |
index 0989f14..0d29444 100644
|
|
|
9cd9552 |
--- a/lib/crypto/priv/Makefile
|
|
|
9cd9552 |
+++ b/lib/crypto/priv/Makefile
|
|
|
96952bd |
@@ -60,7 +60,7 @@ OBJS = $(OBJDIR)/crypto.o
|
|
|
9cd9552 |
# ----------------------------------------------------
|
|
|
9cd9552 |
|
|
|
96952bd |
$(SO_NIFLIB): $(OBJS)
|
|
|
9cd9552 |
- $(SO_LD) $(SO_LDFLAGS) -L$(SO_SSL_LIBDIR) -Wl,-R$(SO_SSL_LIBDIR) \
|
|
|
9cd9552 |
+ $(SO_LD) $(SO_LDFLAGS) -L$(SO_SSL_LIBDIR) \
|
|
|
9cd9552 |
-o $@ $^ -lcrypto
|
|
|
9cd9552 |
|
|
|
96952bd |
$(DLL_NIFLIB): $(OBJS)
|
|
|
9cd9552 |
diff --git a/lib/ssl/c_src/Makefile.in b/lib/ssl/c_src/Makefile.in
|
|
|
ebf67f0 |
index 6e413e7..cf2d267 100644
|
|
|
9cd9552 |
--- a/lib/ssl/c_src/Makefile.in
|
|
|
9cd9552 |
+++ b/lib/ssl/c_src/Makefile.in
|
|
|
ebf67f0 |
@@ -107,7 +107,7 @@ else
|
|
|
9cd9552 |
SSL_MAKEFILE =
|
|
|
9cd9552 |
endif
|
|
|
9cd9552 |
|
|
|
9cd9552 |
-CC_R_FLAG=@CFLAG_RUNTIME_LIBRARY_PATH@
|
|
|
9cd9552 |
+CC_R_FLAG=
|
|
|
9cd9552 |
|
|
|
9cd9552 |
ifeq ($(findstring @,$(CC_R_FLAG)),@)
|
|
|
9cd9552 |
# Old erts configure used which hasn't replaced @CFLAG_RUNTIME_LIBRARY_PATH@;
|
|
|
ebf67f0 |
@@ -119,7 +119,7 @@ else
|
|
|
9cd9552 |
ifeq ($(findstring osf,$(TARGET)),osf) # osf1: -Wl,-rpath,
|
|
|
9cd9552 |
CC_R_FLAG = -Wl,-rpath,
|
|
|
9cd9552 |
else # Default: -Wl,-R
|
|
|
9cd9552 |
-CC_R_FLAG = -Wl,-R
|
|
|
9cd9552 |
+CC_R_FLAG =
|
|
|
9cd9552 |
endif
|
|
|
9cd9552 |
endif
|
|
|
9cd9552 |
endif
|
|
|
ebf67f0 |
@@ -127,7 +127,7 @@ endif
|
|
|
9cd9552 |
ifeq ($(strip $(CC_R_FLAG)),)
|
|
|
9cd9552 |
CC_R_OPT =
|
|
|
9cd9552 |
else
|
|
|
9cd9552 |
-CC_R_OPT = $(CC_R_FLAG)$(SSL_LIBDIR)
|
|
|
9cd9552 |
+CC_R_OPT =
|
|
|
9cd9552 |
endif
|
|
|
9cd9552 |
|
|
|
9cd9552 |
SSL_CC_RUNTIME_LIBRARY_PATH=@SSL_CC_RUNTIME_LIBRARY_PATH@
|