From 2e10f728feb56ea96b2832999a8c34f1f19646bc Mon Sep 17 00:00:00 2001

From: Peter Lemenkov <lemenkov@gmail.com>

Date: Thu, 25 Feb 2010 16:57:43 +0300

Subject: [PATCH 2/2] Remove rpath

Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>

---

 lib/crypto/c_src/Makefile.in |    2 +-

 lib/crypto/priv/Makefile     |    2 +-

 lib/ssl/c_src/Makefile.in    |    6 +++---

 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/lib/crypto/c_src/Makefile.in b/lib/crypto/c_src/Makefile.in

index 18040a3..b169930 100644

--- a/lib/crypto/c_src/Makefile.in

+++ b/lib/crypto/c_src/Makefile.in

@@ -83,7 +83,7 @@ endif

 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 =

 CRYPTO_LINK_LIB=$(SSL_DED_LD_RUNTIME_LIBRARY_PATH) -L$(SSL_LIBDIR) -lcrypto

 else

 SSL_DED_LD_RUNTIME_LIBRARY_PATH=

diff --git a/lib/crypto/priv/Makefile b/lib/crypto/priv/Makefile

index b8acdac..2c2989a 100644

--- a/lib/crypto/priv/Makefile

+++ b/lib/crypto/priv/Makefile

@@ -60,7 +60,7 @@ OBJS = $(OBJDIR)/crypto_drv.o

 # ----------------------------------------------------

 $(SO_DRIVER): $(OBJS)

-	$(SO_LD) $(SO_LDFLAGS) -L$(SO_SSL_LIBDIR) -Wl,-R$(SO_SSL_LIBDIR) \

+	$(SO_LD) $(SO_LDFLAGS) -L$(SO_SSL_LIBDIR) \

 	-o $@ $^ -lcrypto

 $(DLL_DRIVER): $(OBJS)

diff --git a/lib/ssl/c_src/Makefile.in b/lib/ssl/c_src/Makefile.in

index 49a209f..5e6c74e 100644

--- a/lib/ssl/c_src/Makefile.in

+++ b/lib/ssl/c_src/Makefile.in

@@ -105,7 +105,7 @@ else

 SSL_MAKEFILE =

 endif

-CC_R_FLAG=@CFLAG_RUNTIME_LIBRARY_PATH@

+CC_R_FLAG=

 ifeq ($(findstring @,$(CC_R_FLAG)),@)

 # Old erts configure used which hasn't replaced @CFLAG_RUNTIME_LIBRARY_PATH@;

@@ -117,7 +117,7 @@ else

 ifeq ($(findstring osf,$(TARGET)),osf)		# osf1: -Wl,-rpath,

 CC_R_FLAG = -Wl,-rpath,

 else						# Default: -Wl,-R

-CC_R_FLAG = -Wl,-R

+CC_R_FLAG =

 endif

 endif

 endif

@@ -125,7 +125,7 @@ endif

 ifeq ($(strip $(CC_R_FLAG)),)

 CC_R_OPT =

 else

-CC_R_OPT = $(CC_R_FLAG)$(SSL_LIBDIR)

+CC_R_OPT =

 endif

 SSL_CC_RUNTIME_LIBRARY_PATH=@SSL_CC_RUNTIME_LIBRARY_PATH@

-- 

1.6.2.5