Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_150713405218570"
MIME-Version: 1.0
Date: Wed, 4 Oct 2017 16:20:52 +0000
From: "Jonathan Perkin" <jperkin@netbsd.org>
Subject: CVS commit: pkgsrc/lang/erlang
To: pkgsrc-changes@NetBSD.org
Reply-To: jperkin@netbsd.org
Message-Id: <20171004162052.2CB28FBC7@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

--_----------=_150713405218570
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	jperkin
Date:		Wed Oct  4 16:20:52 UTC 2017

Modified Files:
	pkgsrc/lang/erlang: Makefile distinfo
Added Files:
	pkgsrc/lang/erlang/patches: patch-lib_crypto_c__src_Makefile.in

Log Message:
erlang: Compile via CC wrapper to ensure correct flags.

Fixes SSP build of crypto_callback library.  Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.80 -r1.81 pkgsrc/lang/erlang/Makefile
cvs rdiff -u -r1.52 -r1.53 pkgsrc/lang/erlang/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/lang/erlang/patches/patch-lib_crypto_c__src_Makefile.in

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


--_----------=_150713405218570
Content-Disposition: inline
Content-Length: 2514
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/lang/erlang/Makefile
diff -u pkgsrc/lang/erlang/Makefile:1.80 pkgsrc/lang/erlang/Makefile:1.81
--- pkgsrc/lang/erlang/Makefile:1.80	Sat Dec 17 13:06:18 2016
+++ pkgsrc/lang/erlang/Makefile	Wed Oct  4 16:20:51 2017
@@ -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/
 

Index: pkgsrc/lang/erlang/distinfo
diff -u pkgsrc/lang/erlang/distinfo:1.52 pkgsrc/lang/erlang/distinfo:1.53
--- pkgsrc/lang/erlang/distinfo:1.52	Mon Oct  2 18:10:38 2017
+++ pkgsrc/lang/erlang/distinfo	Wed Oct  4 16:20:51 2017
@@ -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) = f5f1accdb11e404ba4779b
 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

Added files:

Index: pkgsrc/lang/erlang/patches/patch-lib_crypto_c__src_Makefile.in
diff -u /dev/null pkgsrc/lang/erlang/patches/patch-lib_crypto_c__src_Makefile.in:1.1
--- /dev/null	Wed Oct  4 16:20:52 2017
+++ pkgsrc/lang/erlang/patches/patch-lib_crypto_c__src_Makefile.in	Wed Oct  4 16:20:51 2017
@@ -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)


--_----------=_150713405218570--