Package: berkeley-abc
Followup-For: Bug #1067621
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu noble ubuntu-patch
Control: tags -1 patch
Dear Maintainer,
In Ubuntu, the attached patch was applied to achieve the following:
* Fix the build failure caused by missing function prototypes.
* debian/patches/add-missing-include.patch: Add missing headers to
Glucose components. Closes LP: #2060873.
Thanks for considering the patch.
-- System Information:
Debian Release: bookworm/sid
APT prefers jammy-updates
APT policy: (500, 'jammy-updates'), (500, 'jammy-security'), (500, 'jammy'),
(100, 'jammy-backports')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 6.5.0-26-generic (SMP w/10 CPU threads; PREEMPT)
Kernel taint flags: TAINT_PROPRIETARY_MODULE, TAINT_OOT_MODULE
Locale: LANG=en_CA.UTF-8, LC_CTYPE=en_CA.UTF-8 (charmap=UTF-8),
LANGUAGE=en_CA:en
Shell: /bin/sh linked to /usr/bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled
diff -Nru berkeley-abc-1.01+20230625git01b1bd1+dfsg/debian/control
berkeley-abc-1.01+20230625git01b1bd1+dfsg/debian/control
--- berkeley-abc-1.01+20230625git01b1bd1+dfsg/debian/control 2024-03-31
23:33:27.000000000 -0600
+++ berkeley-abc-1.01+20230625git01b1bd1+dfsg/debian/control 2024-04-10
14:45:54.000000000 -0600
@@ -1,8 +1,7 @@
Source: berkeley-abc
Section: electronics
Priority: optional
-Maintainer: Ubuntu Developers <ubuntu-devel-disc...@lists.ubuntu.com>
-XSBC-Original-Maintainer: Debian Science Maintainers
<debian-science-maintain...@lists.alioth.debian.org>
+Maintainer: Debian Science Maintainers
<debian-science-maintain...@lists.alioth.debian.org>
Uploaders: Ruben Undheim <ruben.undh...@gmail.com>,
Daniel Gröber <d...@darkboxed.org>
Build-Depends: debhelper-compat (= 13),
diff -Nru
berkeley-abc-1.01+20230625git01b1bd1+dfsg/debian/patches/add-missing-include.patch
berkeley-abc-1.01+20230625git01b1bd1+dfsg/debian/patches/add-missing-include.patch
---
berkeley-abc-1.01+20230625git01b1bd1+dfsg/debian/patches/add-missing-include.patch
1969-12-31 17:00:00.000000000 -0700
+++
berkeley-abc-1.01+20230625git01b1bd1+dfsg/debian/patches/add-missing-include.patch
2024-04-10 14:45:54.000000000 -0600
@@ -0,0 +1,30 @@
+Description: Add missing headers to Glucose components
+Author: Zixing Liu <zixing....@canonical.com>
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/berkeley-abc/+bug/2060873
+Forwarded: no
+Last-Update: 2024-04-10
+Index: berkeley-abc/src/sat/glucose/Glucose.cpp
+===================================================================
+--- berkeley-abc.orig/src/sat/glucose/Glucose.cpp
++++ berkeley-abc/src/sat/glucose/Glucose.cpp
+@@ -34,6 +34,7 @@ OF OR IN CONNECTION WITH THE SOFTWARE OR
+ #include "sat/glucose/Constants.h"
+ #include "sat/glucose/System.h"
+
++#include "misc/util/abc_global.h"
+ ABC_NAMESPACE_IMPL_START
+
+ using namespace Gluco;
+Index: berkeley-abc/src/sat/glucose2/Glucose2.cpp
+===================================================================
+--- berkeley-abc.orig/src/sat/glucose2/Glucose2.cpp
++++ berkeley-abc/src/sat/glucose2/Glucose2.cpp
+@@ -34,7 +34,7 @@ OF OR IN CONNECTION WITH THE SOFTWARE OR
+ #include "sat/glucose2/Solver.h"
+
+ #include "sat/glucose2/CGlucose.h"
+-
++#include "misc/util/abc_global.h"
+ ABC_NAMESPACE_IMPL_START
+
+ using namespace Gluco2;
diff -Nru
berkeley-abc-1.01+20230625git01b1bd1+dfsg/debian/patches/remove_bzlib_convenience.patch
berkeley-abc-1.01+20230625git01b1bd1+dfsg/debian/patches/remove_bzlib_convenience.patch
---
berkeley-abc-1.01+20230625git01b1bd1+dfsg/debian/patches/remove_bzlib_convenience.patch
2024-03-31 23:33:27.000000000 -0600
+++
berkeley-abc-1.01+20230625git01b1bd1+dfsg/debian/patches/remove_bzlib_convenience.patch
2024-04-10 14:45:54.000000000 -0600
@@ -12,10 +12,10 @@
src/base/io/ioWriteAiger.c | 2 +-
3 files changed, 5 insertions(+), 3 deletions(-)
-diff --git a/Makefile b/Makefile
-index 3976cf7..bb3fbc2 100644
---- a/Makefile
-+++ b/Makefile
+Index: berkeley-abc/Makefile
+===================================================================
+--- berkeley-abc.orig/Makefile
++++ berkeley-abc/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 \
@@ -25,7 +25,7 @@
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 \
-@@ -145,6 +145,8 @@ ifneq ($(findstring Darwin, $(shell uname)), Darwin)
+@@ -145,6 +145,8 @@ ifneq ($(findstring Darwin, $(shell unam
LIBS += -lrt
endif
@@ -34,10 +34,10 @@
ifdef ABC_USE_LIBSTDCXX
LIBS += -lstdc++
$(info $(MSG_PREFIX)Using explicit -lstdc++)
-diff --git a/src/base/io/ioReadAiger.c b/src/base/io/ioReadAiger.c
-index 9cf4141..8be6d21 100644
---- a/src/base/io/ioReadAiger.c
-+++ b/src/base/io/ioReadAiger.c
+Index: berkeley-abc/src/base/io/ioReadAiger.c
+===================================================================
+--- berkeley-abc.orig/src/base/io/ioReadAiger.c
++++ berkeley-abc/src/base/io/ioReadAiger.c
@@ -26,7 +26,7 @@
#include <string.h>
#include <assert.h>
@@ -47,10 +47,10 @@
#include "misc/zlib/zlib.h"
#include "ioAbc.h"
-diff --git a/src/base/io/ioWriteAiger.c b/src/base/io/ioWriteAiger.c
-index 0a68c7e..f0744c6 100644
---- a/src/base/io/ioWriteAiger.c
-+++ b/src/base/io/ioWriteAiger.c
+Index: berkeley-abc/src/base/io/ioWriteAiger.c
+===================================================================
+--- berkeley-abc.orig/src/base/io/ioWriteAiger.c
++++ berkeley-abc/src/base/io/ioWriteAiger.c
@@ -26,7 +26,7 @@
#include <string.h>
#include <assert.h>
@@ -60,3 +60,16 @@
#include "misc/zlib/zlib.h"
#include "ioAbc.h"
+Index: berkeley-abc/src/base/io/ioReadBlifMv.c
+===================================================================
+--- berkeley-abc.orig/src/base/io/ioReadBlifMv.c
++++ berkeley-abc/src/base/io/ioReadBlifMv.c
+@@ -19,7 +19,7 @@
+ ***********************************************************************/
+
+ #include "misc/zlib/zlib.h"
+-#include "misc/bzlib/bzlib.h"
++#include <bzlib.h>
+ #include "base/abc/abc.h"
+ #include "misc/vec/vecPtr.h"
+ #include "ioAbc.h"
diff -Nru
berkeley-abc-1.01+20230625git01b1bd1+dfsg/debian/patches/remove_zlib_convenience.patch
berkeley-abc-1.01+20230625git01b1bd1+dfsg/debian/patches/remove_zlib_convenience.patch
---
berkeley-abc-1.01+20230625git01b1bd1+dfsg/debian/patches/remove_zlib_convenience.patch
2024-03-31 23:33:27.000000000 -0600
+++
berkeley-abc-1.01+20230625git01b1bd1+dfsg/debian/patches/remove_zlib_convenience.patch
2024-04-10 14:45:54.000000000 -0600
@@ -13,10 +13,10 @@
src/sat/cnf/cnfMan.c | 2 +-
4 files changed, 5 insertions(+), 4 deletions(-)
-diff --git a/Makefile b/Makefile
-index bb3fbc2..8c58953 100644
---- a/Makefile
-+++ b/Makefile
+Index: berkeley-abc/Makefile
+===================================================================
+--- berkeley-abc.orig/Makefile
++++ berkeley-abc/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 \
@@ -26,7 +26,7 @@
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 \
-@@ -146,6 +146,7 @@ ifneq ($(findstring Darwin, $(shell uname)), Darwin)
+@@ -146,6 +146,7 @@ ifneq ($(findstring Darwin, $(shell unam
endif
LIBS += -lbz2
@@ -34,10 +34,10 @@
ifdef ABC_USE_LIBSTDCXX
LIBS += -lstdc++
-diff --git a/src/base/io/ioReadAiger.c b/src/base/io/ioReadAiger.c
-index 8be6d21..73f1487 100644
---- a/src/base/io/ioReadAiger.c
-+++ b/src/base/io/ioReadAiger.c
+Index: berkeley-abc/src/base/io/ioReadAiger.c
+===================================================================
+--- berkeley-abc.orig/src/base/io/ioReadAiger.c
++++ berkeley-abc/src/base/io/ioReadAiger.c
@@ -27,7 +27,7 @@
#include <assert.h>
@@ -47,10 +47,10 @@
#include "ioAbc.h"
ABC_NAMESPACE_IMPL_START
-diff --git a/src/base/io/ioWriteAiger.c b/src/base/io/ioWriteAiger.c
-index f0744c6..d265104 100644
---- a/src/base/io/ioWriteAiger.c
-+++ b/src/base/io/ioWriteAiger.c
+Index: berkeley-abc/src/base/io/ioWriteAiger.c
+===================================================================
+--- berkeley-abc.orig/src/base/io/ioWriteAiger.c
++++ berkeley-abc/src/base/io/ioWriteAiger.c
@@ -27,7 +27,7 @@
#include <assert.h>
@@ -60,10 +60,10 @@
#include "ioAbc.h"
-diff --git a/src/sat/cnf/cnfMan.c b/src/sat/cnf/cnfMan.c
-index f63cc63..b017985 100644
---- a/src/sat/cnf/cnfMan.c
-+++ b/src/sat/cnf/cnfMan.c
+Index: berkeley-abc/src/sat/cnf/cnfMan.c
+===================================================================
+--- berkeley-abc.orig/src/sat/cnf/cnfMan.c
++++ berkeley-abc/src/sat/cnf/cnfMan.c
@@ -21,7 +21,7 @@
#include "cnf.h"
#include "sat/bsat/satSolver.h"
@@ -73,3 +73,82 @@
ABC_NAMESPACE_IMPL_START
+Index: berkeley-abc/src/base/io/ioReadBlifMv.c
+===================================================================
+--- berkeley-abc.orig/src/base/io/ioReadBlifMv.c
++++ berkeley-abc/src/base/io/ioReadBlifMv.c
+@@ -18,7 +18,7 @@
+
+ ***********************************************************************/
+
+-#include "misc/zlib/zlib.h"
++#include <zlib.h>
+ #include <bzlib.h>
+ #include "base/abc/abc.h"
+ #include "misc/vec/vecPtr.h"
+ #include "ioAbc.h"
+Index: berkeley-abc/src/sat/bsat2/MainSat.cpp
+===================================================================
+--- berkeley-abc.orig/src/sat/bsat2/MainSat.cpp
++++ berkeley-abc/src/sat/bsat2/MainSat.cpp
+@@ -21,7 +21,7 @@ OF OR IN CONNECTION WITH THE SOFTWARE OR
+ #include <errno.h>
+
+ #include <signal.h>
+-#include "misc/zlib/zlib.h"
++#include <zlib.h>
+
+ #include "System.h"
+ #include "ParseUtils.h"
+Index: berkeley-abc/src/sat/bsat2/MainSimp.cpp
+===================================================================
+--- berkeley-abc.orig/src/sat/bsat2/MainSimp.cpp
++++ berkeley-abc/src/sat/bsat2/MainSimp.cpp
+@@ -21,7 +21,7 @@ OF OR IN CONNECTION WITH THE SOFTWARE OR
+ #include <errno.h>
+
+ #include <signal.h>
+-#include "misc/zlib/zlib.h"
++#include <zlib.h>
+
+ #ifndef _WIN32
+ #include <sys/resource.h>
+Index: berkeley-abc/src/sat/bsat2/ParseUtils.h
+===================================================================
+--- berkeley-abc.orig/src/sat/bsat2/ParseUtils.h
++++ berkeley-abc/src/sat/bsat2/ParseUtils.h
+@@ -24,7 +24,7 @@ OF OR IN CONNECTION WITH THE SOFTWARE OR
+ #include <stdlib.h>
+ #include <stdio.h>
+
+-#include "misc/zlib/zlib.h"
++#include <zlib.h>
+
+ namespace Minisat {
+
+Index: berkeley-abc/src/sat/glucose/ParseUtils.h
+===================================================================
+--- berkeley-abc.orig/src/sat/glucose/ParseUtils.h
++++ berkeley-abc/src/sat/glucose/ParseUtils.h
+@@ -25,7 +25,7 @@ OF OR IN CONNECTION WITH THE SOFTWARE OR
+ #include <stdio.h>
+ #include <math.h>
+
+-#include "misc/zlib/zlib.h"
++#include <zlib.h>
+
+ ABC_NAMESPACE_CXX_HEADER_START
+
+Index: berkeley-abc/src/sat/glucose2/ParseUtils.h
+===================================================================
+--- berkeley-abc.orig/src/sat/glucose2/ParseUtils.h
++++ berkeley-abc/src/sat/glucose2/ParseUtils.h
+@@ -25,7 +25,7 @@ OF OR IN CONNECTION WITH THE SOFTWARE OR
+ #include <stdio.h>
+ #include <math.h>
+
+-#include "misc/zlib/zlib.h"
++#include <zlib.h>
+
+ ABC_NAMESPACE_CXX_HEADER_START
+
diff -Nru berkeley-abc-1.01+20230625git01b1bd1+dfsg/debian/patches/series
berkeley-abc-1.01+20230625git01b1bd1+dfsg/debian/patches/series
--- berkeley-abc-1.01+20230625git01b1bd1+dfsg/debian/patches/series
2024-03-31 23:33:27.000000000 -0600
+++ berkeley-abc-1.01+20230625git01b1bd1+dfsg/debian/patches/series
2024-04-10 14:45:54.000000000 -0600
@@ -7,3 +7,4 @@
0007-Remove-build-date-time-reproducibility-hazard.patch
0008-Fix-ioWriteVerilog-segfault.patch
0009-Revert-Experiment-with-cost-functions.patch
+add-missing-include.patch
