[Pkg-ocaml-maint-commits] [ocaml-re2] 01/01: Imported Debian patch 113.00.00+dfsg-2.1

[Hilko Bengen]

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

bengen pushed a commit to branch master
in repository ocaml-re2.

commit 4626eae842fca2b08853a842f0e28cfa7e6d80eb
Author: Stefano Rivera <stefanor at debian.org>
Date:   Sun May 8 19:12:14 2016 +0200

    Imported Debian patch 113.00.00+dfsg-2.1
---
 debian/changelog            |  8 ++++++++
 debian/patches/c++11        | 24 ++++++++++++++++++++++++
 debian/patches/series       |  1 +
 debian/source/local-options |  2 --
 4 files changed, 33 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 40457f2..d25e63b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+ocaml-re2 (113.00.00+dfsg-2.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Build the stubs with -std=c++11, as required by re2 20160301.
+    (Closes: #820937)
+
+ -- Stefano Rivera <stefanor at debian.org>  Sun, 08 May 2016 19:12:14 +0200
+
 ocaml-re2 (113.00.00+dfsg-2) unstable; urgency=medium
 
   * Fix watch file
diff --git a/debian/patches/c++11 b/debian/patches/c++11
new file mode 100644
index 0000000..ce9b01b
--- /dev/null
+++ b/debian/patches/c++11
@@ -0,0 +1,24 @@
+Description: Compile as c++11 source
+ re2 since 20160301 uses C++11 atomics
+Author: Stefano Rivera <stefanor at debian.org>
+Bug-Debian: https://bugs.debian.org/820937
+Forwarded: https://github.com/janestreet/re2/pull/12
+
+--- ocaml-re2-113.00.00+dfsg.orig/src/Makefile
++++ ocaml-re2-113.00.00+dfsg/src/Makefile
+@@ -1,5 +1,5 @@
+ CXX?=g++
+-CXXFLAGS += -I $(RE2_HOME)/re2
++CXXFLAGS += -I $(RE2_HOME)/re2 -std=c++11
+ 
+ all: libre2_stubs.a dllre2_stubs.so
+ 
+@@ -7,7 +7,7 @@ dllre2_stubs.so libre2_stubs.a: stubs.o
+ 	ocamlmklib -oc re2_stubs stubs.o -lre2 -lstdc++
+ 
+ stubs.o: stubs.cpp stubs.h util.h enum_x_macro.h
+-	$(CXX) -O2 -DPIC -fPIC -g -pipe -DCAML_NAME_SPACE -Wall -I. -I../../../include \
++	$(CXX) $(CXXFLAGS) -O2 -DPIC -fPIC -g -pipe -DCAML_NAME_SPACE -Wall -I. -I../../../include \
+ 	-I$(ocaml-version-selected-include-path) -c stubs.cpp
+ 
+ #stubs.o: %.o: %.cpp %.h
diff --git a/debian/patches/series b/debian/patches/series
index bf11ff1..fe16892 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 0001-Use-system-provided-libre2.patch
 0002-Fix-syntax-errors-in-ocamldoc-formatting.patch
+c++11
diff --git a/debian/source/local-options b/debian/source/local-options
deleted file mode 100644
index 9cdfca9..0000000
--- a/debian/source/local-options
+++ /dev/null
@@ -1,2 +0,0 @@
-unapply-patches
-abort-on-upstream-changes

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