e1a5c904ae
Other changes: - Drop upstreamed mpfr and custom-operations patches - Enable glpk support - Add patch to fix builds on bytecode-only architectures
197 lines
6.9 KiB
Diff
197 lines
6.9 KiB
Diff
--- configure.orig 2023-07-06 09:11:46.000000000 -0600
|
|
+++ configure 2023-07-07 14:27:55.531360311 -0600
|
|
@@ -461,8 +461,8 @@ fi
|
|
# OCaml environment
|
|
|
|
# check OCaml binaries
|
|
-if test $has_ocaml -eq 1; then searchbin "ocamlc.opt"; has_ocaml=$?; ocamlc="$path"; fi
|
|
-if test $has_ocaml -eq 1; then searchbin "ocamlopt.opt"; has_ocaml=$?; ocamlopt="$path"; fi
|
|
+if test $has_ocaml -eq 1; then searchbin "ocamlc"; has_ocaml=$?; ocamlc="$path"; fi
|
|
+ocamlopt=true
|
|
if test $has_ocaml -eq 1; then searchbin "ocamldep"; has_ocaml=$?; ocamldep="$path"; fi
|
|
if test $has_ocaml -eq 1; then searchbin "ocamllex"; has_ocaml=$?; ocamllex="$path"; fi
|
|
if test $has_ocaml -eq 1; then searchbin "ocamlyacc"; has_ocaml=$?; ocamlyacc="$path"; fi
|
|
@@ -639,7 +639,7 @@ cat > Makefile.config <<EOF
|
|
# generated by ./configure
|
|
|
|
HAS_OCAML = $has_ocaml
|
|
-HAS_OCAMLOPT = $has_ocaml
|
|
+HAS_OCAMLOPT =
|
|
HAS_NATIVE_PLUGINS = $has_ocaml_plugins
|
|
HAS_MPFR = 1
|
|
HAS_PPL = $has_ppl
|
|
--- Makefile.orig 2023-07-06 09:11:46.000000000 -0600
|
|
+++ Makefile 2023-07-07 14:32:50.254352985 -0600
|
|
@@ -65,7 +65,7 @@ aprontop:
|
|
|
|
apronppltop:
|
|
$(OCAMLMKTOP) -I $(MLGMPIDL_LIB) -I $(APRON_LIB) -verbose -o $@ \
|
|
- bigarray.cma gmp.cma apron.cma boxMPQ.cma octMPQ.cma polkaMPQ.cma ppl.cma polkaGrid.cma t1pMPQ.cmxa avoMPQ.cma
|
|
+ bigarray.cma gmp.cma apron.cma boxMPQ.cma octMPQ.cma polkaMPQ.cma ppl.cma polkaGrid.cma t1pMPQ.cma avoMPQ.cma
|
|
|
|
apronpplitetop:
|
|
$(OCAMLMKTOP) -I $(MLGMPIDL_LIB) -I $(APRON_LIB) -verbose -o $@ \
|
|
@@ -78,7 +78,7 @@ apronglpktop:
|
|
rebuild:
|
|
@echo "$(MAKE) rebuild is no longer necessary"
|
|
|
|
-OCAMLFIND_PROTO = xxx.cma $(call OCAMLOPT_TARGETS, xxx) libxxx_caml.a
|
|
+OCAMLFIND_PROTO = xxx.cma libxxx_caml.a
|
|
ifneq ($(HAS_DEBUG),)
|
|
OCAMLFIND_PROTO += $(call OCAMLOPT_TARGETS, xxx.d) libxxx_caml_debug.a
|
|
endif
|
|
@@ -86,23 +86,23 @@ ifneq ($(HAS_SHARED),)
|
|
OCAMLFIND_PROTO += dllxxx_caml.$(EXT_DLL)
|
|
endif
|
|
OCAMLFIND_FILES = \
|
|
- $(patsubst %,mlapronidl/%, apron.cmi apron.cmx) \
|
|
+ $(patsubst %,mlapronidl/%, apron.cmi) \
|
|
$(patsubst %,mlapronidl/%, $(subst xxx,apron, $(OCAMLFIND_PROTO))) \
|
|
- $(patsubst %,box/%, box.mli box.cmi box.cmx) \
|
|
+ $(patsubst %,box/%, box.mli box.cmi) \
|
|
$(patsubst %,box/%, $(subst xxx,boxD, $(OCAMLFIND_PROTO))) \
|
|
$(patsubst %,box/%, $(subst xxx,boxMPQ, $(OCAMLFIND_PROTO))) \
|
|
$(patsubst %,box/%, $(subst xxx,boxMPFR, $(OCAMLFIND_PROTO))) \
|
|
- $(patsubst %,octagons/%, oct.mli oct.cmi oct.cmx) \
|
|
+ $(patsubst %,octagons/%, oct.mli oct.cmi) \
|
|
$(patsubst %,octagons/%, $(subst xxx,octD, $(OCAMLFIND_PROTO))) \
|
|
$(patsubst %,octagons/%, $(subst xxx,octMPQ, $(OCAMLFIND_PROTO))) \
|
|
- $(patsubst %,newpolka/%, polka.mli polka.cmi polka.cmx) \
|
|
+ $(patsubst %,newpolka/%, polka.mli polka.cmi) \
|
|
$(patsubst %,newpolka/%, $(subst xxx,polkaMPQ, $(OCAMLFIND_PROTO))) \
|
|
$(patsubst %,newpolka/%, $(subst xxx,polkaRll, $(OCAMLFIND_PROTO))) \
|
|
- $(patsubst %,taylor1plus/%, t1p.mli t1p.cmi t1p.cmx) \
|
|
+ $(patsubst %,taylor1plus/%, t1p.mli t1p.cmi) \
|
|
$(patsubst %,taylor1plus/%, $(subst xxx,t1pD, $(OCAMLFIND_PROTO))) \
|
|
$(patsubst %,taylor1plus/%, $(subst xxx,t1pMPQ, $(OCAMLFIND_PROTO))) \
|
|
$(patsubst %,taylor1plus/%, $(subst xxx,t1pMPFR, $(OCAMLFIND_PROTO))) \
|
|
- $(patsubst %,avoct/%, avo.mli avo.cmi avo.cmx) \
|
|
+ $(patsubst %,avoct/%, avo.mli avo.cmi) \
|
|
$(patsubst %,avoct/%, $(subst xxx,avoD, $(OCAMLFIND_PROTO))) \
|
|
$(patsubst %,avoct/%, $(subst xxx,avoMPQ, $(OCAMLFIND_PROTO))) \
|
|
$(patsubst %,mlapronidl/%.idl, scalar interval coeff \
|
|
@@ -113,8 +113,8 @@ disjunction) \
|
|
|
|
ifneq ($(HAS_PPL),)
|
|
OCAMLFIND_FILES += \
|
|
- $(patsubst %,ppl/%, ppl.idl ppl.mli ppl.cmi ppl.cma ppl.cmx $(call OCAMLOPT_TARGETS, ppl) libap_ppl_caml.a dllap_ppl_caml.$(EXT_DLL)) \
|
|
- $(patsubst %,products/%, polkaGrid.idl polkaGrid.mli polkaGrid.cmi polkaGrid.cmx) \
|
|
+ $(patsubst %,ppl/%, ppl.idl ppl.mli ppl.cmi ppl.cma libap_ppl_caml.a dllap_ppl_caml.$(EXT_DLL)) \
|
|
+ $(patsubst %,products/%, polkaGrid.idl polkaGrid.mli polkaGrid.cmi) \
|
|
$(patsubst %,products/%, $(subst xxx,polkaGrid, $(OCAMLFIND_PROTO)))
|
|
endif
|
|
ifneq ($(HAS_PPLITE),)
|
|
@@ -123,7 +123,7 @@ OCAMLFIND_FILES += \
|
|
endif
|
|
ifneq ($(HAS_GLPK),)
|
|
OCAMLFIND_FILES += \
|
|
- $(patsubst %,fppol/%, fpp.mli fpp.cmi fpp.cmx) \
|
|
+ $(patsubst %,fppol/%, fpp.mli fpp.cmi) \
|
|
$(patsubst %,fppol/%, $(subst xxx,fppD, $(OCAMLFIND_PROTO)))
|
|
endif
|
|
ifneq ($(OCAMLPACK),)
|
|
--- mlapronidl/META.in.orig 2023-07-06 09:11:46.000000000 -0600
|
|
+++ mlapronidl/META.in 2023-07-07 14:39:51.442636710 -0600
|
|
@@ -3,85 +3,57 @@ version = "@VERSION@"
|
|
requires = "apron.apron"
|
|
package "apron" (
|
|
requires = "gmp"
|
|
-archive(native,debug) = "apron.d.cmxa"
|
|
archive(byte) = "apron.cma"
|
|
-archive(native) = "apron.cmxa"
|
|
)
|
|
package "boxD" (
|
|
requires = "apron.apron"
|
|
archive(byte) = "boxD.cma"
|
|
-archive(native) = "boxD.cmxa"
|
|
-archive(native,debug) = "boxD.d.cmxa"
|
|
)
|
|
package "boxMPQ" (
|
|
requires = "apron.apron"
|
|
archive(byte) = "boxMPQ.cma"
|
|
-archive(native) = "boxMPQ.cmxa"
|
|
-archive(native,debug) = "boxMPQ.d.cmxa"
|
|
)
|
|
package "boxMPFR" (
|
|
requires = "apron.apron"
|
|
archive(byte) = "boxMPFR.cma"
|
|
-archive(native) = "boxMPFR.cmxa"
|
|
-archive(native,debug) = "boxMPFR.d.cmxa"
|
|
)
|
|
package "octD" (
|
|
requires = "apron.apron"
|
|
archive(byte) = "octD.cma"
|
|
-archive(native) = "octD.cmxa"
|
|
-archive(native,debug) = "octD.d.cmxa"
|
|
)
|
|
package "octMPQ" (
|
|
requires = "apron.apron"
|
|
archive(byte) = "octMPQ.cma"
|
|
-archive(native) = "octMPQ.cmxa"
|
|
-archive(native,debug) = "octMPQ.d.cmxa"
|
|
)
|
|
package "polkaMPQ" (
|
|
requires = "apron.apron"
|
|
-archive(native,debug) = "polkaMPQ.d.cmxa"
|
|
archive(byte) = "polkaMPQ.cma"
|
|
-archive(native) = "polkaMPQ.cmxa"
|
|
)
|
|
package "polkaRll" (
|
|
requires = "apron.apron"
|
|
-archive(native,debug) = "polkaRll.d.cmxa"
|
|
archive(byte) = "polkaRll.cma"
|
|
-archive(native) = "polkaRll.cmxa"
|
|
)
|
|
package "t1pD" (
|
|
requires = "apron.apron"
|
|
-archive(native,debug) = "t1pD.d.cmxa"
|
|
archive(byte) = "t1pD.cma"
|
|
-archive(native) = "t1pD.cmxa"
|
|
)
|
|
package "t1pMPQ" (
|
|
requires = "apron.apron"
|
|
-archive(native,debug) = "t1pMPQ.d.cmxa"
|
|
archive(byte) = "t1pMPQ.cma"
|
|
-archive(native) = "t1pMPQ.cmxa"
|
|
)
|
|
package "t1pMPFR" (
|
|
requires = "apron.apron"
|
|
-archive(native,debug) = "t1pMPFR.d.cmxa"
|
|
archive(byte) = "t1pMPFR.cma"
|
|
-archive(native) = "t1pMPFR.cmxa"
|
|
)
|
|
package "avoD" (
|
|
requires = "apron.apron"
|
|
archive(byte) = "avoD.cma"
|
|
-archive(native) = "avoD.cmxa"
|
|
-archive(native,debug) = "avoD.d.cmxa"
|
|
)
|
|
package "avoMPQ" (
|
|
requires = "apron.apron"
|
|
archive(byte) = "avoMPQ.cma"
|
|
-archive(native) = "avoMPQ.cmxa"
|
|
-archive(native,debug) = "avoMPQ.d.cmxa"
|
|
)
|
|
package "fppD" (
|
|
requires = "apron.apron"
|
|
archive(byte) = "fppD.cma"
|
|
-archive(native) = "fppD.cmxa"
|
|
-archive(native,debug) = "fppD.d.cmxa"
|
|
)
|
|
\ No newline at end of file
|
|
--- mlapronidl/META.ppl.in.orig 2023-07-06 09:11:46.000000000 -0600
|
|
+++ mlapronidl/META.ppl.in 2023-07-07 14:39:51.442636710 -0600
|
|
@@ -1,12 +1,8 @@
|
|
package "ppl" (
|
|
requires = "apron.apron"
|
|
archive(byte) = "ppl.cma"
|
|
-archive(native) = "ppl.cmxa"
|
|
-archive(native,debug) = "ppl.d.cmxa"
|
|
)
|
|
package "polkaGrid" (
|
|
requires = "apron.apron apron.ppl apron.polkaMPQ"
|
|
archive(byte) = "polkaGrid.cma"
|
|
-archive(native) = "polkaGrid.cmxa"
|
|
-archive(native,debug) = "polkaGrid.d.cmxa"
|
|
)
|