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

Update to latest mercurial snapshot.

Browse source 
Also, drop the python2 subpackage; upstream moved python support to a
separate project.
This commit is contained in:
Jerry James 2016-02-05 16:06:55 -07:00
commit 744413fb3a
5 changed files with 45 additions and 101 deletions
Download patch file Download diff file Expand all files Collapse all files

51
abc-bundlelib.patch
View file

@ -1,44 +1,25 @@
--- ./Makefile.orig 2015-03-06 12:01:18.000000000 -0700
+++ ./Makefile 2015-03-07 17:10:40.822991023 -0700
@@ -20,7 +20,7 @@ MODULES := \
--- Makefile.orig 2016-02-03 14:56:47.000000000 -0700
+++ Makefile 2016-02-04 21:41:31.862198725 -0700
@@ -18,7 +18,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 \
- src/misc/vec src/misc/hash src/misc/tim src/misc/bzlib src/misc/zlib \
+ src/misc/vec src/misc/hash src/misc/tim \
src/misc/mem src/misc/bar src/misc/bbl \
src/misc/mem src/misc/bar src/misc/bbl src/misc/parse \
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 \
@@ -72,7 +72,7 @@ endif
src/opt/ret src/opt/fret src/opt/res src/opt/lpk src/opt/nwk src/opt/rwt \
@@ -117,7 +117,7 @@ endif
endif
# LIBS := -ldl -lrt
-LIBS += -ldl
+LIBS += -Wl,--as-needed -lbz2 -lz -ldl
-LIBS += -ldl -lm
+LIBS += -Wl,--as-needed -lbz2 -lz -ldl -lm
ifneq ($(findstring Darwin, $(shell uname)), Darwin)
LIBS += -lrt
endif
@@ -109,15 +109,15 @@ DEP := $(OBJ:.o=.d)
%.o: %.c
@echo "$(MSG_PREFIX)\`\` Compiling:" $(LOCAL_PATH)/$<
- @$(CC) -c $(CFLAGS) $< -o $@
+ $(CC) -c $(CFLAGS) $< -o $@
%.o: %.cc
@echo "$(MSG_PREFIX)\`\` Compiling:" $(LOCAL_PATH)/$<
- @$(CXX) -c $(CXXFLAGS) $< -o $@
+ $(CXX) -c $(CXXFLAGS) $< -o $@
%.o: %.cpp
@echo "$(MSG_PREFIX)\`\` Compiling:" $(LOCAL_PATH)/$<
- @$(CXX) -c $(CXXFLAGS) $< -o $@
+ $(CXX) -c $(CXXFLAGS) $< -o $@
%.d: %.c
@echo "$(MSG_PREFIX)\`\` Generating dependency:" $(LOCAL_PATH)/$<
--- ./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
--- 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
@@ -26,8 +26,8 @@
#include <string.h>
#include <assert.h>
@ -50,8 +31,8 @@
#include "ioAbc.h"
ABC_NAMESPACE_IMPL_START
--- ./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
--- 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
@@ -18,8 +18,8 @@
***********************************************************************/
@ -63,8 +44,8 @@
#include "base/abc/abc.h"
#include "misc/vec/vecPtr.h"
#include "ioAbc.h"
--- ./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
--- 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
@@ -26,8 +26,8 @@
#include <string.h>
#include <assert.h>
@ -76,8 +57,8 @@
#include "ioAbc.h"
--- ./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
--- 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
@@ -21,7 +21,7 @@
#include "cnf.h"
#include "sat/bsat/satSolver.h"