|
 |
438cf10 |
--- Makefile.orig 2018-02-28 20:38:55.000000000 -0700
|
|
|
438cf10 |
+++ Makefile 2018-03-03 17:18:18.362557053 -0700
|
|
|
438cf10 |
@@ -20,7 +20,7 @@ MODULES := \
|
|
Jerry James |
575c8c7 |
src/map/mapper src/map/mio src/map/super src/map/if \
|
|
Jerry James |
575c8c7 |
src/map/amap src/map/cov src/map/scl src/map/mpm \
|
|
Jerry James |
575c8c7 |
src/misc/extra src/misc/mvc src/misc/st src/misc/util src/misc/nm \
|
|
Jerry James |
575c8c7 |
- src/misc/vec src/misc/hash src/misc/tim src/misc/bzlib src/misc/zlib \
|
|
Jerry James |
575c8c7 |
+ src/misc/vec src/misc/hash src/misc/tim \
|
|
|
744413f |
src/misc/mem src/misc/bar src/misc/bbl src/misc/parse \
|
|
 |
a19d415 |
src/opt/cut src/opt/fxu src/opt/fxch src/opt/rwr src/opt/mfs src/opt/sim \
|
|
|
744413f |
src/opt/ret src/opt/fret src/opt/res src/opt/lpk src/opt/nwk src/opt/rwt \
|
|
|
438cf10 |
@@ -69,6 +69,8 @@ endif
|
|
|
438cf10 |
|
|
|
438cf10 |
ABC_READLINE_INCLUDES ?=
|
|
|
438cf10 |
ABC_READLINE_LIBRARIES ?= -lreadline
|
|
|
438cf10 |
+LDFLAGS=-Wl,--as-needed
|
|
|
438cf10 |
+LIBS=-lbz2 -lz
|
|
|
438cf10 |
|
|
|
438cf10 |
# whether to use libreadline
|
|
|
438cf10 |
ifndef ABC_USE_NO_READLINE
|
|
|
438cf10 |
--- src/base/io/ioReadAiger.c.orig 2018-02-28 20:38:55.000000000 -0700
|
|
|
438cf10 |
+++ src/base/io/ioReadAiger.c 2018-03-03 17:15:48.083042510 -0700
|
|
Jerry James |
575c8c7 |
@@ -26,8 +26,8 @@
|
|
Jerry James |
575c8c7 |
#include <string.h>
|
|
Jerry James |
575c8c7 |
#include <assert.h>
|
|
Jerry James |
575c8c7 |
|
|
Jerry James |
575c8c7 |
-#include "misc/bzlib/bzlib.h"
|
|
Jerry James |
575c8c7 |
-#include "misc/zlib/zlib.h"
|
|
Jerry James |
575c8c7 |
+#include <bzlib.h>
|
|
Jerry James |
575c8c7 |
+#include <zlib.h>
|
|
Jerry James |
575c8c7 |
#include "ioAbc.h"
|
|
Jerry James |
575c8c7 |
|
|
Jerry James |
575c8c7 |
ABC_NAMESPACE_IMPL_START
|
|
|
438cf10 |
--- src/base/io/ioReadBlifMv.c.orig 2018-02-28 20:38:55.000000000 -0700
|
|
|
438cf10 |
+++ src/base/io/ioReadBlifMv.c 2018-03-03 17:15:48.084042506 -0700
|
|
Jerry James |
575c8c7 |
@@ -18,8 +18,8 @@
|
|
Jerry James |
575c8c7 |
|
|
Jerry James |
575c8c7 |
***********************************************************************/
|
|
Jerry James |
575c8c7 |
|
|
Jerry James |
575c8c7 |
-#include "misc/zlib/zlib.h"
|
|
Jerry James |
575c8c7 |
-#include "misc/bzlib/bzlib.h"
|
|
Jerry James |
575c8c7 |
+#include <zlib.h>
|
|
Jerry James |
575c8c7 |
+#include <bzlib.h>
|
|
Jerry James |
575c8c7 |
#include "base/abc/abc.h"
|
|
Jerry James |
575c8c7 |
#include "misc/vec/vecPtr.h"
|
|
Jerry James |
575c8c7 |
#include "ioAbc.h"
|
|
|
438cf10 |
--- src/base/io/ioWriteAiger.c.orig 2018-02-28 20:38:55.000000000 -0700
|
|
|
438cf10 |
+++ src/base/io/ioWriteAiger.c 2018-03-03 17:15:48.084042506 -0700
|
|
Jerry James |
575c8c7 |
@@ -26,8 +26,8 @@
|
|
Jerry James |
575c8c7 |
#include <string.h>
|
|
Jerry James |
575c8c7 |
#include <assert.h>
|
|
Jerry James |
575c8c7 |
|
|
Jerry James |
575c8c7 |
-#include "misc/bzlib/bzlib.h"
|
|
Jerry James |
575c8c7 |
-#include "misc/zlib/zlib.h"
|
|
Jerry James |
575c8c7 |
+#include <bzlib.h>
|
|
Jerry James |
575c8c7 |
+#include <zlib.h>
|
|
Jerry James |
575c8c7 |
#include "ioAbc.h"
|
|
Jerry James |
575c8c7 |
|
|
Jerry James |
575c8c7 |
|
|
|
438cf10 |
--- src/sat/bsat2/MainSat.cpp.orig 2018-02-28 20:38:55.000000000 -0700
|
|
|
438cf10 |
+++ src/sat/bsat2/MainSat.cpp 2018-03-03 17:15:48.084042506 -0700
|
|
|
d87bf10 |
@@ -21,7 +21,7 @@ OF OR IN CONNECTION WITH THE SOFTWARE OR
|
|
|
d87bf10 |
#include <errno.h>
|
|
|
d87bf10 |
|
|
|
d87bf10 |
#include <signal.h>
|
|
|
d87bf10 |
-#include "misc/zlib/zlib.h"
|
|
|
d87bf10 |
+#include <zlib.h>
|
|
|
d87bf10 |
|
|
|
d87bf10 |
#include "System.h"
|
|
|
d87bf10 |
#include "ParseUtils.h"
|
|
|
438cf10 |
--- src/sat/bsat2/MainSimp.cpp.orig 2018-02-28 20:38:55.000000000 -0700
|
|
|
438cf10 |
+++ src/sat/bsat2/MainSimp.cpp 2018-03-03 17:15:48.084042506 -0700
|
|
|
d87bf10 |
@@ -21,10 +21,10 @@ OF OR IN CONNECTION WITH THE SOFTWARE OR
|
|
|
d87bf10 |
#include <errno.h>
|
|
|
d87bf10 |
|
|
|
d87bf10 |
#include <signal.h>
|
|
|
d87bf10 |
-#include "misc/zlib/zlib.h"
|
|
|
d87bf10 |
-
|
|
|
d87bf10 |
+#include <zlib.h>
|
|
|
d87bf10 |
+
|
|
|
d87bf10 |
#ifndef _WIN32
|
|
|
d87bf10 |
-#include <sys/resource.h>
|
|
|
d87bf10 |
+#include <sys/resource.h>
|
|
|
d87bf10 |
#endif
|
|
|
d87bf10 |
|
|
|
d87bf10 |
#include "System.h"
|
|
|
438cf10 |
--- src/sat/bsat2/ParseUtils.h.orig 2018-02-28 20:38:55.000000000 -0700
|
|
|
438cf10 |
+++ src/sat/bsat2/ParseUtils.h 2018-03-03 17:15:48.085042503 -0700
|
|
|
d87bf10 |
@@ -24,7 +24,7 @@ OF OR IN CONNECTION WITH THE SOFTWARE OR
|
|
|
d87bf10 |
#include <stdlib.h>
|
|
|
d87bf10 |
#include <stdio.h>
|
|
|
d87bf10 |
|
|
|
d87bf10 |
-#include "misc/zlib/zlib.h"
|
|
|
d87bf10 |
+#include <zlib.h>
|
|
|
d87bf10 |
|
|
|
d87bf10 |
namespace Minisat {
|
|
|
d87bf10 |
|
|
|
438cf10 |
--- src/sat/cnf/cnfMan.c.orig 2018-02-28 20:38:55.000000000 -0700
|
|
|
438cf10 |
+++ src/sat/cnf/cnfMan.c 2018-03-03 17:15:48.085042503 -0700
|
|
Jerry James |
575c8c7 |
@@ -21,7 +21,7 @@
|
|
Jerry James |
575c8c7 |
#include "cnf.h"
|
|
Jerry James |
575c8c7 |
#include "sat/bsat/satSolver.h"
|
|
Jerry James |
575c8c7 |
#include "sat/bsat/satSolver2.h"
|
|
Jerry James |
575c8c7 |
-#include "misc/zlib/zlib.h"
|
|
Jerry James |
575c8c7 |
+#include <zlib.h>
|
|
Jerry James |
575c8c7 |
|
|
Jerry James |
575c8c7 |
ABC_NAMESPACE_IMPL_START
|
|
Jerry James |
575c8c7 |
|
|
|
438cf10 |
--- src/sat/glucose/ParseUtils.h.orig 2018-02-28 20:38:55.000000000 -0700
|
|
|
438cf10 |
+++ src/sat/glucose/ParseUtils.h 2018-03-03 17:15:48.085042503 -0700
|
|
|
d87bf10 |
@@ -25,7 +25,7 @@ OF OR IN CONNECTION WITH THE SOFTWARE OR
|
|
|
d87bf10 |
#include <stdio.h>
|
|
|
d87bf10 |
#include <math.h>
|
|
|
d87bf10 |
|
|
|
d87bf10 |
-#include "misc/zlib/zlib.h"
|
|
|
d87bf10 |
+#include <zlib.h>
|
|
|
d87bf10 |
|
|
|
d87bf10 |
ABC_NAMESPACE_CXX_HEADER_START
|
|
|
d87bf10 |
|