[Pkg-ocaml-maint-commits] [SCM] ocaml-extunix packaging branch, master, updated. debian/0.0.3-1-4-g5bd704c

[Stephane Glondu]

The following commit has been merged in the master branch:
commit 91994cb046f219017758dced5424dc1a669fbf49
Author: Stephane Glondu <steph at glondu.net>
Date:   Thu Aug 11 13:16:40 2011 +0200

    Revert "Compile with -funwind-tables on ARM CPUs"
    
    This reverts commit 7944054cc835b5e3e73c856cfd701e988a410730.

diff --git a/debian/patches/0001-Add-possibility-to-pass-flags-through-environment.patch b/debian/patches/0001-Add-possibility-to-pass-flags-through-environment.patch
deleted file mode 100644
index eb79dcf..0000000
--- a/debian/patches/0001-Add-possibility-to-pass-flags-through-environment.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From: Stephane Glondu <steph at glondu.net>
-Date: Tue, 12 Jul 2011 18:32:51 +0200
-Subject: Add possibility to pass flags through environment
-
-Signed-off-by: Stephane Glondu <steph at glondu.net>
----
- myocamlbuild.ml |    1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
-
-diff --git a/myocamlbuild.ml b/myocamlbuild.ml
-index 10b4d6a..4b34847 100644
---- a/myocamlbuild.ml
-+++ b/myocamlbuild.ml
-@@ -464,6 +464,7 @@ let package_default =
-                     OASISExpr.ETest ("ccomp_type", "cc")),
-                  S
-                    [
-+                      (try Sh (Sys.getenv "CAML_EXTRA_FLAGS") with Not_found -> N);
-                       A "-ccopt";
-                       A "-std=c89";
-                       A "-ccopt";
--- 
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index b963ecd..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-0001-Add-possibility-to-pass-flags-through-environment.patch
diff --git a/debian/rules b/debian/rules
index 7d33fe5..fd8c318 100755
--- a/debian/rules
+++ b/debian/rules
@@ -13,10 +13,6 @@ export OCAMLFIND_DESTDIR
 OCAMLFIND_LDCONF=ignore
 export OCAMLFIND_LDCONF
 
-ifeq ($(shell dpkg-architecture -qDEB_BUILD_ARCH_CPU),arm)
-   export CAML_EXTRA_FLAGS=-ccopt -funwind-tables
-endif
-
 %:
 	dh --with ocaml $@
 

-- 
ocaml-extunix packaging