diff options
| author | olgeni <olgeni@FreeBSD.org> | 2016-05-07 17:02:08 +0800 |
|---|---|---|
| committer | olgeni <olgeni@FreeBSD.org> | 2016-05-07 17:02:08 +0800 |
| commit | 20398ec5b908311c5f35cd8bb30a00feb19913ae (patch) | |
| tree | ddc83d0fb4e42a33bd02b8e7fd10b22d1e6995d8 /lang/erlang-runtime16 | |
| parent | b04b267d026856fe3b6375a4690bc134e2835e40 (diff) | |
| download | freebsd-ports-gnome-20398ec5b908311c5f35cd8bb30a00feb19913ae.tar.gz freebsd-ports-gnome-20398ec5b908311c5f35cd8bb30a00feb19913ae.tar.zst freebsd-ports-gnome-20398ec5b908311c5f35cd8bb30a00feb19913ae.zip | |
Remove hardcoded RPATH from Erlang's crypto libraries.
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
Diffstat (limited to 'lang/erlang-runtime16')
| -rw-r--r-- | lang/erlang-runtime16/Makefile | 2 | ||||
| -rw-r--r-- | lang/erlang-runtime16/patch-lib_crypto_c__src_Makefile.in | 11 | ||||
| -rw-r--r-- | lang/erlang-runtime16/patch-lib_crypto_priv_Makefile | 11 |
3 files changed, 23 insertions, 1 deletions
diff --git a/lang/erlang-runtime16/Makefile b/lang/erlang-runtime16/Makefile index 8e8da6bda28e..2d89958eeec2 100644 --- a/lang/erlang-runtime16/Makefile +++ b/lang/erlang-runtime16/Makefile @@ -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 \ diff --git a/lang/erlang-runtime16/patch-lib_crypto_c__src_Makefile.in b/lang/erlang-runtime16/patch-lib_crypto_c__src_Makefile.in new file mode 100644 index 000000000000..65e1b759ad66 --- /dev/null +++ b/lang/erlang-runtime16/patch-lib_crypto_c__src_Makefile.in @@ -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 diff --git a/lang/erlang-runtime16/patch-lib_crypto_priv_Makefile b/lang/erlang-runtime16/patch-lib_crypto_priv_Makefile new file mode 100644 index 000000000000..26f2c38e360d --- /dev/null +++ b/lang/erlang-runtime16/patch-lib_crypto_priv_Makefile @@ -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) |