blob: 5a4c94abc29798632cd6329955df8d7149e23b6d (
plain)
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
|
Description: The library bzlib 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 bzlib library instead.
Forwarded: doesn't make sense upstream
Author: Ruben Undheim <ruben.undheim@gmail.com>
Index: berkeley-abc/Makefile
===================================================================
--- berkeley-abc.orig/Makefile 2016-11-03 23:13:04.679307046 +0000
+++ berkeley-abc/Makefile 2016-11-03 23:13:04.675307046 +0000
@@ -18,7 +18,7 @@
src/map/mapper src/map/mio src/map/super src/map/if \
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/bzlib src/misc/zlib \
+ src/misc/vec src/misc/hash src/misc/tim src/misc/zlib \
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 \
@@ -117,7 +117,7 @@
endif
# LIBS := -ldl -lrt
-LIBS += -ldl -lm
+LIBS += -ldl -lm -lbz2
ifneq ($(findstring Darwin, $(shell uname)), Darwin)
LIBS += -lrt
endif
Index: berkeley-abc/src/base/io/ioReadAiger.c
===================================================================
--- berkeley-abc.orig/src/base/io/ioReadAiger.c 2016-11-03 23:13:04.679307046 +0000
+++ berkeley-abc/src/base/io/ioReadAiger.c 2016-11-03 23:13:04.679307046 +0000
@@ -26,7 +26,7 @@
#include <string.h>
#include <assert.h>
-#include "misc/bzlib/bzlib.h"
+#include <bzlib.h>
#include "misc/zlib/zlib.h"
#include "ioAbc.h"
Index: berkeley-abc/src/base/io/ioWriteAiger.c
===================================================================
--- berkeley-abc.orig/src/base/io/ioWriteAiger.c 2016-11-03 23:13:04.679307046 +0000
+++ berkeley-abc/src/base/io/ioWriteAiger.c 2016-11-03 23:13:04.679307046 +0000
@@ -26,7 +26,7 @@
#include <string.h>
#include <assert.h>
-#include "misc/bzlib/bzlib.h"
+#include <bzlib.h>
#include "misc/zlib/zlib.h"
#include "ioAbc.h"
|
