rpms/abc
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update to latest mercurial snapshot.

Browse source
This commit is contained in:
Jerry James 2018-02-01 21:52:24 -07:00
commit d87bf10db4
6 changed files with 96 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

4
.gitignore vendored
View file

@ -1,3 +1 @@
/13cb576b8538.zip
/a8730ca647f5.zip
/8e08604f8ad3.zip
/*.zip

73
abc-bundlelib.patch
View file

@ -1,6 +1,6 @@
--- Makefile.orig 2016-09-05 14:54:44.000000000 -0600
+++ Makefile 2016-09-10 02:02:01.380988862 -0600
@@ -18,7 +18,7 @@
--- Makefile.orig 2018-01-29 18:01:01.000000000 -0700
+++ Makefile 2018-02-01 20:02:43.820439769 -0700
@@ -19,7 +19,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 \
@ -9,7 +9,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 \
@@ -117,7 +117,7 @@
@@ -118,7 +118,7 @@ endif
endif
# LIBS := -ldl -lrt
@ -18,8 +18,8 @@
ifneq ($(findstring Darwin, $(shell uname)), Darwin)
LIBS += -lrt
endif
--- src/base/io/ioReadAiger.c.orig 2016-02-03 14:56:47.000000000 -0700
+++ src/base/io/ioReadAiger.c 2016-02-04 21:37:07.724515263 -0700
--- src/base/io/ioReadAiger.c.orig 2018-01-29 18:01:01.000000000 -0700
+++ src/base/io/ioReadAiger.c 2018-02-01 20:02:43.831439743 -0700
@@ -26,8 +26,8 @@
#include <string.h>
#include <assert.h>
@ -31,8 +31,8 @@
#include "ioAbc.h"
ABC_NAMESPACE_IMPL_START
--- src/base/io/ioReadBlifMv.c.orig 2016-02-03 14:56:47.000000000 -0700
+++ src/base/io/ioReadBlifMv.c 2016-02-04 21:37:07.726515102 -0700
--- src/base/io/ioReadBlifMv.c.orig 2018-01-29 18:01:01.000000000 -0700
+++ src/base/io/ioReadBlifMv.c 2018-02-01 20:02:43.832439741 -0700
@@ -18,8 +18,8 @@
***********************************************************************/
@ -44,8 +44,8 @@
#include "base/abc/abc.h"
#include "misc/vec/vecPtr.h"
#include "ioAbc.h"
--- src/base/io/ioWriteAiger.c.orig 2016-02-03 14:56:47.000000000 -0700
+++ src/base/io/ioWriteAiger.c 2016-02-04 21:37:07.727515021 -0700
--- src/base/io/ioWriteAiger.c.orig 2018-01-29 18:01:01.000000000 -0700
+++ src/base/io/ioWriteAiger.c 2018-02-01 20:02:43.832439741 -0700
@@ -26,8 +26,8 @@
#include <string.h>
#include <assert.h>
@ -57,8 +57,46 @@
#include "ioAbc.h"
--- src/sat/cnf/cnfMan.c.orig 2016-02-03 14:56:47.000000000 -0700
+++ src/sat/cnf/cnfMan.c 2016-02-04 21:37:07.728514940 -0700
--- src/sat/bsat2/MainSat.cpp.orig 2018-01-29 18:01:01.000000000 -0700
+++ src/sat/bsat2/MainSat.cpp 2018-02-01 20:49:39.712648983 -0700
@@ -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"
--- src/sat/bsat2/MainSimp.cpp.orig 2018-01-29 18:01:01.000000000 -0700
+++ src/sat/bsat2/MainSimp.cpp 2018-02-01 20:49:18.648712089 -0700
@@ -21,10 +21,10 @@ 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>
+#include <sys/resource.h>
#endif
#include "System.h"
--- src/sat/bsat2/ParseUtils.h.orig 2018-01-29 18:01:01.000000000 -0700
+++ src/sat/bsat2/ParseUtils.h 2018-02-01 20:48:48.095803623 -0700
@@ -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 {
--- src/sat/cnf/cnfMan.c.orig 2018-01-29 18:01:01.000000000 -0700
+++ src/sat/cnf/cnfMan.c 2018-02-01 20:02:43.833439738 -0700
@@ -21,7 +21,7 @@
#include "cnf.h"
#include "sat/bsat/satSolver.h"
@ -68,3 +106,14 @@
ABC_NAMESPACE_IMPL_START
--- src/sat/glucose/ParseUtils.h.orig 2018-01-29 18:01:01.000000000 -0700
+++ src/sat/glucose/ParseUtils.h 2018-02-01 20:48:26.407868600 -0700
@@ -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

10
abc-header.patch Normal file
View file

@ -0,0 +1,10 @@
--- src/sat/glucose/Glucose.cpp.orig 2018-01-29 18:01:01.000000000 -0700
+++ src/sat/glucose/Glucose.cpp 2018-02-01 20:58:59.894726225 -0700
@@ -33,6 +33,7 @@ OF OR IN CONNECTION WITH THE SOFTWARE OR
#include "sat/glucose/Solver.h"
#include "sat/glucose/Constants.h"
#include "sat/glucose/System.h"
+#include "misc/util/abc_global.h"
ABC_NAMESPACE_IMPL_START

24
abc-sharedlib.patch
View file

@ -1,6 +1,6 @@
--- Makefile.orig 2016-02-05 14:41:31.862198725 -0700
+++ Makefile 2016-02-04 21:46:14.618379630 -0700
@@ -46,7 +46,7 @@ ARCHFLAGS := $(ARCHFLAGS)
--- Makefile.orig 2018-02-01 20:02:43.820439769 -0700
+++ Makefile 2018-02-01 20:05:02.079115011 -0700
@@ -47,7 +47,7 @@ ARCHFLAGS := $(ARCHFLAGS)
OPTFLAGS ?= -g -O
@ -9,16 +9,14 @@
ifneq ($(findstring arm,$(shell uname -m)),)
CFLAGS += -DABC_MEMALIGN=4
endif
@@ -186,6 +186,12 @@ $(PROG): $(OBJ)
@echo "$(MSG_PREFIX)\`\` Building binary:" $(notdir $@)
$(VERBOSE)$(LD) -o $@ $^ $(LIBS)
@@ -200,7 +200,9 @@ lib$(PROG).a: $(LIBOBJ)
+lib$(PROG).so: $(OBJ)
+ @echo "$(MSG_PREFIX)\`\` Linking:" $(notdir $@)
+ $(VERBOSE)$(LD) -shared -Wl,-h,lib$(PROG).so.0 -o lib$(PROG).so.0.0.0 $^ $(LIBS)
lib$(PROG).so: $(LIBOBJ)
@echo "$(MSG_PREFIX)\`\` Linking:" $(notdir $@)
- $(VERBOSE)$(CXX) -shared -o $@ $^ $(LIBS)
+ $(VERBOSE)$(CXX) -shared -Wl,-h,lib$(PROG).so.0 -o lib$(PROG).so.0.0.0 $^ $(LIBS)
+ $(VERBOSE)ln -s lib$(PROG).so.0.0.0 lib$(PROG).so.0
+ $(VERBOSE)ln -s lib$(PROG).so.0 $@
+
lib$(PROG).a: $(OBJ)
@echo "$(MSG_PREFIX)\`\` Linking:" $(notdir $@)
$(VERBOSE)ar rv $@ $?
docs:
@echo "$(MSG_PREFIX)\`\` Building documentation." $(notdir $@)

16
abc.spec
View file

@ -1,7 +1,7 @@
# Upstream doesn't make releases. We have to check the code out of Mercurial.
%global owner alanmi
%global commit 8e08604f8ad3
%global hgdate 20160905
%global commit 902018356af4
%global hgdate 20180129
# WARNING: When updating to a newer snapshot, because upstream doesn't do
# shared library versioning, run abipkgdiff (from libabigail) against the
@ -16,7 +16,7 @@
Name: abc
Version: 1.01
Release: 13.hg%{hgdate}%{?dist}
Release: 14.hg%{hgdate}%{?dist}
Summary: Sequential logic synthesis and formal verification
License: MIT
@ -29,6 +29,8 @@ Source1: %{name}.1
Patch0: %{name}-bundlelib.patch
# Fedora-specific patch: build a shared library instead of a static library
Patch1: %{name}-sharedlib.patch
# Fix a minor header issue
Patch2: %{name}-header.patch
BuildRequires: bzip2-devel
BuildRequires: gcc
@ -68,9 +70,10 @@ Headers and libraries for developing applications that use ABC.
%setup -q -n %{owner}-%{name}-%{commit}
%patch0
%patch1
%patch2
# Do not use the bundled libraries
rm -fr lib src/misc/{bzlib,zlib} src/sat/bsat2
rm -fr lib src/misc/{bzlib,zlib}
# Fix end of line encodings
for fil in readme.md readmeaig; do
@ -87,6 +90,8 @@ touch -r %{SOURCE1} %{name}.1
# Build the library and binary
make %{?_smp_mflags} libabc.so OPTFLAGS="%{optflags} -fPIC -DNDEBUG" \
LD="g++ $RPM_LD_FLAGS" ABC_MAKE_VERBOSE=1
make %{?_smp_mflags} src/base/main/main.o OPTFLAGS="%{optflags} -DNDEBUG" \
ABC_MAKE_VERBOSE=1
g++ src/base/main/main.o -o %{name} $RPM_LD_FLAGS -L. -labc
%install
@ -129,6 +134,9 @@ install -p -m 0644 %{name}.1 %{buildroot}%{_mandir}/man1
%{_libdir}/lib%{name}.so
%changelog
* Fri Feb 2 2018 Jerry James <loganjerry@gmail.com> - 1.01-14.hg20180129
- Update to latest mercurial snapshot
* Wed Aug 02 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.01-13.hg20160905
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild

2
sources
View file

@ -1 +1 @@
02a4c8cb9dcf0d2c9d35837b13be8422 8e08604f8ad3.zip
SHA512 (902018356af4.zip) = c169a8b9a6435d0506725ebd24fa37088d68b0a675920767ec1fb7266e2e893c193ee10de14f6d1ed8cabb44001cc9705b9491c93660d537e686ed8cf01d692b