From 497230996fc7b5d840944120c55a579a481f81b1 Mon Sep 17 00:00:00 2001
From: Jerry James <loganjerry@gmail.com>
Date: Thu, 3 Aug 2023 15:45:29 -0600
Subject: [PATCH] Update the bytecode patch for pplite

---
 apron-ocaml-bytecode.patch | 38 +++++++++++++++++++++++++++-----------
 1 file changed, 27 insertions(+), 11 deletions(-)

diff --git a/apron-ocaml-bytecode.patch b/apron-ocaml-bytecode.patch
index 3aef818..a2cde5f 100644
--- a/apron-ocaml-bytecode.patch
+++ b/apron-ocaml-bytecode.patch
@@ -1,5 +1,5 @@
---- configure.orig	2023-07-06 09:11:46.000000000 -0600
-+++ configure	2023-07-07 14:27:55.531360311 -0600
+--- configure.orig	2023-07-09 03:58:59.000000000 -0600
++++ configure	2023-08-03 10:31:47.025342309 -0600
 @@ -461,8 +461,8 @@ fi
  # OCaml environment
  
@@ -20,9 +20,9 @@
  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:
+--- Makefile.orig	2023-07-09 03:58:59.000000000 -0600
++++ Makefile	2023-08-03 10:33:42.808819292 -0600
+@@ -65,11 +65,11 @@ aprontop:
  
  apronppltop:
  	$(OCAMLMKTOP) -I $(MLGMPIDL_LIB) -I $(APRON_LIB) -verbose -o $@ \
@@ -31,6 +31,11 @@
  
  apronpplitetop:
  	$(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:
  rebuild:
  	@echo "$(MAKE) rebuild is no longer necessary"
@@ -70,7 +75,7 @@
  	$(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) \
+@@ -113,17 +113,17 @@ disjunction) \
  
  ifneq ($(HAS_PPL),)
  OCAMLFIND_FILES += \
@@ -81,7 +86,9 @@
  	$(patsubst %,products/%, $(subst xxx,polkaGrid, $(OCAMLFIND_PROTO)))
  endif
  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
  ifneq ($(HAS_GLPK),)
  OCAMLFIND_FILES += \
@@ -90,8 +97,8 @@
  	$(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
+--- mlapronidl/META.in.orig	2023-07-09 03:58:59.000000000 -0600
++++ mlapronidl/META.in	2023-08-03 10:31:47.026342295 -0600
 @@ -3,85 +3,57 @@ version = "@VERSION@"
  requires = "apron.apron"
  package "apron" (
@@ -179,8 +186,8 @@
 -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
+--- mlapronidl/META.ppl.in.orig	2023-07-09 03:58:59.000000000 -0600
++++ mlapronidl/META.ppl.in	2023-08-03 10:31:47.026342295 -0600
 @@ -1,12 +1,8 @@
  package "ppl" (
  requires = "apron.apron"
@@ -194,3 +201,12 @@
 -archive(native) = "polkaGrid.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"
+ )