Date: Sat, 7 May 2016 09:02:08 +0000 (UTC) From: Jimmy Olgeni <olgeni@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r414767 - in head/lang: erlang erlang-runtime16 erlang-runtime17 erlang-runtime18 erlang/files Message-ID: <201605070902.u47928pC032901@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: olgeni Date: Sat May 7 09:02:08 2016 New Revision: 414767 URL: https://svnweb.freebsd.org/changeset/ports/414767 Log: 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 Added: head/lang/erlang-runtime16/patch-lib_crypto_c__src_Makefile.in (contents, props changed) head/lang/erlang-runtime16/patch-lib_crypto_priv_Makefile (contents, props changed) head/lang/erlang-runtime17/patch-lib_crypto_c__src_Makefile.in (contents, props changed) head/lang/erlang-runtime17/patch-lib_crypto_priv_Makefile (contents, props changed) head/lang/erlang-runtime18/patch-lib_crypto_c__src_Makefile.in (contents, props changed) head/lang/erlang-runtime18/patch-lib_crypto_priv_Makefile (contents, props changed) head/lang/erlang/files/patch-lib_crypto_c__src_Makefile.in (contents, props changed) head/lang/erlang/files/patch-lib_crypto_priv_Makefile (contents, props changed) Modified: head/lang/erlang-runtime16/Makefile head/lang/erlang-runtime17/Makefile head/lang/erlang-runtime18/Makefile head/lang/erlang/Makefile Modified: head/lang/erlang-runtime16/Makefile ============================================================================== --- head/lang/erlang-runtime16/Makefile Sat May 7 08:58:55 2016 (r414766) +++ head/lang/erlang-runtime16/Makefile Sat May 7 09:02:08 2016 (r414767) @@ -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 \ Added: head/lang/erlang-runtime16/patch-lib_crypto_c__src_Makefile.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/lang/erlang-runtime16/patch-lib_crypto_c__src_Makefile.in Sat May 7 09:02:08 2016 (r414767) @@ -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 Added: head/lang/erlang-runtime16/patch-lib_crypto_priv_Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/lang/erlang-runtime16/patch-lib_crypto_priv_Makefile Sat May 7 09:02:08 2016 (r414767) @@ -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) Modified: head/lang/erlang-runtime17/Makefile ============================================================================== --- head/lang/erlang-runtime17/Makefile Sat May 7 08:58:55 2016 (r414766) +++ head/lang/erlang-runtime17/Makefile Sat May 7 09:02:08 2016 (r414767) @@ -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 \ Added: head/lang/erlang-runtime17/patch-lib_crypto_c__src_Makefile.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/lang/erlang-runtime17/patch-lib_crypto_c__src_Makefile.in Sat May 7 09:02:08 2016 (r414767) @@ -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 Added: head/lang/erlang-runtime17/patch-lib_crypto_priv_Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/lang/erlang-runtime17/patch-lib_crypto_priv_Makefile Sat May 7 09:02:08 2016 (r414767) @@ -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) Modified: head/lang/erlang-runtime18/Makefile ============================================================================== --- head/lang/erlang-runtime18/Makefile Sat May 7 08:58:55 2016 (r414766) +++ head/lang/erlang-runtime18/Makefile Sat May 7 09:02:08 2016 (r414767) @@ -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 \ Added: head/lang/erlang-runtime18/patch-lib_crypto_c__src_Makefile.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/lang/erlang-runtime18/patch-lib_crypto_c__src_Makefile.in Sat May 7 09:02:08 2016 (r414767) @@ -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 Added: head/lang/erlang-runtime18/patch-lib_crypto_priv_Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/lang/erlang-runtime18/patch-lib_crypto_priv_Makefile Sat May 7 09:02:08 2016 (r414767) @@ -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) Modified: head/lang/erlang/Makefile ============================================================================== --- head/lang/erlang/Makefile Sat May 7 08:58:55 2016 (r414766) +++ head/lang/erlang/Makefile Sat May 7 09:02:08 2016 (r414767) @@ -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 \ Added: head/lang/erlang/files/patch-lib_crypto_c__src_Makefile.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/lang/erlang/files/patch-lib_crypto_c__src_Makefile.in Sat May 7 09:02:08 2016 (r414767) @@ -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 Added: head/lang/erlang/files/patch-lib_crypto_priv_Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/lang/erlang/files/patch-lib_crypto_priv_Makefile Sat May 7 09:02:08 2016 (r414767) @@ -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)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201605070902.u47928pC032901>