diff options
| author | khorben <khorben@pkgsrc.org> | 2017-10-27 23:30:07 +0000 |
|---|---|---|
| committer | khorben <khorben@pkgsrc.org> | 2017-10-27 23:30:07 +0000 |
| commit | d955342a0e9a99c2ce52c357821a90e3e1f75bff (patch) | |
| tree | 97f70cf995f04f79cd6fbeb07c9caa71bbc0b989 /lang/ocaml | |
| parent | c50ec04a0d8cdb97d98f4bf5a12df8b88f78f19e (diff) | |
| download | pkgsrc-d955342a0e9a99c2ce52c357821a90e3e1f75bff.tar.gz | |
Really honour LDFLAGS when building ocamlyacc
This fixes building lang/ocaml with RELRO.
Diffstat (limited to 'lang/ocaml')
| -rw-r--r-- | lang/ocaml/distinfo | 4 | ||||
| -rw-r--r-- | lang/ocaml/patches/patch-yacc_Makefile | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/lang/ocaml/distinfo b/lang/ocaml/distinfo index 32e63f6a21f..a861ab8a171 100644 --- a/lang/ocaml/distinfo +++ b/lang/ocaml/distinfo @@ -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) = 53785aa5f0684a2c8708891d7e4e9d4400afbe7d 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 diff --git a/lang/ocaml/patches/patch-yacc_Makefile b/lang/ocaml/patches/patch-yacc_Makefile index d89c45f10e7..6f5cbdba802 100644 --- a/lang/ocaml/patches/patch-yacc_Makefile +++ b/lang/ocaml/patches/patch-yacc_Makefile @@ -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'`\"" > $@ |