[Pkg-ocaml-maint-commits] [coccinelle] 02/02: New patch to fix compilation with --disable-opt

[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 25e5cd36259edfb9029a4f8a08aeca753c5b554c
Author: Eugeniy Meshcheryakov <eugen at debian.org>
Date:   Wed Jan 10 00:50:26 2018 +0100

    New patch to fix compilation with --disable-opt
---
 debian/changelog                    |  6 +++++-
 debian/control                      |  3 ++-
 debian/patches/fix-noopt-FTBFS.diff | 12 ++++++++++++
 debian/patches/series               |  1 +
 debian/rules                        |  2 +-
 5 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index aa2a96f..aa4844a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,12 @@ coccinelle (1.0.6.deb-3) experimental; urgency=medium
 
   * Pass --disable-opt to configure instead of just not passing --enable-opt
     on architectures without native compilers (again, closes: #886714)
+  * New patch:
+    - fix-noopt-FTBFS.diff - do not force using optimized compiler so
+      --disable-opt actually works
+  * Use dh-autoreconf during build
 
- -- Євгеній Мещеряков <eugen at debian.org>  Tue, 09 Jan 2018 23:49:39 +0100
+ -- Євгеній Мещеряков <eugen at debian.org>  Wed, 10 Jan 2018 00:51:13 +0100
 
 coccinelle (1.0.6.deb-2) experimental; urgency=medium
 
diff --git a/debian/control b/debian/control
index 0f8b2c5..fb7caf4 100644
--- a/debian/control
+++ b/debian/control
@@ -24,7 +24,8 @@ Build-Depends:
  camlp4,
  dh-python,
  hevea,
- latexmk
+ latexmk,
+ dh-autoreconf
 Standards-Version: 4.1.1
 Homepage: http://coccinelle.lip6.fr
 Vcs-Git: https://alioth.debian.org/anonscm/git/pkg-ocaml-maint/packages/coccinelle.git
diff --git a/debian/patches/fix-noopt-FTBFS.diff b/debian/patches/fix-noopt-FTBFS.diff
new file mode 100644
index 0000000..d8c5783
--- /dev/null
+++ b/debian/patches/fix-noopt-FTBFS.diff
@@ -0,0 +1,12 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -420,9 +420,6 @@
+   ])
+ ])
+ 
+-dnl  set the default enable-opt setting
+-AC_SUBST([enable_opt], ["yes"])
+-
+ dnl  variables depending on whether we build the optimized spatch
+ AS_IF([test "x$enable_opt" = xyes],
+ [dnl  default target for the optimized version
diff --git a/debian/patches/series b/debian/patches/series
index f3e5b64..4f989be 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 pdf-docs-build.diff
 notparallel-main-makefile.diff
 bash-completion-dir.diff
+fix-noopt-FTBFS.diff
diff --git a/debian/rules b/debian/rules
index 63862e2..f7845f7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -17,7 +17,7 @@ CONFIG_FLAGS += --disable-opt
 endif
 
 %:
-	dh $@ --with ocaml,python2 --parallel
+	dh $@ --with ocaml,python2,autoreconf --parallel
 
 override_dh_auto_configure:
 	./configure $(CONFIG_FLAGS)

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