summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexis Ballier <aballier@gentoo.org>2016-01-19 12:31:25 +0100
committerAlexis Ballier <aballier@gentoo.org>2016-01-19 12:35:24 +0100
commite8acaed31d2d3a383342acab203206286041386b (patch)
tree557719e1bef931859c23841f8a2bfb2fc3bd2d9e /dev-ml/ocamlgraph/files
parentdev-ros/opencv_apps: add missing dep on opencv[contrib] (diff)
downloadgentoo-e8acaed31d2d3a383342acab203206286041386b.tar.gz
gentoo-e8acaed31d2d3a383342acab203206286041386b.tar.bz2
gentoo-e8acaed31d2d3a383342acab203206286041386b.zip
dev-ml/ocamlgraph: bump to 1.8.6
Package-Manager: portage-2.2.27 Signed-off-by: Alexis Ballier <aballier@gentoo.org>
Diffstat (limited to 'dev-ml/ocamlgraph/files')
-rw-r--r--dev-ml/ocamlgraph/files/ocamlgraph-1.8.6-installfindlib.patch38
1 files changed, 38 insertions, 0 deletions
diff --git a/dev-ml/ocamlgraph/files/ocamlgraph-1.8.6-installfindlib.patch b/dev-ml/ocamlgraph/files/ocamlgraph-1.8.6-installfindlib.patch
new file mode 100644
index 000000000000..cb980b6f19dc
--- /dev/null
+++ b/dev-ml/ocamlgraph/files/ocamlgraph-1.8.6-installfindlib.patch
@@ -0,0 +1,38 @@
+Index: ocamlgraph-1.8.6/Makefile.in
+===================================================================
+--- ocamlgraph-1.8.6.orig/Makefile.in
++++ ocamlgraph-1.8.6/Makefile.in
+@@ -421,21 +421,25 @@ ifdef DESTDIR
+ OCAMLFINDDEST := -destdir $(DESTDIR)
+ endif
+
++ifneq ($(WANT_OCAMLOPT),no)
++INSTALL_OPT=graph$(LIBEXT) graph.cmx $(CMXA)
++INSTALL_GTK_OPT=$(VIEWER_CMXLIB) $(VIEWER_CMXLIB:.cmx=.o) $(DGRAPH_CMXLIB) $(DGRAPH_CMXLIB:.cmx=.o) graph$(OBJEXT)
++endif
++
+ install-findlib: META
+ ifdef OCAMLFIND
+-ifeq (@LABLGNOMECANVAS@,yes)
++ifeq ($(WANT_GTK),yes)
+ $(OCAMLFIND) install $(OCAMLFINDDEST) ocamlgraph META \
+ $(SRCDIR)/*.mli $(VIEWER_DIR)/*.mli $(DGRAPH_DIR)/*.mli \
+- graph$(OBJEXT) graph$(LIBEXT) graph.cmx graph.cmo graph.cmi \
+- $(CMA) $(CMXA) \
+- $(VIEWER_CMXLIB) $(VIEWER_CMOLIB) $(VIEWER_CMILIB) \
+- $(VIEWER_CMXLIB:.cmx=.o) \
+- $(DGRAPH_CMXLIB) $(DGRAPH_CMOLIB) $(DGRAPH_CMILIB) \
+- $(DGRAPH_CMXLIB:.cmx=.o)
++ $(INSTALL_OPT) graph.cmo graph.cmi \
++ $(CMA) \
++ $(INSTALL_GTK_OPT) \
++ $(VIEWER_CMOLIB) $(VIEWER_CMILIB) \
++ $(DGRAPH_CMOLIB) $(DGRAPH_CMILIB)
+ else
+ $(OCAMLFIND) install $(OCAMLFINDDEST) ocamlgraph META \
+ $(SRCDIR)/*.mli $(VIEWER_DIR)/*.mli $(DGRAPH_DIR)/*.mli \
+- graph$(LIBEXT) graph.cmx graph.cmo graph.cmi $(CMA) $(CMXA)
++ $(INSTALL_OPT) graph.cmo graph.cmi $(CMA)
+ endif
+ endif
+