[Pkg-ocaml-maint-commits] [coccinelle] 01/03: Use ocamlfind to search for parmap

[Eugeniy Meshcheryakov]

This is an automated email from the git hooks/post-receive script.

eugen pushed a commit to branch master
in repository coccinelle.

commit 7c10a61843a026aa16e9b3de9da938347f23d7ee
Author: Eugeniy Meshcheryakov <eugen at debian.org>
Date:   Thu Mar 12 20:45:54 2015 +0100

    Use ocamlfind to search for parmap
---
 debian/changelog                     |  6 ++++++
 debian/patches/no-parmap-subdir.diff | 10 ++++++++--
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 2df8374..3d162b9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+coccinelle (1.0.0~rc24.deb-2) experimental; urgency=medium
+
+  * Use ocamlfind to search for parmap
+
+ -- Євгеній Мещеряков <eugen at debian.org>  Thu, 12 Mar 2015 20:45:40 +0100
+
 coccinelle (1.0.0~rc24.deb-1) experimental; urgency=medium
 
   * New upstream RC
diff --git a/debian/patches/no-parmap-subdir.diff b/debian/patches/no-parmap-subdir.diff
index 5e3c10d..be4226b 100644
--- a/debian/patches/no-parmap-subdir.diff
+++ b/debian/patches/no-parmap-subdir.diff
@@ -12,12 +12,18 @@
   globals ctl parsing_cocci parsing_c \
 --- a/Makefile.libs
 +++ b/Makefile.libs
-@@ -75,7 +75,7 @@
+@@ -75,10 +75,11 @@
  OPTFLAGS_type_conv  =
  
  # parmap library
 -PARMAPDIR        = bundles/parmap/parmap-1.0-rc5-patched/_build
-+PARMAPDIR        = /usr/lib/ocaml/parmap
++PARMAPDIR        := $(shell ocalfind query parmap)
  LOCAL_parmap     = $(PARMAPDIR)/parmap.cma
  LOCALOPT_parmap  = $(PARMAPDIR)/parmap.cmxa
  GLOBAL_parmap    = $(PARMAPDIR)/parmap.cma
+ GLOBALOPT_parmap = $(PARMAPDIR)/parmap.cmxa
+-FLAGS_parmap     = -cclib -lparmap_stubs
+-OPTFLAGS_parmap  = -cclib -lparmap_stubs
++#PARMAP_LIBS = $(shell ocamlfind query -l-format parmap)
++FLAGS_parmap     = -dllib -lparmap_stubs -cclib -lparmap_stubs
++OPTFLAGS_parmap  = -cclib -lparmap_stubs

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/coccinelle.git