Группа :: Engineering
Пакет: alanmi-abc
Главная Изменения Спек Патчи Sources Загрузить Gear Bugs and FR Repocop
Патч: use-external-bzlib-zlib.patch
Скачать
Скачать
diff --git i/Makefile w/Makefile
index d45978a..39914b4 100644
--- i/Makefile
+++ w/Makefile
@@ -18,7 +18,7 @@ MODULES := \
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/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
endif
# LIBS := -ldl -lrt
-LIBS += -ldl -lm
+LIBS += -ldl -lm -lbz2 -lz
ifneq ($(findstring Darwin, $(shell uname)), Darwin)
LIBS += -lrt
endif
diff --git i/src/base/io/ioReadAiger.c w/src/base/io/ioReadAiger.c
index 6ebf9a7..3645028 100644
--- i/src/base/io/ioReadAiger.c
+++ w/src/base/io/ioReadAiger.c
@@ -26,8 +26,8 @@
#include <string.h>
#include <assert.h>
-#include "misc/bzlib/bzlib.h"
-#include "misc/zlib/zlib.h"
+#include <bzlib.h>
+#include <zlib.h>
#include "ioAbc.h"
ABC_NAMESPACE_IMPL_START
diff --git i/src/base/io/ioReadBlifMv.c w/src/base/io/ioReadBlifMv.c
index 3626eab..f1f7ff4 100644
--- i/src/base/io/ioReadBlifMv.c
+++ w/src/base/io/ioReadBlifMv.c
@@ -18,8 +18,8 @@
***********************************************************************/
-#include "misc/zlib/zlib.h"
-#include "misc/bzlib/bzlib.h"
+#include <zlib.h>
+#include <bzlib.h>
#include "base/abc/abc.h"
#include "misc/vec/vecPtr.h"
#include "ioAbc.h"
diff --git i/src/base/io/ioWriteAiger.c w/src/base/io/ioWriteAiger.c
index 193861d..8aa0f68 100644
--- i/src/base/io/ioWriteAiger.c
+++ w/src/base/io/ioWriteAiger.c
@@ -26,8 +26,8 @@
#include <string.h>
#include <assert.h>
-#include "misc/bzlib/bzlib.h"
-#include "misc/zlib/zlib.h"
+#include <bzlib.h>
+#include <zlib.h>
#include "ioAbc.h"
diff --git i/src/sat/bsat2/MainSat.cpp w/src/sat/bsat2/MainSat.cpp
index 068372e..250c315 100644
--- i/src/sat/bsat2/MainSat.cpp
+++ w/src/sat/bsat2/MainSat.cpp
@@ -21,7 +21,7 @@ OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWA
#include <errno.h>
#include <signal.h>
-#include "misc/zlib/zlib.h"
+#include <zlib.h>
#include "System.h"
#include "ParseUtils.h"
diff --git i/src/sat/bsat2/MainSimp.cpp w/src/sat/bsat2/MainSimp.cpp
index 897ca7e..88f99a2 100644
--- i/src/sat/bsat2/MainSimp.cpp
+++ w/src/sat/bsat2/MainSimp.cpp
@@ -21,7 +21,7 @@ OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWA
#include <errno.h>
#include <signal.h>
-#include "misc/zlib/zlib.h"
+#include <zlib.h>
#ifndef _WIN32
#include <sys/resource.h>
diff --git i/src/sat/bsat2/ParseUtils.h w/src/sat/bsat2/ParseUtils.h
index 8e0f9c8..d307164 100644
--- i/src/sat/bsat2/ParseUtils.h
+++ w/src/sat/bsat2/ParseUtils.h
@@ -24,7 +24,7 @@ OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWA
#include <stdlib.h>
#include <stdio.h>
-#include "misc/zlib/zlib.h"
+#include <zlib.h>
namespace Minisat {
diff --git i/src/sat/cnf/cnfMan.c w/src/sat/cnf/cnfMan.c
index 9dad72b..023eb74 100644
--- i/src/sat/cnf/cnfMan.c
+++ w/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