1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
|
From: Ruben Undheim <ruben.undheim@gmail.com>
Date: Sat, 4 Aug 2018 13:17:43 +0000
Subject: The library zlib is included in the source and
built as a convenience library. This patch prevents this from being
built and links berkeley-abc with debian's zlib library instead.
Forwarded: doesn't make sense upstream
===================================================================
---
abc/Makefile | 3 ++-
abc/src/base/io/ioReadAiger.c | 2 +-
abc/src/base/io/ioWriteAiger.c | 2 +-
abc/src/sat/cnf/cnfMan.c | 2 +-
4 files changed, 5 insertions(+), 4 deletions(-)
--- a/abc/Makefile
+++ b/abc/Makefile
@@ -23,7 +23,7 @@ MODULES := \
src/map/mapper src/map/mio src/map/super src/map/if src/map/if/acd \
src/map/amap src/map/cov src/map/scl src/map/mpm \
src/misc/extra src/misc/mvc src/misc/st src/misc/util src/misc/nm \
- src/misc/vec src/misc/hash src/misc/tim src/misc/zlib \
+ src/misc/vec src/misc/hash src/misc/tim \
src/misc/mem src/misc/bar src/misc/bbl src/misc/parse \
src/opt/cut src/opt/fxu src/opt/fxch src/opt/rwr src/opt/mfs src/opt/sim \
src/opt/ret src/opt/fret src/opt/res src/opt/lpk src/opt/nwk src/opt/rwt src/opt/rar \
@@ -147,6 +147,7 @@ ifneq ($(OS), $(filter $(OS), FreeBSD Op
endif
LIBS += -lbz2
+LIBS += -lz
ifdef ABC_USE_LIBSTDCXX
LIBS += -lstdc++
--- a/abc/src/base/io/ioReadAiger.c
+++ b/abc/src/base/io/ioReadAiger.c
@@ -27,7 +27,7 @@
#include <assert.h>
#include <bzlib.h>
-#include "misc/zlib/zlib.h"
+#include <zlib.h>
#include "ioAbc.h"
ABC_NAMESPACE_IMPL_START
--- a/abc/src/base/io/ioWriteAiger.c
+++ b/abc/src/base/io/ioWriteAiger.c
@@ -27,7 +27,7 @@
#include <assert.h>
#include <bzlib.h>
-#include "misc/zlib/zlib.h"
+#include <zlib.h>
#include "ioAbc.h"
--- a/abc/src/sat/cnf/cnfMan.c
+++ b/abc/src/sat/cnf/cnfMan.c
@@ -21,7 +21,7 @@
#include "cnf.h"
#include "sat/bsat/satSolver.h"
#include "sat/bsat/satSolver2.h"
-#include "misc/zlib/zlib.h"
+#include <zlib.h>
ABC_NAMESPACE_IMPL_START
--- a/abc/src/map/scl/sclLiberty.c
+++ b/abc/src/map/scl/sclLiberty.c
@@ -25,7 +25,7 @@
#include <fnmatch.h>
#endif
-#include "misc/zlib/zlib.h"
+#include <zlib.h>
#include "sclLib.h"
#include "misc/st/st.h"
#include "map/mio/mio.h"
|
