diff options
author | Jimmy Olgeni <olgeni@FreeBSD.org> | 2016-05-07 09:02:08 +0000 |
---|---|---|
committer | Jimmy Olgeni <olgeni@FreeBSD.org> | 2016-05-07 09:02:08 +0000 |
commit | 94e759fdb5404a732ae9744939b7c8858f2ea29d (patch) | |
tree | ddc83d0fb4e42a33bd02b8e7fd10b22d1e6995d8 /lang | |
parent | 9c815e90a3882b4771b91baacbaf52ba01384cb4 (diff) |
Notes
Diffstat (limited to 'lang')
-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 | ||||
-rw-r--r-- | lang/erlang-runtime17/Makefile | 1 | ||||
-rw-r--r-- | lang/erlang-runtime17/patch-lib_crypto_c__src_Makefile.in | 11 | ||||
-rw-r--r-- | lang/erlang-runtime17/patch-lib_crypto_priv_Makefile | 11 | ||||
-rw-r--r-- | lang/erlang-runtime18/Makefile | 1 | ||||
-rw-r--r-- | lang/erlang-runtime18/patch-lib_crypto_c__src_Makefile.in | 11 | ||||
-rw-r--r-- | lang/erlang-runtime18/patch-lib_crypto_priv_Makefile | 11 | ||||
-rw-r--r-- | lang/erlang/Makefile | 1 | ||||
-rw-r--r-- | lang/erlang/files/patch-lib_crypto_c__src_Makefile.in | 11 | ||||
-rw-r--r-- | lang/erlang/files/patch-lib_crypto_priv_Makefile | 11 |
12 files changed, 92 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) diff --git a/lang/erlang-runtime17/Makefile b/lang/erlang-runtime17/Makefile index 6a5cb2db10a1..5b92d48e1978 100644 --- a/lang/erlang-runtime17/Makefile +++ b/lang/erlang-runtime17/Makefile @@ -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 \ diff --git a/lang/erlang-runtime17/patch-lib_crypto_c__src_Makefile.in b/lang/erlang-runtime17/patch-lib_crypto_c__src_Makefile.in new file mode 100644 index 000000000000..65e1b759ad66 --- /dev/null +++ b/lang/erlang-runtime17/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-runtime17/patch-lib_crypto_priv_Makefile b/lang/erlang-runtime17/patch-lib_crypto_priv_Makefile new file mode 100644 index 000000000000..26f2c38e360d --- /dev/null +++ b/lang/erlang-runtime17/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) diff --git a/lang/erlang-runtime18/Makefile b/lang/erlang-runtime18/Makefile index 5d6495aa66b7..3be30fe1ce8c 100644 --- a/lang/erlang-runtime18/Makefile +++ b/lang/erlang-runtime18/Makefile @@ -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 \ diff --git a/lang/erlang-runtime18/patch-lib_crypto_c__src_Makefile.in b/lang/erlang-runtime18/patch-lib_crypto_c__src_Makefile.in new file mode 100644 index 000000000000..65e1b759ad66 --- /dev/null +++ b/lang/erlang-runtime18/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-runtime18/patch-lib_crypto_priv_Makefile b/lang/erlang-runtime18/patch-lib_crypto_priv_Makefile new file mode 100644 index 000000000000..26f2c38e360d --- /dev/null +++ b/lang/erlang-runtime18/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) diff --git a/lang/erlang/Makefile b/lang/erlang/Makefile index daa06a6698dc..9d64b102e142 100644 --- a/lang/erlang/Makefile +++ b/lang/erlang/Makefile @@ -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 \ diff --git a/lang/erlang/files/patch-lib_crypto_c__src_Makefile.in b/lang/erlang/files/patch-lib_crypto_c__src_Makefile.in new file mode 100644 index 000000000000..65e1b759ad66 --- /dev/null +++ b/lang/erlang/files/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/files/patch-lib_crypto_priv_Makefile b/lang/erlang/files/patch-lib_crypto_priv_Makefile new file mode 100644 index 000000000000..26f2c38e360d --- /dev/null +++ b/lang/erlang/files/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) |