[Pkg-ocaml-maint-commits] [SCM] apron packaging branch, master, updated. debian/0.9.10-1-2-gbd33cd5
Samuel Mimram
samuel.mimram at ens-lyon.org
Mon Nov 16 23:02:42 UTC 2009
The following commit has been merged in the master branch:
commit bd33cd52146f4d2e5beeef5c53e2a47bfaa23a60
Author: Samuel Mimram <samuel.mimram at ens-lyon.org>
Date: Thu Oct 29 21:59:28 2009 +0100
Patch in order to be able to build on non-native archs.
diff --git a/debian/changelog b/debian/changelog
index 49c8577..74abd47 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
apron (0.9.10-2) unstable; urgency=low
* Enable PPL support.
+ * Add nonopt patch in order to be able to build on non-native archs.
- -- Samuel Mimram <smimram at debian.org> Mon, 26 Oct 2009 23:42:06 +0100
+ -- Samuel Mimram <smimram at debian.org> Thu, 29 Oct 2009 21:58:00 +0100
apron (0.9.10-1) unstable; urgency=low
diff --git a/debian/patches/nonopt.diff b/debian/patches/nonopt.diff
new file mode 100644
index 0000000..e791051
--- /dev/null
+++ b/debian/patches/nonopt.diff
@@ -0,0 +1,175 @@
+Index: apron/mlgmpidl/Makefile
+===================================================================
+--- apron.orig/mlgmpidl/Makefile 2009-10-29 21:33:24.000000000 +0100
++++ apron/mlgmpidl/Makefile 2009-10-29 21:33:24.000000000 +0100
+@@ -83,7 +83,11 @@
+ # Rules
+ #---------------------------------------
+
+-all: $(MLSRC) $(MLINT) $(MLOBJ) $(MLOBJx) gmp.cma gmp.cmxa libgmp_caml.a
++all: $(MLSRC) $(MLINT) $(MLOBJ) gmp.cma libgmp_caml.a
++
++ifeq ($(OCAML_BEST),"opt")
++all: $(MLOBJx) gmp.cmxa
++endif
+
+ ifneq ($(HAS_SHARED),)
+ all: libgmp_caml.so
+Index: apron/apron/mlapronidl/Makefile
+===================================================================
+--- apron.orig/apron/mlapronidl/Makefile 2009-10-29 21:33:24.000000000 +0100
++++ apron/apron/mlapronidl/Makefile 2009-10-29 21:38:54.000000000 +0100
+@@ -58,7 +58,11 @@
+ # Rules
+ #---------------------------------------
+
+-all: apron.cmi apron.cmx apron.cma apron.cmxa apron.a libapron_caml.a libapron_caml_debug.a
++all: apron.cmi apron.cma libapron_caml.a libapron_caml_debug.a
++
++ifeq ($(OCAML_BEST),opt)
++all: apron.cmx apron.cmxa apron.a
++endif
+
+ ifneq ($(HAS_SHARED),)
+ all: libapron_caml.so libapron_caml_debug.so dllapron_caml.so dllapron_caml_debug.so
+@@ -94,12 +98,16 @@
+ /bin/rm -f $(CCLIB_TOINSTALL:%=$(APRON_PREFIX)/lib/%)
+ /bin/rm -f $(CCINC_TOINSTALL:%=$(APRON_PREFIX)/include/%)
+
+-install: $(MLLIB_TOINSTALL) $(MLLIB_TOINSTALLx) $(CCLIB_TOINSTALL) $(CCINC_TOINSTALL)
++install: $(MLLIB_TOINSTALL) $(CCLIB_TOINSTALL) $(CCINC_TOINSTALL)
+ mkdir -p $(APRON_PREFIX)/lib
+ mkdir -p $(APRON_PREFIX)/include
+ for i in $(MLLIB_TOINSTALL) $(MLLIB_TOINSTALLx) $(CCLIB_TOINSTALL); do if test -f $$i; then cp -f -d $$i $(APRON_PREFIX)/lib; fi; done
+ $(INSTALL) $(CCINC_TOINSTALL) $(APRON_PREFIX)/include
+
++ifeq ($(OCAML_BEST),opt)
++install: $(MLLIB_TOINSTALLx)
++endif
++
+ #---------------------------------------
+ # Library rules
+ #---------------------------------------
+Index: apron/apron/newpolka/Makefile
+===================================================================
+--- apron.orig/apron/newpolka/Makefile 2009-10-29 21:33:24.000000000 +0100
++++ apron/apron/newpolka/Makefile 2009-10-29 21:33:24.000000000 +0100
+@@ -83,10 +83,17 @@
+ allRll: libpolkaRll.so libpolkaRll_debug.so
+ endif
+
+-ml: polka.mli polka.ml polka.cmi polka.cmx polka.a mlMPQ mlRll polka.cma polka.cmxa
++ml: polka.mli polka.ml polka.cmi mlMPQ mlRll polka.cma
++ifeq ($(OCAML_BEST),opt)
++ml: polka.cmx polka.cmxa polka.a
++endif
+
+-mlMPQ: polkaMPQ.cma polkaMPQ.cmxa libpolkaMPQ_caml.a libpolkaMPQ_caml_debug.a
+-mlRll: polkaRll.cma polkaRll.cmxa libpolkaRll_caml.a libpolkaRll_caml_debug.a
++mlMPQ: polkaMPQ.cma libpolkaMPQ_caml.a libpolkaMPQ_caml_debug.a
++mlRll: polkaRll.cma libpolkaRll_caml.a libpolkaRll_caml_debug.a
++ifeq ($(OCAML_BEST),opt)
++mlMPQ: polkaMPQ.cmxa
++mlRll: polkaRll.cmxa
++endif
+ ifneq ($(HAS_SHARED),)
+ mlMPQ: libpolkaMPQ_caml.so libpolkaMPQ_caml_debug.so dllpolkaMPQ_caml.so dllpolkaMPQ_caml_debug.so
+ mlRll: libpolkaRll_caml.so libpolkaRll_caml_debug.so dllpolkaRll_caml.so dllpolkaRll_caml_debug.so
+Index: apron/apron/box/Makefile
+===================================================================
+--- apron.orig/apron/box/Makefile 2009-10-29 21:33:24.000000000 +0100
++++ apron/apron/box/Makefile 2009-10-29 21:33:24.000000000 +0100
+@@ -71,11 +71,17 @@
+ allMPFR: libboxMPFR.so libboxMPFR_debug.so
+ endif
+
+-ml: box.mli box.ml box.cmi box.cmx box.a mlMPQ mlD mlMPFR box.cma box.cmxa
++ml: box.mli box.ml box.cmi mlMPQ mlD mlMPFR box.cma
+
+-mlMPQ: boxMPQ.cma boxMPQ.cmxa libboxMPQ_caml.a libboxMPQ_caml_debug.a
+-mlD: boxD.cma boxD.cmxa libboxD_caml.a libboxD_caml_debug.a
+-mlMPFR: boxMPFR.cma boxMPFR.cmxa libboxMPFR_caml.a libboxMPFR_caml_debug.a
++mlMPQ: boxMPQ.cma libboxMPQ_caml.a libboxMPQ_caml_debug.a
++mlD: boxD.cma libboxD_caml.a libboxD_caml_debug.a
++mlMPFR: boxMPFR.cma libboxMPFR_caml.a libboxMPFR_caml_debug.a
++ifeq ($(OCAML_BEST),opt)
++ml: box.cmx box.a box.cmxa
++mlMPQ: boxMPQ.cmxa
++mlD: boxD.cmxa
++mlMPFR: boxMPFR.cmxa
++endif
+ ifneq ($(HAS_SHARED),)
+ mlMPQ: libboxMPQ_caml.so libboxMPQ_caml_debug.so dllboxMPQ_caml.so dllboxMPQ_caml_debug.so
+ mlD: libboxD_caml.so libboxD_caml_debug.so dllboxD_caml.so dllboxD_caml_debug.so
+Index: apron/apron/octagons/Makefile
+===================================================================
+--- apron.orig/apron/octagons/Makefile 2009-10-29 21:33:24.000000000 +0100
++++ apron/apron/octagons/Makefile 2009-10-29 21:33:24.000000000 +0100
+@@ -243,15 +243,26 @@
+
+ .INTERMEDIATE: mlIl
+
+-ml: oct.mli oct.cmi oct.cmx oct.cma oct.cmxa oct.a
+-mlIl: ml octIl.cma octIl.cmxa liboctIl_caml.a liboctIl_caml_debug.a
+-mlIll: ml octIll.cma octIll.cmxa liboctIll_caml.a liboctIll_caml_debug.a
+-mlMPZ: ml octMPZ.cma octMPZ.cmxa liboctMPZ_caml.a liboctMPZ_caml_debug.a
+-mlRll: ml octRll.cma octRll.cmxa liboctRll_caml.a liboctRll_caml_debug.a
+-mlMPQ: ml octMPQ.cma octMPQ.cmxa liboctMPQ_caml.a liboctMPQ_caml_debug.a
+-mlD: ml octD.cma octD.cmxa liboctD_caml.a liboctD_caml_debug.a
+-mlDl: ml octDl.cma octDl.cmxa liboctDl_caml.a liboctDl_caml_debug.a
++ml: oct.mli oct.cmi oct.cma
++mlIl: ml octIl.cma liboctIl_caml.a liboctIl_caml_debug.a
++mlIll: ml octIll.cma liboctIll_caml.a liboctIll_caml_debug.a
++mlMPZ: ml octMPZ.cma liboctMPZ_caml.a liboctMPZ_caml_debug.a
++mlRll: ml octRll.cma liboctRll_caml.a liboctRll_caml_debug.a
++mlMPQ: ml octMPQ.cma liboctMPQ_caml.a liboctMPQ_caml_debug.a
++mlD: ml octD.cma liboctD_caml.a liboctD_caml_debug.a
++mlDl: ml octDl.cma liboctDl_caml.a liboctDl_caml_debug.a
+ mlMPFR: ml octMPFR.cma octMPFR.cmxa liboctMPFR_caml.a liboctMPFR_caml_debug.a
++ifeq ($(OCAML_BEST),opt)
++ml: oct.cmx oct.cmxa oct.a
++mlIl: octIl.cmxa
++mlIll: octIll.cmxa
++mlMPZ: octMPZ.cmxa
++mlRll: octRll.cmxa
++mlMPQ: octMPQ.cmxa
++mlD: octD.cmxa
++mlDl: octDl.cmxa
++mlMPFR: octMPFR.cmxa
++endif
+ ifneq ($(HAS_SHARED),)
+ mlIl: liboctIl_caml.so liboctIl_caml_debug.so dlloctIl_caml.so dlloctIl_caml_debug.so
+ mlIll:liboctIll_caml.so liboctIll_caml_debug.so dlloctIll_caml.so dlloctIll_caml_debug.so
+Index: apron/apron/ppl/Makefile
+===================================================================
+--- apron.orig/apron/ppl/Makefile 2009-10-29 21:33:24.000000000 +0100
++++ apron/apron/ppl/Makefile 2009-10-29 21:33:24.000000000 +0100
+@@ -154,7 +154,11 @@
+ # Caml part
+ #-----------------------------------
+
+-ml: ppl.cma ppl.cmxa libap_ppl_caml.a libap_ppl_caml_debug.a
++ml: ppl.cma libap_ppl_caml.a libap_ppl_caml_debug.a
++
++ifeq ($(OCAML_BEST),opt)
++ml: ppl.cmxa
++endif
+
+ ifneq ($(HAS_SHARED),)
+ ml: libap_ppl_caml.so libap_ppl_caml_debug.so dllap_ppl_caml.so dllap_ppl_caml_debug.so
+Index: apron/apron/products/Makefile
+===================================================================
+--- apron.orig/apron/products/Makefile 2009-10-29 21:39:24.000000000 +0100
++++ apron/apron/products/Makefile 2009-10-29 21:40:02.000000000 +0100
+@@ -48,7 +48,10 @@
+ all: libap_pkgrid.so libap_pkgrid_debug.so
+ endif
+
+-ml: polkaGrid.mli polkaGrid.ml polkaGrid.cmi polkaGrid.cmx polkaGrid.cma polkaGrid.cmxa libpolkaGrid_caml.a libpolkaGrid_caml_debug.a
++ml: polkaGrid.mli polkaGrid.ml polkaGrid.cmi polkaGrid.cma libpolkaGrid_caml.a libpolkaGrid_caml_debug.a
++ifeq ($(OCAML_BEST),opt)
++ml: polkaGrid.cmx polkaGrid.cmxa
++endif
+ ifneq ($(HAS_SHARED),)
+ ml: libpolkaGrid_caml.so libpolkaGrid_caml_debug.so dllpolkaGrid_caml.so dllpolkaGrid_caml_debug.so
+ endif
diff --git a/debian/patches/series b/debian/patches/series
index a754cb3..00cda0e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
rpath.diff
soname.diff
+nonopt.diff
diff --git a/debian/rules b/debian/rules
index 9db84c9..d8409bf 100755
--- a/debian/rules
+++ b/debian/rules
@@ -17,6 +17,9 @@ override_dh_auto_configure:
echo "MLGMPIDL_PREFIX = $(CURDIR)/debian/tmp/usr" >> Makefile.config
ifneq ($(OCAML_OPT_ARCH),)
echo "OPT=.opt" >> Makefile.config
+ echo "OCAML_BEST=opt" >> Makefile.config
+else
+ echo "OCAML_BEST=byte" >> Makefile.config
endif
.PHONY: override_dh_auto_build
--
apron packaging
More information about the Pkg-ocaml-maint-commits
mailing list