Received: by mail.netbsd.org (Postfix, from userid 605) id CE6F284DD2; Fri, 27 Oct 2017 23:30:08 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 58AF484DBE for ; Fri, 27 Oct 2017 23:30:08 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id 5jbh2bsvw8Hi for ; Fri, 27 Oct 2017 23:30:07 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id D688884D99 for ; Fri, 27 Oct 2017 23:30:07 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id CC696FBDE; Fri, 27 Oct 2017 23:30:07 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_150914700717530" MIME-Version: 1.0 Date: Fri, 27 Oct 2017 23:30:07 +0000 From: "Pierre Pronchery" Subject: CVS commit: pkgsrc/lang/ocaml To: pkgsrc-changes@NetBSD.org Reply-To: khorben@netbsd.org X-Mailer: log_accum Message-Id: <20171027233007.CC696FBDE@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_150914700717530 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: khorben Date: Fri Oct 27 23:30:07 UTC 2017 Modified Files: pkgsrc/lang/ocaml: distinfo pkgsrc/lang/ocaml/patches: patch-yacc_Makefile Log Message: Really honour LDFLAGS when building ocamlyacc This fixes building lang/ocaml with RELRO. To generate a diff of this commit: cvs rdiff -u -r1.112 -r1.113 pkgsrc/lang/ocaml/distinfo cvs rdiff -u -r1.1 -r1.2 pkgsrc/lang/ocaml/patches/patch-yacc_Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_150914700717530 Content-Disposition: inline Content-Length: 2061 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/lang/ocaml/distinfo diff -u pkgsrc/lang/ocaml/distinfo:1.112 pkgsrc/lang/ocaml/distinfo:1.113 --- pkgsrc/lang/ocaml/distinfo:1.112 Tue Oct 17 08:26:48 2017 +++ pkgsrc/lang/ocaml/distinfo Fri Oct 27 23:30:07 2017 @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.112 2017/10/17 08:26:48 wiz Exp $ +$NetBSD: distinfo,v 1.113 2017/10/27 23:30:07 khorben Exp $ SHA1 (ocaml-4.05.0.tar.gz) = ef9e3febed311cf9331baefd2999961b36f849cb RMD160 (ocaml-4.05.0.tar.gz) = 67b299c3abe032f955e95eac106c32664351453c @@ -31,4 +31,4 @@ SHA1 (patch-tools_ocamlmklib) = 53785aa5 SHA1 (patch-tools_ocamloptp.ml) = 070bd797fcd4120e58d15a09f25d93ec46b87d1a SHA1 (patch-utils_clflags.ml) = d16832fedb5db08d035f1661eaf9c3b48411bc69 SHA1 (patch-utils_clflags.mli) = 381951d9583e032d3a520b68a8fe9f867ec49995 -SHA1 (patch-yacc_Makefile) = e7e77becbc1872fedd37bdeb4614739eb67977c8 +SHA1 (patch-yacc_Makefile) = 5a150661d2c3ebbee52131adbed1efbe69da90ef Index: pkgsrc/lang/ocaml/patches/patch-yacc_Makefile diff -u pkgsrc/lang/ocaml/patches/patch-yacc_Makefile:1.1 pkgsrc/lang/ocaml/patches/patch-yacc_Makefile:1.2 --- pkgsrc/lang/ocaml/patches/patch-yacc_Makefile:1.1 Mon Jul 17 23:26:23 2017 +++ pkgsrc/lang/ocaml/patches/patch-yacc_Makefile Fri Oct 27 23:30:07 2017 @@ -1,15 +1,15 @@ -$NetBSD: patch-yacc_Makefile,v 1.1 2017/07/17 23:26:23 wiz Exp $ +$NetBSD: patch-yacc_Makefile,v 1.2 2017/10/27 23:30:07 khorben Exp $ Honor LDFLAGS when building ocamlyacc. ---- yacc/Makefile.orig 2017-06-23 15:13:40.000000000 +0000 +--- yacc/Makefile.orig 2017-07-13 08:56:45.000000000 +0000 +++ yacc/Makefile -@@ -27,7 +27,7 @@ OBJS= closure.$(O) error.$(O) lalr.$(O) +@@ -33,7 +33,7 @@ OBJS= closure.$(O) error.$(O) lalr.$(O) all: ocamlyacc$(EXE) ocamlyacc$(EXE): $(OBJS) - $(MKEXE) -o ocamlyacc$(EXE) $(OBJS) $(EXTRALIBS) -+ $(MKEXE) $(BYTECCLINKOPTS) -o ocamlyacc$(EXE) $(OBJS) $(EXTRALIBS) ++ $(MKEXE) $(BYTECCLIBS) -o ocamlyacc$(EXE) $(OBJS) $(EXTRALIBS) version.h : ../VERSION echo "#define OCAML_VERSION \"`sed -e 1q $^ | tr -d '\r'`\"" > $@ --_----------=_150914700717530--