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

Update to latest mercurial snapshot. BR gcc-c++ instead of gcc.

Browse source
This commit is contained in:
Jerry James 2018-03-03 19:04:26 -07:00
commit 438cf10ba4
4 changed files with 40 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

54
abc-bundlelib.patch
View file

@ -1,6 +1,6 @@
--- Makefile.orig 2018-01-29 18:01:01.000000000 -0700
+++ Makefile 2018-02-01 20:02:43.820439769 -0700
@@ -19,7 +19,7 @@ MODULES := \
--- Makefile.orig 2018-02-28 20:38:55.000000000 -0700
+++ Makefile 2018-03-03 17:18:18.362557053 -0700
@@ -20,7 +20,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,17 +9,17 @@
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 \
@@ -118,7 +118,7 @@ endif
endif
@@ -69,6 +69,8 @@ endif
# LIBS := -ldl -lrt
-LIBS += -ldl -lm
+LIBS += -Wl,--as-needed -lbz2 -lz -ldl -lm
ifneq ($(findstring Darwin, $(shell uname)), Darwin)
LIBS += -lrt
endif
--- 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
ABC_READLINE_INCLUDES ?=
ABC_READLINE_LIBRARIES ?= -lreadline
+LDFLAGS=-Wl,--as-needed
+LIBS=-lbz2 -lz
# whether to use libreadline
ifndef ABC_USE_NO_READLINE
--- src/base/io/ioReadAiger.c.orig 2018-02-28 20:38:55.000000000 -0700
+++ src/base/io/ioReadAiger.c 2018-03-03 17:15:48.083042510 -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 2018-01-29 18:01:01.000000000 -0700
+++ src/base/io/ioReadBlifMv.c 2018-02-01 20:02:43.832439741 -0700
--- src/base/io/ioReadBlifMv.c.orig 2018-02-28 20:38:55.000000000 -0700
+++ src/base/io/ioReadBlifMv.c 2018-03-03 17:15:48.084042506 -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 2018-01-29 18:01:01.000000000 -0700
+++ src/base/io/ioWriteAiger.c 2018-02-01 20:02:43.832439741 -0700
--- src/base/io/ioWriteAiger.c.orig 2018-02-28 20:38:55.000000000 -0700
+++ src/base/io/ioWriteAiger.c 2018-03-03 17:15:48.084042506 -0700
@@ -26,8 +26,8 @@
#include <string.h>
#include <assert.h>
@ -57,8 +57,8 @@
#include "ioAbc.h"
--- 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
--- src/sat/bsat2/MainSat.cpp.orig 2018-02-28 20:38:55.000000000 -0700
+++ src/sat/bsat2/MainSat.cpp 2018-03-03 17:15:48.084042506 -0700
@@ -21,7 +21,7 @@ OF OR IN CONNECTION WITH THE SOFTWARE OR
#include <errno.h>
@ -68,8 +68,8 @@
#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
--- src/sat/bsat2/MainSimp.cpp.orig 2018-02-28 20:38:55.000000000 -0700
+++ src/sat/bsat2/MainSimp.cpp 2018-03-03 17:15:48.084042506 -0700
@@ -21,10 +21,10 @@ OF OR IN CONNECTION WITH THE SOFTWARE OR
#include <errno.h>
@ -84,8 +84,8 @@
#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
--- src/sat/bsat2/ParseUtils.h.orig 2018-02-28 20:38:55.000000000 -0700
+++ src/sat/bsat2/ParseUtils.h 2018-03-03 17:15:48.085042503 -0700
@@ -24,7 +24,7 @@ OF OR IN CONNECTION WITH THE SOFTWARE OR
#include <stdlib.h>
#include <stdio.h>
@ -95,8 +95,8 @@
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
--- src/sat/cnf/cnfMan.c.orig 2018-02-28 20:38:55.000000000 -0700
+++ src/sat/cnf/cnfMan.c 2018-03-03 17:15:48.085042503 -0700
@@ -21,7 +21,7 @@
#include "cnf.h"
#include "sat/bsat/satSolver.h"
@ -106,8 +106,8 @@
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
--- src/sat/glucose/ParseUtils.h.orig 2018-02-28 20:38:55.000000000 -0700
+++ src/sat/glucose/ParseUtils.h 2018-03-03 17:15:48.085042503 -0700
@@ -25,7 +25,7 @@ OF OR IN CONNECTION WITH THE SOFTWARE OR
#include <stdio.h>
#include <math.h>

8
abc-sharedlib.patch
View file

@ -1,6 +1,6 @@
--- 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)
--- Makefile.orig 2018-03-03 17:18:18.362557053 -0700
+++ Makefile 2018-03-03 17:18:49.778455568 -0700
@@ -48,7 +48,7 @@ ARCHFLAGS := $(ARCHFLAGS)
OPTFLAGS ?= -g -O
@ -9,7 +9,7 @@
ifneq ($(findstring arm,$(shell uname -m)),)
CFLAGS += -DABC_MEMALIGN=4
endif
@@ -200,7 +200,9 @@ lib$(PROG).a: $(LIBOBJ)
@@ -211,7 +211,9 @@ lib$(PROG).a: $(LIBOBJ)
lib$(PROG).so: $(LIBOBJ)
@echo "$(MSG_PREFIX)\`\` Linking:" $(notdir $@)

12
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 902018356af4
%global hgdate 20180129
%global commit 2860545fb810
%global hgdate 20180228
# 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: 15.hg%{hgdate}%{?dist}
Release: 16.hg%{hgdate}%{?dist}
Summary: Sequential logic synthesis and formal verification
License: MIT
@ -33,7 +33,7 @@ Patch1: %{name}-sharedlib.patch
Patch2: %{name}-header.patch
BuildRequires: bzip2-devel
BuildRequires: gcc
BuildRequires: gcc-c++
BuildRequires: readline-devel
BuildRequires: zlib-devel
@ -134,6 +134,10 @@ install -p -m 0644 %{name}.1 %{buildroot}%{_mandir}/man1
%{_libdir}/lib%{name}.so
%changelog
* Sat Mar 3 2018 Jerry James <loganjerry@gmail.com> - 1.01-16.hg20180228
- Update to latest mercurial snapshot
- BR gcc-c++ instead of gcc
* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.01-15.hg20180129
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild

2
sources
View file

@ -1 +1 @@
SHA512 (902018356af4.zip) = c169a8b9a6435d0506725ebd24fa37088d68b0a675920767ec1fb7266e2e893c193ee10de14f6d1ed8cabb44001cc9705b9491c93660d537e686ed8cf01d692b
SHA512 (2860545fb810.zip) = 2bf9644f81fc0c32dde077c33b480eb9384e0ea7d0dd38b1a662194142b12ec2a639bcaa915e0536f965b854dd67976bc39d41d8e04a30980020c6226f0ccf7f