From e31f6bcf5e95ab0067b7b14432d2bac9a046ce92 Mon Sep 17 00:00:00 2001
From: Jerry James <loganjerry@gmail.com>
Date: Feb 28 2020 22:24:56 +0000
Subject: Fix the build on i386.


---

diff --git a/pvs-fedora.patch b/pvs-fedora.patch
index 8c0fdc9..3167724 100644
--- a/pvs-fedora.patch
+++ b/pvs-fedora.patch
@@ -47,6 +47,45 @@
  
  #+cmu
  (eval-when (:execute :compile-toplevel :load-toplevel)
+--- a/src/utils/ix86-Linux/Makefile
++++ b/src/utils/ix86-Linux/Makefile
+@@ -1,4 +1,4 @@
+-LD = ld
++LD = gcc
+ LDFLAGS = -shared -L./
+ CC=gcc
+ CFLAGS=-fPIC
+@@ -14,7 +14,7 @@ obj=file_utils.o
+ all : file_utils.so b64
+ 
+ file_utils.so: ${obj}
+-	$(LD) ../utils-ld-table $(LDFLAGS) -o file_utils.so ${obj} -lc
++	$(LD) ../utils-ld-table $(LDFLAGS) -o file_utils.so ${obj}
+ 
+ b64: ../b64.c
+ 	$(CC) -o ./b64 ../b64.c
+--- a/src/WS1S/ix86_64-Linux/Makefile
++++ b/src/WS1S/ix86_64-Linux/Makefile
+@@ -37,7 +37,7 @@ ws1s_extended_interface.o : ../ws1s_exte
+ 	$(CC) $(XCFLAGS) ${CFLAGS} -c $< -o $@
+ 
+ ws1s.so : ${obj}
+-	$(CC) -shared $(CFLAGS) -o ws1s.so ${obj}
++	$(CC) -shared $(CFLAGS) -o ws1s.so ${obj} -lmonabdd
+ 
+ bdd.o: bdd.c bdd.h bdd_internal.h
+ bdd_double.o: bdd_double.c bdd.h bdd_internal.h
+--- a/src/WS1S/ix86-Linux/Makefile
++++ b/src/WS1S/ix86-Linux/Makefile
+@@ -36,7 +36,7 @@ ws1s_extended_interface.o : ../ws1s_exte
+ 	$(CC) $(XCFLAGS) ${CFLAGS} -c $< -o $@
+ 
+ ws1s.so : ${obj}
+-	$(CC) -shared $(CFLAGS) -o ws1s.so ${obj}
++	$(CC) -shared $(CFLAGS) -o ws1s.so ${obj} -lmonabdd
+ 
+ bdd.o: bdd.c bdd.h bdd_internal.h
+ bdd_double.o: bdd_double.c bdd.h bdd_internal.h
 --- a/src/WS1S/ws1s-ld-table
 +++ b/src/WS1S/ws1s-ld-table
 @@ -46,7 +46,7 @@ ws1s___dfaPrintVitals = dfaPrintVitals ;
diff --git a/pvs-sbcl.spec b/pvs-sbcl.spec
index 765ff89..9710d5b 100644
--- a/pvs-sbcl.spec
+++ b/pvs-sbcl.spec
@@ -129,7 +129,6 @@ sed -i "/XCFLAGS/s|-O|%{optflags}|" src/{BDD,WS1S}/%{pvsarch}-Linux/Makefile
 sed -i "/WFLAGS/s|-Wall|%{optflags}|" src/utils/%{pvsarch}-Linux/Makefile
 sed -i "s|^LDFLAGS =.*|& $RPM_LD_FLAGS|" \
     src/{BDD,utils,WS1S}/%{pvsarch}-Linux/Makefile
-sed -i "s|-o ws1s.so.*|& -lmonabdd|" src/WS1S/%{pvsarch}-Linux/Makefile
 
 # Make yices available where the build system expects it
 mkdir -p yices/%{pvsarch}-Linux/yices-2.6/bin