mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-04 06:15:24 +00:00
Code Issues Releases Activity

Remove hardcoded RPATH from Erlang's crypto libraries.

Browse Source 
Pkg always wants to install compat10x-amd64 when using the port's default RPATH.

The same fix can be found in Suse, and in Erlang packages from RabbitMQ.

Noticed by:	lwhsu, bapt
This commit is contained in:
Jimmy Olgeni 2016-05-07 09:02:08 +00:00
parent 9c815e90a3
commit 94e759fdb5
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=414767
12 changed files with 92 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lang/erlang-runtime16/Makefile
View File

@ -3,7 +3,7 @@
PORTNAME= erlang
PORTVERSION= 16.b.03.1
PORTREVISION= 6
PORTREVISION= 7
CATEGORIES= lang parallel java
MASTER_SITES= http://www.erlang.org/download/:erlangorg \
http://erlang.stacken.kth.se/download/:erlangorg \

11
lang/erlang-runtime16/patch-lib_crypto_c__src_Makefile.in Normal file
View File

@ -0,0 +1,11 @@
--- lib/crypto/c_src/Makefile.in.orig 2016-03-14 20:11:15 UTC
+++ lib/crypto/c_src/Makefile.in
@@ -90,7 +90,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) -l$(SSL_CRYPTO_LIBNAME)
EXTRA_FLAGS = -DHAVE_DYNAMIC_CRYPTO_LIB
else

11
lang/erlang-runtime16/patch-lib_crypto_priv_Makefile Normal file
View File

@ -0,0 +1,11 @@
--- lib/crypto/priv/Makefile.orig 2016-03-14 20:11:15 UTC
+++ lib/crypto/priv/Makefile
@@ -61,7 +61,7 @@ OBJS = $(OBJDIR)/crypto.o
# ----------------------------------------------------
$(SO_NIFLIB): $(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_NIFLIB): $(OBJS)

1
lang/erlang-runtime17/Makefile
View File

@ -3,6 +3,7 @@
PORTNAME= erlang
PORTVERSION= 17.5.6.9
PORTREVISION= 1
CATEGORIES= lang parallel java
MASTER_SITES= http://www.erlang.org/download/:erlangorg \
http://erlang.stacken.kth.se/download/:erlangorg \

11
lang/erlang-runtime17/patch-lib_crypto_c__src_Makefile.in Normal file
View File

@ -0,0 +1,11 @@
--- lib/crypto/c_src/Makefile.in.orig 2016-03-14 20:11:15 UTC
+++ lib/crypto/c_src/Makefile.in
@@ -90,7 +90,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) -l$(SSL_CRYPTO_LIBNAME)
EXTRA_FLAGS = -DHAVE_DYNAMIC_CRYPTO_LIB
else

11
lang/erlang-runtime17/patch-lib_crypto_priv_Makefile Normal file
View File

@ -0,0 +1,11 @@
--- lib/crypto/priv/Makefile.orig 2016-03-14 20:11:15 UTC
+++ lib/crypto/priv/Makefile
@@ -61,7 +61,7 @@ OBJS = $(OBJDIR)/crypto.o
# ----------------------------------------------------
$(SO_NIFLIB): $(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_NIFLIB): $(OBJS)

1
lang/erlang-runtime18/Makefile
View File

@ -3,6 +3,7 @@
PORTNAME= erlang
PORTVERSION= 18.3.3
PORTREVISION= 1
CATEGORIES= lang parallel java
MASTER_SITES= http://www.erlang.org/download/:erlangorg \
http://erlang.stacken.kth.se/download/:erlangorg \

11
lang/erlang-runtime18/patch-lib_crypto_c__src_Makefile.in Normal file
View File

@ -0,0 +1,11 @@
--- lib/crypto/c_src/Makefile.in.orig 2016-03-14 20:11:15 UTC
+++ lib/crypto/c_src/Makefile.in
@@ -90,7 +90,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) -l$(SSL_CRYPTO_LIBNAME)
EXTRA_FLAGS = -DHAVE_DYNAMIC_CRYPTO_LIB
else

11
lang/erlang-runtime18/patch-lib_crypto_priv_Makefile Normal file
View File

@ -0,0 +1,11 @@
--- lib/crypto/priv/Makefile.orig 2016-03-14 20:11:15 UTC
+++ lib/crypto/priv/Makefile
@@ -61,7 +61,7 @@ OBJS = $(OBJDIR)/crypto.o
# ----------------------------------------------------
$(SO_NIFLIB): $(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_NIFLIB): $(OBJS)

1
lang/erlang/Makefile
View File

@ -3,6 +3,7 @@
PORTNAME= erlang
PORTVERSION= 18.3.3
PORTREVISION= 1
PORTEPOCH= 3
CATEGORIES= lang parallel java
MASTER_SITES= http://www.erlang.org/download/:erlangorg \

11
lang/erlang/files/patch-lib_crypto_c__src_Makefile.in Normal file
View File

@ -0,0 +1,11 @@
--- lib/crypto/c_src/Makefile.in.orig 2016-03-14 20:11:15 UTC
+++ lib/crypto/c_src/Makefile.in
@@ -90,7 +90,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) -l$(SSL_CRYPTO_LIBNAME)
EXTRA_FLAGS = -DHAVE_DYNAMIC_CRYPTO_LIB
else

11
lang/erlang/files/patch-lib_crypto_priv_Makefile Normal file
View File

@ -0,0 +1,11 @@
--- lib/crypto/priv/Makefile.orig 2016-03-14 20:11:15 UTC
+++ lib/crypto/priv/Makefile
@@ -61,7 +61,7 @@ OBJS = $(OBJDIR)/crypto.o
# ----------------------------------------------------
$(SO_NIFLIB): $(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_NIFLIB): $(OBJS)