Control: tags 820937 + patch Control: tags 820937 + pending Control: forwarded 820937 https://github.com/janestreet/re2/pull/12
Dear maintainer, I've prepared an NMU for ocaml-re2 (versioned as 113.00.00+dfsg-2.1) and uploaded it to DELAYED/2. Please feel free to tell me if I should delay it longer. Regards, SR
diff -Nru ocaml-re2-113.00.00+dfsg/debian/changelog ocaml-re2-113.00.00+dfsg/debian/changelog --- ocaml-re2-113.00.00+dfsg/debian/changelog 2016-02-09 16:12:15.000000000 +0200 +++ ocaml-re2-113.00.00+dfsg/debian/changelog 2016-05-08 19:46:33.000000000 +0200 @@ -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 <stefa...@debian.org> Sun, 08 May 2016 19:12:14 +0200 + ocaml-re2 (113.00.00+dfsg-2) unstable; urgency=medium * Fix watch file diff -Nru ocaml-re2-113.00.00+dfsg/debian/patches/c++11 ocaml-re2-113.00.00+dfsg/debian/patches/c++11 --- ocaml-re2-113.00.00+dfsg/debian/patches/c++11 1970-01-01 02:00:00.000000000 +0200 +++ ocaml-re2-113.00.00+dfsg/debian/patches/c++11 2016-05-08 19:28:31.000000000 +0200 @@ -0,0 +1,24 @@ +Description: Compile as c++11 source + re2 since 20160301 uses C++11 atomics +Author: Stefano Rivera <stefa...@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 -Nru ocaml-re2-113.00.00+dfsg/debian/patches/series ocaml-re2-113.00.00+dfsg/debian/patches/series --- ocaml-re2-113.00.00+dfsg/debian/patches/series 2016-01-07 20:35:57.000000000 +0200 +++ ocaml-re2-113.00.00+dfsg/debian/patches/series 2016-05-08 19:13:59.000000000 +0200 @@ -1,2 +1,3 @@ 0001-Use-system-provided-libre2.patch 0002-Fix-syntax-errors-in-ocamldoc-formatting.patch +c++11
