summaryrefslogtreecommitdiff
path: root/lang/ocaml
diff options
context:
space:
mode:
authorjaapb <jaapb@pkgsrc.org>2015-08-09 13:31:18 +0000
committerjaapb <jaapb@pkgsrc.org>2015-08-09 13:31:18 +0000
commita3fb8453b98b8382eb4cedc1aad7e457f4c07050 (patch)
treeaf932f00c5705ba9785edcbf22a1f3db29030553 /lang/ocaml
parent7a54081223710aaf19eb8c9af4373d20fe4ba729 (diff)
downloadpkgsrc-a3fb8453b98b8382eb4cedc1aad7e457f4c07050.tar.gz
Added patch for x11/ocaml-graphics. This does not change any functionality,
but is necessary for a Makefile substitution in that package.
Diffstat (limited to 'lang/ocaml')
-rw-r--r--lang/ocaml/distinfo3
-rw-r--r--lang/ocaml/patches/patch-otherlibs_Makefile15
2 files changed, 17 insertions, 1 deletions
diff --git a/lang/ocaml/distinfo b/lang/ocaml/distinfo
index aa06fe84062..37d830cde06 100644
--- a/lang/ocaml/distinfo
+++ b/lang/ocaml/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.87 2015/08/07 11:16:30 jaapb Exp $
+$NetBSD: distinfo,v 1.88 2015/08/09 13:31:18 jaapb Exp $
SHA1 (ocaml-4.02.3.tar.gz) = e68ffd2b5bb491a6345f46b27675e1361a49b274
RMD160 (ocaml-4.02.3.tar.gz) = 3946204b9396a7fb81ae1042ce67a494579c151b
@@ -23,6 +23,7 @@ SHA1 (patch-driver_optmain.ml) = e8b347eb49d9f72e0af6f69c2b6aacd41d8eec4a
SHA1 (patch-man_Makefile) = 7d8c1468c3365803505841a7f688d84c07231a3c
SHA1 (patch-ocamldoc_Makefile) = fe85a5ba0e9f9536ae4f80c0337a8cde9c542862
SHA1 (patch-ocamldoc_odoc__messages.ml) = 95aed385cfff480051d4a7dfc60da50a572293df
+SHA1 (patch-otherlibs_Makefile) = 44f0f6841c3facf1793c84b6888db9e00612d588
SHA1 (patch-otherlibs_Makefile.shared) = c5de4dd0f2be9cd35ba61b480b222ffa7baa891d
SHA1 (patch-otherlibs_dynlink_Makefile) = 41cecb61230880a40c55f2f8f25d2b250864eb24
SHA1 (patch-otherlibs_systhreads_Makefile) = f3cdf000f58927dff44b4ce61153c1df8e9eceea
diff --git a/lang/ocaml/patches/patch-otherlibs_Makefile b/lang/ocaml/patches/patch-otherlibs_Makefile
new file mode 100644
index 00000000000..43cc4f42e3c
--- /dev/null
+++ b/lang/ocaml/patches/patch-otherlibs_Makefile
@@ -0,0 +1,15 @@
+$NetBSD: patch-otherlibs_Makefile,v 1.3 2015/08/09 13:31:18 jaapb Exp $
+
+ocaml-graphics needs CAMLOPT to be one line only
+--- otherlibs/Makefile.orig 2015-05-12 14:46:37.000000000 +0000
++++ otherlibs/Makefile
+@@ -14,8 +14,7 @@
+ # Common Makefile for otherlibs on the Unix ports
+
+ CAMLC=$(CAMLRUN) $(ROOTDIR)/ocamlc -nostdlib -I $(ROOTDIR)/stdlib
+-CAMLOPT=$(CAMLRUN) $(ROOTDIR)/ocamlopt -nostdlib \
+- -I $(ROOTDIR)/stdlib
++CAMLOPT=$(CAMLRUN) $(ROOTDIR)/ocamlopt -nostdlib -I $(ROOTDIR)/stdlib
+ CFLAGS=-I$(ROOTDIR)/byterun $(SHAREDCCCOMPOPTS) $(EXTRACFLAGS)
+
+ include ../Makefile.shared