diff options
author | jperkin <jperkin@pkgsrc.org> | 2017-10-04 16:20:51 +0000 |
---|---|---|
committer | jperkin <jperkin@pkgsrc.org> | 2017-10-04 16:20:51 +0000 |
commit | 434d35a8a9f362990bb05cce1148d3869e204411 (patch) | |
tree | de08382b46dc7b8c94f91c28428bb3e56bcfdf30 /lang/erlang | |
parent | 33ec80698fc203d0bc4c14b6ae1cbc685e7d414d (diff) | |
download | pkgsrc-434d35a8a9f362990bb05cce1148d3869e204411.tar.gz |
erlang: Compile via CC wrapper to ensure correct flags.
Fixes SSP build of crypto_callback library. Bump PKGREVISION.
Diffstat (limited to 'lang/erlang')
-rw-r--r-- | lang/erlang/Makefile | 3 | ||||
-rw-r--r-- | lang/erlang/distinfo | 3 | ||||
-rw-r--r-- | lang/erlang/patches/patch-lib_crypto_c__src_Makefile.in | 15 |
3 files changed, 19 insertions, 2 deletions
diff --git a/lang/erlang/Makefile b/lang/erlang/Makefile index 8e4a343c9d1..0aacd3efe60 100644 --- a/lang/erlang/Makefile +++ b/lang/erlang/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.80 2016/12/17 13:06:18 rillig Exp $ +# $NetBSD: Makefile,v 1.81 2017/10/04 16:20:51 jperkin Exp $ DISTNAME= otp_src_${DIST_VERSION_MAJOR}.${DIST_VERSION_MINOR} PKGNAME= ${DISTNAME:S/otp_src_/erlang-/} +PKGREVISION= 1 CATEGORIES= lang MASTER_SITES= http://www.erlang.org/download/ diff --git a/lang/erlang/distinfo b/lang/erlang/distinfo index c6dd8317799..f23c17c0024 100644 --- a/lang/erlang/distinfo +++ b/lang/erlang/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.52 2017/10/02 18:10:38 fhajny Exp $ +$NetBSD: distinfo,v 1.53 2017/10/04 16:20:51 jperkin Exp $ SHA1 (erlang/otp_src_20.1.tar.gz) = 8facdb71696118b5c58238e57106ca23d14166d0 RMD160 (erlang/otp_src_20.1.tar.gz) = 65ed1ad934dea860f277648663db714881b9cb97 @@ -9,4 +9,5 @@ SHA1 (patch-ay) = f5f1accdb11e404ba4779b056228431e3080e4cd SHA1 (patch-erts_configure) = dba8d72974e8c493cf2bb90e6b149a84dd9073da SHA1 (patch-erts_emulator_drivers_common_inet__drv.c) = b7784e5e8e025ca75d5279a63e0cb3f74c54bd6a SHA1 (patch-erts_emulator_sys_common_erl__poll.c) = b2068ed4f1994407cb2ec3cd10220bebae85b01d +SHA1 (patch-lib_crypto_c__src_Makefile.in) = 0ab1db36c03999524e933d60f913ff5608b0622e SHA1 (patch-make_output.mk.in) = d7b3da58bfb471d52c41242e2a03d1598ce24e62 diff --git a/lang/erlang/patches/patch-lib_crypto_c__src_Makefile.in b/lang/erlang/patches/patch-lib_crypto_c__src_Makefile.in new file mode 100644 index 00000000000..1f4a83a2044 --- /dev/null +++ b/lang/erlang/patches/patch-lib_crypto_c__src_Makefile.in @@ -0,0 +1,15 @@ +$NetBSD: patch-lib_crypto_c__src_Makefile.in,v 1.1 2017/10/04 16:20:51 jperkin Exp $ + +Compile via CC wrapper to ensure correct flags. + +--- lib/crypto/c_src/Makefile.in.orig 2017-06-20 18:56:09.000000000 +0000 ++++ lib/crypto/c_src/Makefile.in +@@ -156,7 +156,7 @@ $(LIBDIR)/crypto$(TYPEMARKER).dll: $(CRY + ifeq ($(DYNAMIC_CRYPTO_LIB),yes) + $(LIBDIR)/crypto_callback$(TYPEMARKER).so: $(CALLBACK_OBJS) + $(INSTALL_DIR) $(LIBDIR) +- $(LD) $(LDFLAGS) -o $@ $^ $(LDLIBS) ++ $(V_CC) $(LDFLAGS) -o $@ $^ $(LDLIBS) + + $(LIBDIR)/crypto_callback$(TYPEMARKER).dll: $(CALLBACK_OBJS) + $(INSTALL_DIR) $(LIBDIR) |