From f02a545cd6b978808f93ed168a2b6d6d1e155e25 Mon Sep 17 00:00:00 2001 From: Gabriel Somlo Date: Fri, 4 Aug 2023 11:16:14 -0400 Subject: [PATCH 1/8] fedora: do not use bundled libraries --- Makefile | 3 ++- src/base/io/ioReadAiger.c | 4 ++-- src/base/io/ioReadBlifMv.c | 4 ++-- src/base/io/ioWriteAiger.c | 4 ++-- src/sat/bsat2/MainSat.cpp | 2 +- src/sat/bsat2/MainSimp.cpp | 2 +- src/sat/bsat2/ParseUtils.h | 2 +- src/sat/cnf/cnfMan.c | 2 +- src/sat/glucose/ParseUtils.h | 2 +- src/sat/glucose2/ParseUtils.h | 2 +- 10 files changed, 14 insertions(+), 13 deletions(-) diff --git a/Makefile b/Makefile index 032f3a8d..409e4b15 100644 --- a/Makefile +++ b/Makefile @@ -22,7 +22,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 \ @@ -44,6 +44,7 @@ $(ARCHFLAGS_EXE) : arch_flags.c $(CC) arch_flags.c -o $(ARCHFLAGS_EXE) INCLUDES += -I$(ABCSRC)/src +LIBS=-lbz2 -lz # Use C99 stdint.h header for platform-dependent types ifdef ABC_USE_STDINT_H diff --git a/src/base/io/ioReadAiger.c b/src/base/io/ioReadAiger.c index 9cf41413..73f14873 100644 --- a/src/base/io/ioReadAiger.c +++ b/src/base/io/ioReadAiger.c @@ -26,8 +26,8 @@ #include #include -#include "misc/bzlib/bzlib.h" -#include "misc/zlib/zlib.h" +#include +#include #include "ioAbc.h" ABC_NAMESPACE_IMPL_START diff --git a/src/base/io/ioReadBlifMv.c b/src/base/io/ioReadBlifMv.c index e5c6fe49..b98c6d30 100644 --- a/src/base/io/ioReadBlifMv.c +++ b/src/base/io/ioReadBlifMv.c @@ -18,8 +18,8 @@ ***********************************************************************/ -#include "misc/zlib/zlib.h" -#include "misc/bzlib/bzlib.h" +#include +#include #include "base/abc/abc.h" #include "misc/vec/vecPtr.h" #include "ioAbc.h" diff --git a/src/base/io/ioWriteAiger.c b/src/base/io/ioWriteAiger.c index 0a68c7ee..d265104e 100644 --- a/src/base/io/ioWriteAiger.c +++ b/src/base/io/ioWriteAiger.c @@ -26,8 +26,8 @@ #include #include -#include "misc/bzlib/bzlib.h" -#include "misc/zlib/zlib.h" +#include +#include #include "ioAbc.h" diff --git a/src/sat/bsat2/MainSat.cpp b/src/sat/bsat2/MainSat.cpp index 1f61f9ee..ca52356e 100644 --- a/src/sat/bsat2/MainSat.cpp +++ b/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 #include -#include "misc/zlib/zlib.h" +#include #include "System.h" #include "ParseUtils.h" diff --git a/src/sat/bsat2/MainSimp.cpp b/src/sat/bsat2/MainSimp.cpp index 4a890921..0419bc2f 100644 --- a/src/sat/bsat2/MainSimp.cpp +++ b/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 #include -#include "misc/zlib/zlib.h" +#include #ifndef _WIN32 #include diff --git a/src/sat/bsat2/ParseUtils.h b/src/sat/bsat2/ParseUtils.h index 8e0f9c89..d3071649 100644 --- a/src/sat/bsat2/ParseUtils.h +++ b/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 #include -#include "misc/zlib/zlib.h" +#include namespace Minisat { diff --git a/src/sat/cnf/cnfMan.c b/src/sat/cnf/cnfMan.c index f63cc633..b0179851 100644 --- a/src/sat/cnf/cnfMan.c +++ b/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 ABC_NAMESPACE_IMPL_START diff --git a/src/sat/glucose/ParseUtils.h b/src/sat/glucose/ParseUtils.h index a3f25a62..eb5cd066 100644 --- a/src/sat/glucose/ParseUtils.h +++ b/src/sat/glucose/ParseUtils.h @@ -25,7 +25,7 @@ OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWA #include #include -#include "misc/zlib/zlib.h" +#include ABC_NAMESPACE_CXX_HEADER_START diff --git a/src/sat/glucose2/ParseUtils.h b/src/sat/glucose2/ParseUtils.h index 54a139b1..9735675c 100644 --- a/src/sat/glucose2/ParseUtils.h +++ b/src/sat/glucose2/ParseUtils.h @@ -25,7 +25,7 @@ OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWA #include #include -#include "misc/zlib/zlib.h" +#include ABC_NAMESPACE_CXX_HEADER_START -- 2.41.0