From 035e24d7017390b07fd3d3df7423f5ac83890ab7 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Jul 11 2018 00:40:34 +0000 Subject: Update to latest git snapshot. --- diff --git a/.gitignore b/.gitignore index 20cb71e..17af48f 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /*.zip +/abc-*.tar.gz diff --git a/abc-bundlelib.patch b/abc-bundlelib.patch index 8bec4ca..0039dbf 100644 --- a/abc-bundlelib.patch +++ b/abc-bundlelib.patch @@ -1,5 +1,5 @@ ---- Makefile.orig 2018-02-28 20:38:55.000000000 -0700 -+++ Makefile 2018-03-03 17:18:18.362557053 -0700 +--- Makefile.orig 2018-07-04 23:17:28.000000000 -0600 ++++ Makefile 2018-07-05 14:10:12.171993636 -0600 @@ -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 \ @@ -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 \ -@@ -69,6 +69,8 @@ endif +@@ -75,6 +75,8 @@ endif ABC_READLINE_INCLUDES ?= ABC_READLINE_LIBRARIES ?= -lreadline @@ -18,8 +18,8 @@ # 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 +--- src/base/io/ioReadAiger.c.orig 2018-07-04 23:17:28.000000000 -0600 ++++ src/base/io/ioReadAiger.c 2018-07-05 14:29:46.087515075 -0600 @@ -26,8 +26,8 @@ #include #include @@ -31,21 +31,21 @@ #include "ioAbc.h" ABC_NAMESPACE_IMPL_START ---- 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 +--- src/base/io/ioReadBlifMv.c.orig 2018-07-04 23:17:28.000000000 -0600 ++++ src/base/io/ioReadBlifMv.c 2018-07-05 14:27:17.066828346 -0600 @@ -18,8 +18,8 @@ ***********************************************************************/ --#include "misc/zlib/zlib.h" --#include "misc/bzlib/bzlib.h" +-#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" ---- 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 +--- src/base/io/ioWriteAiger.c.orig 2018-07-04 23:17:28.000000000 -0600 ++++ src/base/io/ioWriteAiger.c 2018-07-05 14:29:22.471564723 -0600 @@ -26,8 +26,8 @@ #include #include @@ -57,8 +57,8 @@ #include "ioAbc.h" ---- 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 +--- src/sat/bsat2/MainSat.cpp.orig 2018-07-04 23:17:28.000000000 -0600 ++++ src/sat/bsat2/MainSat.cpp 2018-07-05 14:28:26.007683423 -0600 @@ -21,7 +21,7 @@ OF OR IN CONNECTION WITH THE SOFTWARE OR #include @@ -68,24 +68,19 @@ #include "System.h" #include "ParseUtils.h" ---- 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 +--- src/sat/bsat2/MainSimp.cpp.orig 2018-07-04 23:17:28.000000000 -0600 ++++ src/sat/bsat2/MainSimp.cpp 2018-07-05 14:27:17.067828343 -0600 +@@ -21,7 +21,7 @@ OF OR IN CONNECTION WITH THE SOFTWARE OR #include #include --#include "misc/zlib/zlib.h" -- +-#include "misc/zlib/zlib.h" +#include -+ - #ifndef _WIN32 --#include -+#include - #endif - #include "System.h" ---- 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 + #ifndef _WIN32 + #include +--- src/sat/bsat2/ParseUtils.h.orig 2018-07-04 23:17:28.000000000 -0600 ++++ src/sat/bsat2/ParseUtils.h 2018-07-05 14:28:03.175731423 -0600 @@ -24,7 +24,7 @@ OF OR IN CONNECTION WITH THE SOFTWARE OR #include #include @@ -95,8 +90,8 @@ namespace Minisat { ---- 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 +--- src/sat/cnf/cnfMan.c.orig 2018-07-04 23:17:28.000000000 -0600 ++++ src/sat/cnf/cnfMan.c 2018-07-05 14:28:46.687639950 -0600 @@ -21,7 +21,7 @@ #include "cnf.h" #include "sat/bsat/satSolver.h" @@ -106,14 +101,14 @@ ABC_NAMESPACE_IMPL_START ---- 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 +--- src/sat/glucose/ParseUtils.h.orig 2018-07-04 23:17:28.000000000 -0600 ++++ src/sat/glucose/ParseUtils.h 2018-07-05 14:27:17.067828343 -0600 @@ -25,7 +25,7 @@ OF OR IN CONNECTION WITH THE SOFTWARE OR - #include - #include - --#include "misc/zlib/zlib.h" -+#include - - ABC_NAMESPACE_CXX_HEADER_START - + #include + #include + +-#include "misc/zlib/zlib.h" ++#include + + ABC_NAMESPACE_CXX_HEADER_START + diff --git a/abc-sharedlib.patch b/abc-sharedlib.patch index e0bb321..c96eb6a 100644 --- a/abc-sharedlib.patch +++ b/abc-sharedlib.patch @@ -1,6 +1,6 @@ ---- 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) +--- Makefile.orig 2018-07-05 14:10:12.171993636 -0600 ++++ Makefile 2018-07-05 14:13:34.091565427 -0600 +@@ -54,7 +54,7 @@ ARCHFLAGS := $(ARCHFLAGS) OPTFLAGS ?= -g -O @@ -9,7 +9,7 @@ ifneq ($(findstring arm,$(shell uname -m)),) CFLAGS += -DABC_MEMALIGN=4 endif -@@ -211,7 +211,9 @@ lib$(PROG).a: $(LIBOBJ) +@@ -222,7 +222,9 @@ lib$(PROG).a: $(LIBOBJ) lib$(PROG).so: $(LIBOBJ) @echo "$(MSG_PREFIX)\`\` Linking:" $(notdir $@) diff --git a/abc.spec b/abc.spec index 90fc97b..ece078d 100644 --- a/abc.spec +++ b/abc.spec @@ -1,7 +1,8 @@ -# Upstream doesn't make releases. We have to check the code out of Mercurial. -%global owner alanmi -%global commit 2860545fb810 -%global hgdate 20180228 +# Upstream doesn't make releases. We have to check the code out of git. +%global owner berkeley-abc +%global gittag 24407e13db4b8ca16c3996049b2d33ec3722de39 +%global shorttag %(cut -b -7 <<< %{gittag}) +%global gitdate 20180708 # WARNING: When updating to a newer snapshot, because upstream doesn't do # shared library versioning, run abipkgdiff (from libabigail) against the @@ -16,12 +17,12 @@ Name: abc Version: 1.01 -Release: 16.hg%{hgdate}%{?dist} +Release: 17.git%{gitdate}%{?dist} Summary: Sequential logic synthesis and formal verification License: MIT URL: http://www.eecs.berkeley.edu/~alanmi/abc/abc.htm -Source0: https://bitbucket.org/%{owner}/%{name}/get/%{commit}.zip +Source0: https://github.com/%{owner}/%{name}/archive/%{gittag}/%{name}-%{shorttag}.tar.gz # Man page created by Jerry James using upstream text; hence, it is covered by # the same copyright and license as the code. Source1: %{name}.1 @@ -67,23 +68,13 @@ Requires: %{name}-libs%{?_isa} = %{version}-%{release} Headers and libraries for developing applications that use ABC. %prep -%setup -q -n %{owner}-%{name}-%{commit} -%patch0 -%patch1 -%patch2 +%autosetup -p0 -n %{name}-%{gittag} # Do not use the bundled libraries rm -fr lib src/misc/{bzlib,zlib} -# Fix end of line encodings -for fil in readme.md readmeaig; do - sed -i.orig 's/\r//' ${fil} - touch -r ${fil}.orig ${fil} - rm -f ${fil}.orig -done - # Set the version number in the man page -sed 's/@VERSION@/%{version} (%{hgdate})/' %{SOURCE1} > %{name}.1 +sed 's/@VERSION@/%{version} (%{gitdate})/' %{SOURCE1} > %{name}.1 touch -r %{SOURCE1} %{name}.1 %build @@ -116,12 +107,10 @@ install -p -m 0755 %{name} %{buildroot}%{_bindir} mkdir -p %{buildroot}%{_mandir}/man1 install -p -m 0644 %{name}.1 %{buildroot}%{_mandir}/man1 -%post libs -p /sbin/ldconfig - -%postun libs -p /sbin/ldconfig +%ldconfig_scriptlets libs %files -%doc readme.md readmeaig +%doc README.md readmeaig %{_bindir}/%{name} %{_mandir}/man1/%{name}* @@ -134,6 +123,9 @@ install -p -m 0644 %{name}.1 %{buildroot}%{_mandir}/man1 %{_libdir}/lib%{name}.so %changelog +* Tue Jul 10 2018 Jerry James - 1.01-17.git20180708 +- Update to latest git snapshot + * Sat Mar 3 2018 Jerry James - 1.01-16.hg20180228 - Update to latest mercurial snapshot - BR gcc-c++ instead of gcc diff --git a/sources b/sources index 2868d73..eedef12 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (2860545fb810.zip) = 2bf9644f81fc0c32dde077c33b480eb9384e0ea7d0dd38b1a662194142b12ec2a639bcaa915e0536f965b854dd67976bc39d41d8e04a30980020c6226f0ccf7f +SHA512 (abc-24407e1.tar.gz) = 875dced2946e27bbed051e0c1b43bc18c0f5e5b660be916836fe4de18e7287af8c8641c5f7cf4be37184fa344cd4e4f7014358ee527cb8b7cee2bf29b4de08a9