rpms/apron
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update the bytecode patch for pplite

Browse Source
This commit is contained in:
Jerry James 2023-08-03 15:45:29 -06:00
parent b7003b5cff
commit 497230996f
1 changed files with 27 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
apron-ocaml-bytecode.patch
View File

@ -1,5 +1,5 @@
--- configure.orig 2023-07-06 09:11:46.000000000 -0600 --- configure.orig 2023-07-09 03:58:59.000000000 -0600
+++ configure 2023-07-07 14:27:55.531360311 -0600 +++ configure 2023-08-03 10:31:47.025342309 -0600
@@ -461,8 +461,8 @@ fi @@ -461,8 +461,8 @@ fi
# OCaml environment # OCaml environment
@ -20,9 +20,9 @@
HAS_NATIVE_PLUGINS = $has_ocaml_plugins HAS_NATIVE_PLUGINS = $has_ocaml_plugins
HAS_MPFR = 1 HAS_MPFR = 1
HAS_PPL = $has_ppl HAS_PPL = $has_ppl
--- Makefile.orig 2023-07-06 09:11:46.000000000 -0600 --- Makefile.orig 2023-07-09 03:58:59.000000000 -0600
+++ Makefile 2023-07-07 14:32:50.254352985 -0600 +++ Makefile 2023-08-03 10:33:42.808819292 -0600
@@ -65,7 +65,7 @@ aprontop: @@ -65,11 +65,11 @@ aprontop:
apronppltop: apronppltop:
$(OCAMLMKTOP) -I $(MLGMPIDL_LIB) -I $(APRON_LIB) -verbose -o $@ \ $(OCAMLMKTOP) -I $(MLGMPIDL_LIB) -I $(APRON_LIB) -verbose -o $@ \
@ -31,6 +31,11 @@
apronpplitetop: apronpplitetop:
$(OCAMLMKTOP) -I $(MLGMPIDL_LIB) -I $(APRON_LIB) -verbose -o $@ \ $(OCAMLMKTOP) -I $(MLGMPIDL_LIB) -I $(APRON_LIB) -verbose -o $@ \
- bigarray.cma gmp.cma apron.cma boxMPQ.cma octMPQ.cma polkaMPQ.cma pplite.cma t1pMPQ.cmxa avoMPQ.cma
+ bigarray.cma gmp.cma apron.cma boxMPQ.cma octMPQ.cma polkaMPQ.cma pplite.cma t1pMPQ.cma avoMPQ.cma
apronglpktop:
$(OCAMLMKTOP) -I $(MLGMPIDL_LIB) -I $(APRON_LIB) -verbose -o $@ \
@@ -78,7 +78,7 @@ apronglpktop: @@ -78,7 +78,7 @@ apronglpktop:
rebuild: rebuild:
@echo "$(MAKE) rebuild is no longer necessary" @echo "$(MAKE) rebuild is no longer necessary"
@ -70,7 +75,7 @@
$(patsubst %,avoct/%, $(subst xxx,avoD, $(OCAMLFIND_PROTO))) \ $(patsubst %,avoct/%, $(subst xxx,avoD, $(OCAMLFIND_PROTO))) \
$(patsubst %,avoct/%, $(subst xxx,avoMPQ, $(OCAMLFIND_PROTO))) \ $(patsubst %,avoct/%, $(subst xxx,avoMPQ, $(OCAMLFIND_PROTO))) \
$(patsubst %,mlapronidl/%.idl, scalar interval coeff \ $(patsubst %,mlapronidl/%.idl, scalar interval coeff \
@@ -113,8 +113,8 @@ disjunction) \ @@ -113,17 +113,17 @@ disjunction) \
ifneq ($(HAS_PPL),) ifneq ($(HAS_PPL),)
OCAMLFIND_FILES += \ OCAMLFIND_FILES += \
@ -81,7 +86,9 @@
$(patsubst %,products/%, $(subst xxx,polkaGrid, $(OCAMLFIND_PROTO))) $(patsubst %,products/%, $(subst xxx,polkaGrid, $(OCAMLFIND_PROTO)))
endif endif
ifneq ($(HAS_PPLITE),) ifneq ($(HAS_PPLITE),)
@@ -123,7 +123,7 @@ OCAMLFIND_FILES += \ OCAMLFIND_FILES += \
- $(patsubst %,pplite/%, pplite.idl pplite.mli pplite.cmi pplite.cma pplite.cmx $(call OCAMLOPT_TARGETS, pplite) libap_pplite_caml.a dllap_pplite_caml.$(EXT_DLL))
+ $(patsubst %,pplite/%, pplite.idl pplite.mli pplite.cmi pplite.cma libap_pplite_caml.a dllap_pplite_caml.$(EXT_DLL))
endif endif
ifneq ($(HAS_GLPK),) ifneq ($(HAS_GLPK),)
OCAMLFIND_FILES += \ OCAMLFIND_FILES += \
@ -90,8 +97,8 @@
$(patsubst %,fppol/%, $(subst xxx,fppD, $(OCAMLFIND_PROTO))) $(patsubst %,fppol/%, $(subst xxx,fppD, $(OCAMLFIND_PROTO)))
endif endif
ifneq ($(OCAMLPACK),) ifneq ($(OCAMLPACK),)
--- mlapronidl/META.in.orig 2023-07-06 09:11:46.000000000 -0600 --- mlapronidl/META.in.orig 2023-07-09 03:58:59.000000000 -0600
+++ mlapronidl/META.in 2023-07-07 14:39:51.442636710 -0600 +++ mlapronidl/META.in 2023-08-03 10:31:47.026342295 -0600
@@ -3,85 +3,57 @@ version = "@VERSION@" @@ -3,85 +3,57 @@ version = "@VERSION@"
requires = "apron.apron" requires = "apron.apron"
package "apron" ( package "apron" (
@ -179,8 +186,8 @@
-archive(native,debug) = "fppD.d.cmxa" -archive(native,debug) = "fppD.d.cmxa"
) )
\ No newline at end of file \ No newline at end of file
--- mlapronidl/META.ppl.in.orig 2023-07-06 09:11:46.000000000 -0600 --- mlapronidl/META.ppl.in.orig 2023-07-09 03:58:59.000000000 -0600
+++ mlapronidl/META.ppl.in 2023-07-07 14:39:51.442636710 -0600 +++ mlapronidl/META.ppl.in 2023-08-03 10:31:47.026342295 -0600
@@ -1,12 +1,8 @@ @@ -1,12 +1,8 @@
package "ppl" ( package "ppl" (
requires = "apron.apron" requires = "apron.apron"
@ -194,3 +201,12 @@
-archive(native) = "polkaGrid.cmxa" -archive(native) = "polkaGrid.cmxa"
-archive(native,debug) = "polkaGrid.d.cmxa" -archive(native,debug) = "polkaGrid.d.cmxa"
) )
--- mlapronidl/META.pplite.in.orig 2023-07-09 03:58:59.000000000 -0600
+++ mlapronidl/META.pplite.in 2023-08-03 10:34:46.982976658 -0600
@@ -1,6 +1,4 @@
package "pplite" (
requires = "apron.apron"
archive(byte) = "pplite.cma"
-archive(native) = "pplite.cmxa"
-archive(native,debug) = "pplite.d.cmxa"
)