[Pkg-ocaml-maint-commits] [findlib] 03/05: Add back camlp4 patches

[Stéphane Glondu]

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

glondu pushed a commit to branch sid/master
in repository findlib.

commit 802a2960af9318edd9ae169c55bfed06d1d75818
Author: Stephane Glondu <steph at glondu.net>
Date:   Sun Aug 16 11:33:36 2015 +0200

    Add back camlp4 patches
---
 ...-depends-on-Dynlink-on-every-architecture.patch | 30 ++++++++++++++++++++++
 ...o-not-use-an-absolute-path-in-META.camlp4.patch | 22 ++++++++++++++++
 debian/patches/series                              |  2 ++
 3 files changed, 54 insertions(+)

diff --git a/debian/patches/0005-Camlp4-depends-on-Dynlink-on-every-architecture.patch b/debian/patches/0005-Camlp4-depends-on-Dynlink-on-every-architecture.patch
new file mode 100644
index 0000000..e825b94
--- /dev/null
+++ b/debian/patches/0005-Camlp4-depends-on-Dynlink-on-every-architecture.patch
@@ -0,0 +1,30 @@
+From: Nicolas Dandrimont <nicolas.dandrimont at crans.org>
+Date: Tue, 14 Jun 2011 15:21:31 +0200
+Subject: Camlp4 depends on Dynlink on every architecture
+
+---
+ site-lib-src/camlp4.310/META.in | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/site-lib-src/camlp4.310/META.in b/site-lib-src/camlp4.310/META.in
+index f54c775..e1f4d31 100644
+--- a/site-lib-src/camlp4.310/META.in
++++ b/site-lib-src/camlp4.310/META.in
+@@ -6,7 +6,7 @@ dnl This file is input of the m4 macro processor.
+ `directory = "+camlp4"'
+ 
+ `# For the toploop:'
+-`requires(byte,toploop) = "'camlp4_dynlink`"'
++`requires(byte,toploop) = "dynlink"'
+ `archive(byte,toploop,camlp4o) = "camlp4o.cma"'
+ `archive(byte,toploop,camlp4r) = "camlp4r.cma"'
+ 
+@@ -16,7 +16,7 @@ dnl This file is input of the m4 macro processor.
+ `preprocessor = "'camlp4_cmd`"'
+ 
+ `package "lib" ('
+-`  requires = "camlp4 'camlp4_dynlink`"'
++`  requires = "camlp4 dynlink"'
+ `  version = "[distributed with Ocaml]"'
+ `  description = "Camlp4 library"'
+ `  archive(byte) = "camlp4lib.cma"'
diff --git a/debian/patches/0006-Do-not-use-an-absolute-path-in-META.camlp4.patch b/debian/patches/0006-Do-not-use-an-absolute-path-in-META.camlp4.patch
new file mode 100644
index 0000000..a05d6a4
--- /dev/null
+++ b/debian/patches/0006-Do-not-use-an-absolute-path-in-META.camlp4.patch
@@ -0,0 +1,22 @@
+From: Nicolas Dandrimont <nicolas.dandrimont at crans.org>
+Date: Mon, 27 Jun 2011 21:55:16 +0200
+Subject: Do not use an absolute path in META.camlp4
+
+Bug-Debian: https://bugs.debian.org/628021
+---
+ configure | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure b/configure
+index e0dd3ea..aa5d20f 100755
+--- a/configure
++++ b/configure
+@@ -449,7 +449,7 @@ if [ $with_camlp4 -eq 0 ]; then
+     lcamlp4=''
+     echo "camlp4: disabled"
+ else if in_path camlp4; then
+-    camlp4_dir=`camlp4 -where | tr -d '\015'`
++    camlp4_dir=`camlp4 -where | tr -d '\015' | sed -s 's@/usr/lib/ocaml/@^@'`
+     if [ ${use_cygpath} -gt 0 ]; then
+ 	camlp4_dir=`echo x | env USE_CYGPATH=1 tools/patch x "$camlp4_dir"`
+         # This makes camlp4_dir a windows path
diff --git a/debian/patches/series b/debian/patches/series
index a183565..2679954 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,5 @@
 0002-Extra-configuration-search-path.patch
 0003-META.num-bugfix-moved-directory-directive-outside-co.patch
 0004-Disable-graphics-and-labltk-when-unavailable.patch
+0005-Camlp4-depends-on-Dynlink-on-every-architecture.patch
+0006-Do-not-use-an-absolute-path-in-META.camlp4.patch

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