diff options
| author | jaapb <jaapb@pkgsrc.org> | 2012-12-04 13:55:23 +0000 |
|---|---|---|
| committer | jaapb <jaapb@pkgsrc.org> | 2012-12-04 13:55:23 +0000 |
| commit | 7c56f752e6fe7303aa4f5acaad3813c9b02903ae (patch) | |
| tree | 66e61908c97c6d862458afb4d3679bf535f3b5e7 /lang | |
| parent | 705b5d7db8556f758bd6ae6e86c349611ffb034b (diff) | |
| download | pkgsrc-7c56f752e6fe7303aa4f5acaad3813c9b02903ae.tar.gz | |
Updated patch to correct build failure.
Diffstat (limited to 'lang')
| -rw-r--r-- | lang/ocaml/distinfo | 4 | ||||
| -rw-r--r-- | lang/ocaml/patches/patch-Makefile | 23 |
2 files changed, 19 insertions, 8 deletions
diff --git a/lang/ocaml/distinfo b/lang/ocaml/distinfo index c7fa840629c..88e55c1014a 100644 --- a/lang/ocaml/distinfo +++ b/lang/ocaml/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.65 2012/10/26 08:18:15 jaapb Exp $ +$NetBSD: distinfo,v 1.66 2012/12/04 13:55:23 jaapb Exp $ SHA1 (ocaml-4.00.1.tar.bz2) = 10b8a4d0b88d20b003e3dd719f2ac9434e6a1042 RMD160 (ocaml-4.00.1.tar.bz2) = db28f57b463af90650b877af0baf44eb226b0a79 Size (ocaml-4.00.1.tar.bz2) = 2762205 bytes -SHA1 (patch-Makefile) = d5ff5fea13f355ae120532aa7b7d03a11c87f9ee +SHA1 (patch-Makefile) = 1d042908c5cece3d3d1e7e92fa4c418c2ed3d2ff SHA1 (patch-asmcomp_power_emit.mlp) = 726e09e4902b96f4790c7a8093eb245dd7028bf4 SHA1 (patch-asmrun_Makefile) = 5d49c710937c21df9974ad07f255992ef0f0dac8 SHA1 (patch-asmrun_power-bsd.S) = bd52898dde14adc1dbf9cd85a7f8af4d77218e6f diff --git a/lang/ocaml/patches/patch-Makefile b/lang/ocaml/patches/patch-Makefile index 5ed02255d78..3312428669c 100644 --- a/lang/ocaml/patches/patch-Makefile +++ b/lang/ocaml/patches/patch-Makefile @@ -1,9 +1,20 @@ -$NetBSD: patch-Makefile,v 1.1 2012/10/08 15:05:32 jaapb Exp $ +$NetBSD: patch-Makefile,v 1.2 2012/12/04 13:55:23 jaapb Exp $ -Use BSD_INSTALL_* instead of mkdir and cp ---- Makefile.orig 2012-07-20 08:06:01.000000000 +0000 +Use BSD_INSTALL_* instead of mkdir and cp; remove ocamlrun before cold start +--- Makefile.orig 2012-09-17 16:23:06.000000000 +0000 +++ Makefile -@@ -264,26 +264,26 @@ base.opt: checkstack runtime core ocaml +@@ -172,8 +172,10 @@ LIBFILES=stdlib.cma std_exit.cmo *.cmi c + # Start up the system from the distribution compiler + coldstart: + cd byterun; $(MAKE) all ++ rm -f boot/ocamlrun$(EXE) + cp byterun/ocamlrun$(EXE) boot/ocamlrun$(EXE) + cd yacc; $(MAKE) all ++ rm -f boot/ocamlyacc$(EXE) + cp yacc/ocamlyacc$(EXE) boot/ocamlyacc$(EXE) + cd stdlib; $(MAKE) COMPILER=../boot/ocamlc all + cd stdlib; cp $(LIBFILES) ../boot +@@ -263,26 +265,26 @@ base.opt: checkstack runtime core ocaml COMPLIBDIR=$(LIBDIR)/compiler-libs install: @@ -44,7 +55,7 @@ Use BSD_INSTALL_* instead of mkdir and cp cd tools; $(MAKE) install -cd man; $(MAKE) install for i in $(OTHERLIBRARIES); do \ -@@ -293,17 +293,17 @@ install: +@@ -292,17 +294,17 @@ install: if test -f ocamlopt; then $(MAKE) installopt; else :; fi if test -f debugger/ocamldebug; then (cd debugger; $(MAKE) install); \ else :; fi @@ -66,7 +77,7 @@ Use BSD_INSTALL_* instead of mkdir and cp cd ocamldoc; $(MAKE) installopt for i in $(OTHERLIBRARIES); \ do (cd otherlibs/$$i; $(MAKE) installopt) || exit $$?; done -@@ -311,10 +311,10 @@ installopt: +@@ -310,10 +312,10 @@ installopt: cd tools; $(MAKE) installopt installoptopt: |