[abc] Update to latest mercurial snapshot.

Jerry James jjames at fedoraproject.org
Sun Mar 8 00:23:26 UTC 2015 

commit 0adf615eff8969c3d66c5652e90161c411d3c6a3
Author: Jerry James <loganjerry at gmail.com>
Date:   Sat Mar 7 17:23:15 2015 -0700

    Update to latest mercurial snapshot.

 .gitignore          |  2 +-
 abc-bundlelib.patch | 24 ++++++++++++------------
 abc-sharedlib.patch | 20 ++++++++++----------
 abc.spec            |  9 ++++++---
 sources             |  2 +-
 5 files changed, 30 insertions(+), 27 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 27c9b90..8045af4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/9d02ea6631b8.zip
+/13cb576b8538.zip
diff --git a/abc-bundlelib.patch b/abc-bundlelib.patch
index a6d88ba..8fc3dbb 100644
--- a/abc-bundlelib.patch
+++ b/abc-bundlelib.patch
@@ -1,5 +1,5 @@
---- ./Makefile.orig	2014-11-30 17:18:13.000000000 -0700
-+++ ./Makefile	2014-12-01 12:00:00.000000000 -0700
+--- ./Makefile.orig	2015-03-06 12:01:18.000000000 -0700
++++ ./Makefile	2015-03-07 17:10:40.822991023 -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 \
@@ -9,7 +9,7 @@
  	src/misc/mem src/misc/bar src/misc/bbl \
  	src/opt/cut src/opt/fxu src/opt/rwr src/opt/mfs src/opt/sim \
  	src/opt/ret src/opt/res src/opt/lpk src/opt/nwk src/opt/rwt \
-@@ -67,7 +67,7 @@ endif
+@@ -72,7 +72,7 @@ endif
  endif
  
  # LIBS := -ldl -lrt
@@ -18,7 +18,7 @@
  ifneq ($(findstring Darwin, $(shell uname)), Darwin)
     LIBS += -lrt
  endif
-@@ -104,15 +104,15 @@ DEP := $(OBJ:.o=.d)
+@@ -109,15 +109,15 @@ DEP := $(OBJ:.o=.d)
  
  %.o: %.c
  	@echo "$(MSG_PREFIX)\`\` Compiling:" $(LOCAL_PATH)/$<
@@ -37,8 +37,8 @@
  
  %.d: %.c
  	@echo "$(MSG_PREFIX)\`\` Generating dependency:" $(LOCAL_PATH)/$<
---- ./src/base/io/ioReadAiger.c.orig	2014-11-30 17:18:13.000000000 -0700
-+++ ./src/base/io/ioReadAiger.c	2014-12-01 12:00:00.000000000 -0700
+--- ./src/base/io/ioReadAiger.c.orig	2015-03-06 12:01:18.000000000 -0700
++++ ./src/base/io/ioReadAiger.c	2015-03-07 17:10:40.823990943 -0700
 @@ -26,8 +26,8 @@
  #include <string.h>
  #include <assert.h>
@@ -50,8 +50,8 @@
  #include "ioAbc.h"
  
  ABC_NAMESPACE_IMPL_START
---- ./src/base/io/ioReadBlifMv.c.orig	2014-11-30 17:18:13.000000000 -0700
-+++ ./src/base/io/ioReadBlifMv.c	2014-12-01 12:00:00.000000000 -0700
+--- ./src/base/io/ioReadBlifMv.c.orig	2015-03-06 12:01:18.000000000 -0700
++++ ./src/base/io/ioReadBlifMv.c	2015-03-07 17:10:40.825990781 -0700
 @@ -18,8 +18,8 @@
  
  ***********************************************************************/
@@ -63,8 +63,8 @@
  #include "base/abc/abc.h"
  #include "misc/vec/vecPtr.h"
  #include "ioAbc.h"
---- ./src/base/io/ioWriteAiger.c.orig	2014-11-30 17:18:13.000000000 -0700
-+++ ./src/base/io/ioWriteAiger.c	2014-12-01 12:00:00.000000000 -0700
+--- ./src/base/io/ioWriteAiger.c.orig	2015-03-06 12:01:18.000000000 -0700
++++ ./src/base/io/ioWriteAiger.c	2015-03-07 17:10:40.826990701 -0700
 @@ -26,8 +26,8 @@
  #include <string.h>
  #include <assert.h>
@@ -76,8 +76,8 @@
  #include "ioAbc.h"
  
  
---- ./src/sat/cnf/cnfMan.c.orig	2014-11-30 17:18:13.000000000 -0700
-+++ ./src/sat/cnf/cnfMan.c	2014-12-01 12:00:00.000000000 -0700
+--- ./src/sat/cnf/cnfMan.c.orig	2015-03-06 12:01:18.000000000 -0700
++++ ./src/sat/cnf/cnfMan.c	2015-03-07 17:10:40.827990620 -0700
 @@ -21,7 +21,7 @@
  #include "cnf.h"
  #include "sat/bsat/satSolver.h"
diff --git a/abc-sharedlib.patch b/abc-sharedlib.patch
index d776d9b..86ea2b2 100644
--- a/abc-sharedlib.patch
+++ b/abc-sharedlib.patch
@@ -1,15 +1,15 @@
---- ./Makefile.orig	2014-12-01 12:00:00.000000000 -0700
-+++ ./Makefile	2014-12-01 12:00:00.000000000 -0700
-@@ -44,7 +44,7 @@ arch_flags : arch_flags.c
- ARCHFLAGS ?= $(shell $(CC) arch_flags.c -o arch_flags && ./arch_flags)
- OPTFLAGS  ?= -g -O #-DABC_NAMESPACE=xxx
+--- ./Makefile.orig	2015-03-07 17:10:40.822991023 -0700
++++ ./Makefile	2015-03-07 17:12:53.760275780 -0700
+@@ -46,7 +46,7 @@ ARCHFLAGS := $(ARCHFLAGS)
  
--CFLAGS   += -Wall -Wno-unused-function -Wno-write-strings -Wno-sign-compare $(OPTFLAGS) $(ARCHFLAGS) -Isrc
-+CFLAGS   += -Wno-unused-function $(OPTFLAGS) $(ARCHFLAGS) -Isrc
+ OPTFLAGS  ?= -g -O #-DABC_NAMESPACE=xxx
  
- # Set -Wno-unused-bug-set-variable for GCC 4.6.0 and greater only
- ifneq ($(or $(findstring gcc,$(CC)),$(findstring g++,$(CC))),)
-@@ -143,6 +143,12 @@ $(PROG): $(OBJ)
+-CFLAGS    += -Wall -Wno-unused-function -Wno-write-strings -Wno-sign-compare $(OPTFLAGS) $(ARCHFLAGS) -Isrc
++CFLAGS    += -Wno-unused-function $(OPTFLAGS) $(ARCHFLAGS) -Isrc
+ ifneq ($(findstring arm,$(shell uname -m)),)
+ 	CFLAGS += -DABC_MEMALIGN=4
+ endif
+@@ -148,6 +148,12 @@ $(PROG): $(OBJ)
  	@echo "$(MSG_PREFIX)\`\` Building binary:" $(notdir $@)
  	@$(LD) -o $@ $^ $(LIBS)
  
diff --git a/abc.spec b/abc.spec
index ffd9abc..2a2271e 100644
--- a/abc.spec
+++ b/abc.spec
@@ -7,12 +7,12 @@
 
 # Upstream doesn't make releases.  We have to check the code out of Mercurial.
 %global owner   alanmi
-%global commit  9d02ea6631b8
-%global hgdate  20150101
+%global commit  13cb576b8538
+%global hgdate  20150306
 
 Name:           abc
 Version:        1.01
-Release:        3.hg%{hgdate}%{?dist}
+Release:        4.hg%{hgdate}%{?dist}
 Summary:        Sequential logic synthesis and formal verification
 
 # This would be MIT, but we link with readline
@@ -164,6 +164,9 @@ popd
 %{python2_sitearch}/*
 
 %changelog
+* Sat Mar  7 2015 Jerry James <loganjerry at gmail.com> - 1.01-4.hg20150306
+- Update to latest mercurial snapshot
+
 * Thu Jan  1 2015 Jerry James <loganjerry at gmail.com> - 1.01-3.hg20150101
 - Update to latest mercurial snapshot
 - Fix installation of header files
diff --git a/sources b/sources
index d58b8bf..c40b4d8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c3e3cca21dc48d439b262648dc689b71  9d02ea6631b8.zip
+ac672fae774da114514727a02e3ea595  13cb576b8538.zip

More information about the scm-commits mailing list