[berkeley-abc] 03/03: Refreshed patches
Ruben Undheim
rubund-guest at moszumanska.debian.org
Sat Nov 8 22:36:44 UTC 2014
This is an automated email from the git hooks/post-receive script.
rubund-guest pushed a commit to branch master
in repository berkeley-abc.
commit 16c4c09ff9d995939c8a51d6c4774474d913cee7
Author: Ruben Undheim <ruben.undheim at gmail.com>
Date: Sat Nov 8 23:36:01 2014 +0100
Refreshed patches
---
debian/patches/cflags_ldflags.patch | 22 +++++++++++++-----
debian/patches/remove_bzlib_convenience.patch | 26 +++++++++++-----------
debian/patches/remove_zlib_convenience.patch | 32 +++++++++++++--------------
3 files changed, 45 insertions(+), 35 deletions(-)
diff --git a/debian/patches/cflags_ldflags.patch b/debian/patches/cflags_ldflags.patch
index 6145051..eefdc8d 100644
--- a/debian/patches/cflags_ldflags.patch
+++ b/debian/patches/cflags_ldflags.patch
@@ -2,11 +2,11 @@ Description: Using LDFLAGS and CPPFLAGSpassed down from
dpkg-buildflags such that hardening gets enabled.
Forwarded: doesn't make sense upstream
Author: Ruben Undheim <ruben.undheim at gmail.com>
-Index: berkeley-abc-1.01-20140822hg4d547a5e065b/Makefile
+Index: berkeley-abc/Makefile
===================================================================
---- berkeley-abc-1.01-20140822hg4d547a5e065b.orig/Makefile 2014-09-14 12:16:38.850652511 +0200
-+++ berkeley-abc-1.01-20140822hg4d547a5e065b/Makefile 2014-09-14 12:19:23.174654274 +0200
-@@ -103,19 +103,19 @@
+--- berkeley-abc.orig/Makefile 2014-11-08 23:33:21.546883879 +0100
++++ berkeley-abc/Makefile 2014-11-08 23:35:00.494883245 +0100
+@@ -104,27 +104,27 @@
%.o: %.c
@echo "$(MSG_PREFIX)\`\` Compiling:" $(LOCAL_PATH)/$<
@@ -18,8 +18,13 @@ Index: berkeley-abc-1.01-20140822hg4d547a5e065b/Makefile
- @$(CXX) -c $(CXXFLAGS) $< -o $@
+ @$(CXX) -c $(CPPFLAGS) $(CXXFLAGS) $< -o $@
+ %.o: %.cpp
+ @echo "$(MSG_PREFIX)\`\` Compiling:" $(LOCAL_PATH)/$<
+- @$(CXX) -c $(CXXFLAGS) $< -o $@
++ @$(CXX) -c $(CPPFLAGS) $(CXXFLAGS) $< -o $@
+
%.d: %.c
- @echo "$(MSG_PREFIX)\`\` Dependency:" $(LOCAL_PATH)/$<
+ @echo "$(MSG_PREFIX)\`\` Generating dependency:" $(LOCAL_PATH)/$<
- @./depends.sh $(CC) `dirname $*.c` $(CFLAGS) $*.c > $@
+ @./depends.sh $(CC) `dirname $*.c` $(CPPFLAGS) $(CFLAGS) $*.c > $@
@@ -28,9 +33,14 @@ Index: berkeley-abc-1.01-20140822hg4d547a5e065b/Makefile
- @./depends.sh $(CXX) `dirname $*.cc` $(CXXFLAGS) $*.cc > $@
+ @./depends.sh $(CXX) `dirname $*.cc` $(CPPFLAGS) $(CXXFLAGS) $*.cc > $@
+ %.d: %.cpp
+ @echo "$(MSG_PREFIX)\`\` Generating dependency:" $(LOCAL_PATH)/$<
+- @./depends.sh $(CXX) `dirname $*.cpp` $(CXXFLAGS) $*.cpp > $@
++ @./depends.sh $(CXX) `dirname $*.cpp` $(CPPFLAGS) $(CXXFLAGS) $*.cpp > $@
+
-include $(DEP)
-@@ -132,7 +132,7 @@
+@@ -141,7 +141,7 @@
$(PROG): $(OBJ)
@echo "$(MSG_PREFIX)\`\` Building binary:" $(notdir $@)
diff --git a/debian/patches/remove_bzlib_convenience.patch b/debian/patches/remove_bzlib_convenience.patch
index 8a435ed..d5b8f44 100644
--- a/debian/patches/remove_bzlib_convenience.patch
+++ b/debian/patches/remove_bzlib_convenience.patch
@@ -3,11 +3,11 @@ Description: The library bzlib is included in the source and
built and links berkeley-abc with debian's bzlib library instead.
Forwarded: doesn't make sense upstream
Author: Ruben Undheim <ruben.undheim at gmail.com>
-Index: yosys-abc/Makefile
+Index: berkeley-abc/Makefile
===================================================================
---- yosys-abc.orig/Makefile
-+++ yosys-abc/Makefile
-@@ -20,7 +20,7 @@ MODULES := \
+--- berkeley-abc.orig/Makefile 2014-11-08 23:29:36.846885317 +0100
++++ berkeley-abc/Makefile 2014-11-08 23:31:17.746884671 +0100
+@@ -20,7 +20,7 @@
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 \
@@ -16,19 +16,19 @@ Index: yosys-abc/Makefile
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
+@@ -67,7 +67,7 @@
endif
# LIBS := -ldl -lrt
--LIBS := -ldl
-+LIBS := -ldl -lbz2
+-LIBS += -ldl
++LIBS += -ldl -lbz2
ifneq ($(findstring Darwin, $(shell uname)), Darwin)
LIBS += -lrt
endif
-Index: yosys-abc/src/base/io/ioReadAiger.c
+Index: berkeley-abc/src/base/io/ioReadAiger.c
===================================================================
---- yosys-abc.orig/src/base/io/ioReadAiger.c
-+++ yosys-abc/src/base/io/ioReadAiger.c
+--- berkeley-abc.orig/src/base/io/ioReadAiger.c 2014-11-08 23:29:36.846885317 +0100
++++ berkeley-abc/src/base/io/ioReadAiger.c 2014-11-08 23:29:36.842885317 +0100
@@ -26,7 +26,7 @@
#include <string.h>
#include <assert.h>
@@ -38,10 +38,10 @@ Index: yosys-abc/src/base/io/ioReadAiger.c
#include "misc/zlib/zlib.h"
#include "ioAbc.h"
-Index: yosys-abc/src/base/io/ioWriteAiger.c
+Index: berkeley-abc/src/base/io/ioWriteAiger.c
===================================================================
---- yosys-abc.orig/src/base/io/ioWriteAiger.c
-+++ yosys-abc/src/base/io/ioWriteAiger.c
+--- berkeley-abc.orig/src/base/io/ioWriteAiger.c 2014-11-08 23:29:36.846885317 +0100
++++ berkeley-abc/src/base/io/ioWriteAiger.c 2014-11-08 23:29:36.842885317 +0100
@@ -26,7 +26,7 @@
#include <string.h>
#include <assert.h>
diff --git a/debian/patches/remove_zlib_convenience.patch b/debian/patches/remove_zlib_convenience.patch
index 7360637..60ae763 100644
--- a/debian/patches/remove_zlib_convenience.patch
+++ b/debian/patches/remove_zlib_convenience.patch
@@ -3,11 +3,11 @@ Description: The library zlib is included in the source and
built and links berkeley-abc with debian's zlib library instead.
Forwarded: doesn't make sense upstream
Author: Ruben Undheim <ruben.undheim at gmail.com>
-Index: abc/Makefile
+Index: berkeley-abc/Makefile
===================================================================
---- abc.orig/Makefile
-+++ abc/Makefile
-@@ -20,7 +20,7 @@ MODULES := \
+--- berkeley-abc.orig/Makefile 2014-11-08 23:31:40.998884522 +0100
++++ berkeley-abc/Makefile 2014-11-08 23:32:23.030884253 +0100
+@@ -20,7 +20,7 @@
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 \
@@ -16,19 +16,19 @@ Index: abc/Makefile
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
+@@ -67,7 +67,7 @@
endif
# LIBS := -ldl -lrt
--LIBS := -ldl -lbz2
-+LIBS := -ldl -lbz2 -lz
+-LIBS += -ldl -lbz2
++LIBS += -ldl -lbz2 -lz
ifneq ($(findstring Darwin, $(shell uname)), Darwin)
LIBS += -lrt
endif
-Index: abc/src/base/io/ioReadAiger.c
+Index: berkeley-abc/src/base/io/ioReadAiger.c
===================================================================
---- abc.orig/src/base/io/ioReadAiger.c
-+++ abc/src/base/io/ioReadAiger.c
+--- berkeley-abc.orig/src/base/io/ioReadAiger.c 2014-11-08 23:31:40.998884522 +0100
++++ berkeley-abc/src/base/io/ioReadAiger.c 2014-11-08 23:31:40.994884522 +0100
@@ -27,7 +27,7 @@
#include <assert.h>
@@ -38,10 +38,10 @@ Index: abc/src/base/io/ioReadAiger.c
#include "ioAbc.h"
ABC_NAMESPACE_IMPL_START
-Index: abc/src/base/io/ioWriteAiger.c
+Index: berkeley-abc/src/base/io/ioWriteAiger.c
===================================================================
---- abc.orig/src/base/io/ioWriteAiger.c
-+++ abc/src/base/io/ioWriteAiger.c
+--- berkeley-abc.orig/src/base/io/ioWriteAiger.c 2014-11-08 23:31:40.998884522 +0100
++++ berkeley-abc/src/base/io/ioWriteAiger.c 2014-11-08 23:31:40.994884522 +0100
@@ -27,7 +27,7 @@
#include <assert.h>
@@ -51,10 +51,10 @@ Index: abc/src/base/io/ioWriteAiger.c
#include "ioAbc.h"
-Index: abc/src/sat/cnf/cnfMan.c
+Index: berkeley-abc/src/sat/cnf/cnfMan.c
===================================================================
---- abc.orig/src/sat/cnf/cnfMan.c
-+++ abc/src/sat/cnf/cnfMan.c
+--- berkeley-abc.orig/src/sat/cnf/cnfMan.c 2014-11-08 23:31:40.998884522 +0100
++++ berkeley-abc/src/sat/cnf/cnfMan.c 2014-11-08 23:31:40.994884522 +0100
@@ -21,7 +21,7 @@
#include "cnf.h"
#include "sat/bsat/satSolver.h"
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/berkeley-abc.git
More information about the debian-science-commits
mailing list