[berkeley-abc] 02/05: Refreshed patches

Ruben Undheim rubund-guest at moszumanska.debian.org
Sun Feb 28 15:39:36 UTC 2016 

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 c225e6d06667e0a2afb4d417863190178d2cf2dd
Author: Ruben Undheim <ruben.undheim at gmail.com>
Date:   Sun Feb 28 15:47:28 2016 +0100

    Refreshed patches
---
 debian/patches/cflags_ldflags.patch           | 38 +++++++++++++--------------
 debian/patches/remove_bzlib_convenience.patch | 20 +++++++-------
 debian/patches/remove_zlib_convenience.patch  | 24 ++++++++---------
 debian/patches/writepla.patch                 |  6 ++---
 4 files changed, 44 insertions(+), 44 deletions(-)

diff --git a/debian/patches/cflags_ldflags.patch b/debian/patches/cflags_ldflags.patch
index 18f052a..ce0342c 100644
--- a/debian/patches/cflags_ldflags.patch
+++ b/debian/patches/cflags_ldflags.patch
@@ -4,48 +4,48 @@ Forwarded: doesn't make sense upstream
 Author: Ruben Undheim <ruben.undheim at gmail.com>
 Index: berkeley-abc/Makefile
 ===================================================================
---- berkeley-abc.orig/Makefile
-+++ berkeley-abc/Makefile
-@@ -109,27 +109,27 @@ DEP := $(OBJ:.o=.d)
+--- berkeley-abc.orig/Makefile	2016-02-28 15:39:36.205555535 +0100
++++ berkeley-abc/Makefile	2016-02-28 15:41:37.311771354 +0100
+@@ -145,27 +145,27 @@
  
  %.o: %.c
  	@echo "$(MSG_PREFIX)\`\` Compiling:" $(LOCAL_PATH)/$<
--	@$(CC) -c $(CFLAGS) $< -o $@
-+	@$(CC) -c $(CPPFLAGS) $(CFLAGS) $< -o $@
+-	$(VERBOSE)$(CC) -c $(OPTFLAGS) $(INCLUDES) $(CFLAGS) $< -o $@
++	$(VERBOSE)$(CC) -c $(OPTFLAGS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $< -o $@
  
  %.o: %.cc
  	@echo "$(MSG_PREFIX)\`\` Compiling:" $(LOCAL_PATH)/$<
--	@$(CXX) -c $(CXXFLAGS) $< -o $@
-+	@$(CXX) -c $(CPPFLAGS) $(CXXFLAGS) $< -o $@
+-	$(VERBOSE)$(CXX) -c $(OPTFLAGS) $(INCLUDES) $(CXXFLAGS) $< -o $@
++	$(VERBOSE)$(CXX) -c $(OPTFLAGS) $(INCLUDES) $(CPPFLAGS) $(CXXFLAGS) $< -o $@
  
  %.o: %.cpp
  	@echo "$(MSG_PREFIX)\`\` Compiling:" $(LOCAL_PATH)/$<
--	@$(CXX) -c $(CXXFLAGS) $< -o $@
-+	@$(CXX) -c $(CPPFLAGS) $(CXXFLAGS) $< -o $@
+-	$(VERBOSE)$(CXX) -c $(OPTFLAGS) $(INCLUDES) $(CXXFLAGS) $< -o $@
++	$(VERBOSE)$(CXX) -c $(OPTFLAGS) $(INCLUDES) $(CPPFLAGS) $(CXXFLAGS) $< -o $@
  
  %.d: %.c
  	@echo "$(MSG_PREFIX)\`\` Generating dependency:" $(LOCAL_PATH)/$<
--	@./depends.sh $(CC) `dirname $*.c` $(CFLAGS) $*.c > $@
-+	@./depends.sh $(CC) `dirname $*.c` $(CPPFLAGS) $(CFLAGS) $*.c > $@
+-	$(VERBOSE)./depends.sh $(CC) `dirname $*.c` $(OPTFLAGS) $(INCLUDES) $(CFLAGS) $*.c > $@
++	$(VERBOSE)./depends.sh $(CC) `dirname $*.c` $(OPTFLAGS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $*.c > $@
  
  %.d: %.cc
  	@echo "$(MSG_PREFIX)\`\` Generating dependency:" $(LOCAL_PATH)/$<
--	@./depends.sh $(CXX) `dirname $*.cc` $(CXXFLAGS) $*.cc > $@
-+	@./depends.sh $(CXX) `dirname $*.cc` $(CPPFLAGS) $(CXXFLAGS) $*.cc > $@
+-	$(VERBOSE)./depends.sh $(CXX) `dirname $*.cc` $(OPTFLAGS) $(INCLUDES) $(CXXFLAGS) $*.cc > $@
++	$(VERBOSE)./depends.sh $(CXX) `dirname $*.cc` $(OPTFLAGS) $(INCLUDES) $(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 > $@
+-	$(VERBOSE)./depends.sh $(CXX) `dirname $*.cpp` $(OPTFLAGS) $(INCLUDES) $(CXXFLAGS) $*.cpp > $@
++	$(VERBOSE)./depends.sh $(CXX) `dirname $*.cpp` $(OPTFLAGS) $(INCLUDES) $(CPPFLAGS) $(CXXFLAGS) $*.cpp > $@
  
+ ifndef ABC_MAKE_NO_DEPS
  -include $(DEP)
- 
-@@ -146,7 +146,7 @@ tags:
+@@ -184,7 +184,7 @@
  
  $(PROG): $(OBJ)
  	@echo "$(MSG_PREFIX)\`\` Building binary:" $(notdir $@)
--	@$(LD) -o $@ $^ $(LIBS)
-+	@$(LD) -o $@ $^ $(LIBS) $(LDFLAGS)
+-	$(VERBOSE)$(LD) -o $@ $^ $(LIBS)
++	$(VERBOSE)$(LD) -o $@ $^ $(LIBS) $(LDFLAGS)
  
  lib$(PROG).a: $(OBJ)
  	@echo "$(MSG_PREFIX)\`\` Linking:" $(notdir $@)
diff --git a/debian/patches/remove_bzlib_convenience.patch b/debian/patches/remove_bzlib_convenience.patch
index 02032cb..dc29176 100644
--- a/debian/patches/remove_bzlib_convenience.patch
+++ b/debian/patches/remove_bzlib_convenience.patch
@@ -5,18 +5,18 @@ Forwarded: doesn't make sense upstream
 Author: Ruben Undheim <ruben.undheim at gmail.com>
 Index: berkeley-abc/Makefile
 ===================================================================
---- berkeley-abc.orig/Makefile
-+++ berkeley-abc/Makefile
-@@ -20,7 +20,7 @@ MODULES := \
+--- berkeley-abc.orig/Makefile	2016-02-28 15:46:10.143100866 +0100
++++ berkeley-abc/Makefile	2016-02-28 15:46:46.455214622 +0100
+@@ -18,7 +18,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 \
 -	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/zlib \
- 	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
  
  # LIBS := -ldl -lrt
@@ -27,8 +27,8 @@ Index: berkeley-abc/Makefile
  endif
 Index: berkeley-abc/src/base/io/ioReadAiger.c
 ===================================================================
---- berkeley-abc.orig/src/base/io/ioReadAiger.c
-+++ berkeley-abc/src/base/io/ioReadAiger.c
+--- berkeley-abc.orig/src/base/io/ioReadAiger.c	2016-02-28 15:46:10.143100866 +0100
++++ berkeley-abc/src/base/io/ioReadAiger.c	2016-02-28 15:46:10.135101704 +0100
 @@ -26,7 +26,7 @@
  #include <string.h>
  #include <assert.h>
@@ -40,8 +40,8 @@ Index: berkeley-abc/src/base/io/ioReadAiger.c
  
 Index: berkeley-abc/src/base/io/ioWriteAiger.c
 ===================================================================
---- berkeley-abc.orig/src/base/io/ioWriteAiger.c
-+++ berkeley-abc/src/base/io/ioWriteAiger.c
+--- berkeley-abc.orig/src/base/io/ioWriteAiger.c	2016-02-28 15:46:10.143100866 +0100
++++ berkeley-abc/src/base/io/ioWriteAiger.c	2016-02-28 15:46:10.135101704 +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 8d823c2..2c7b32e 100644
--- a/debian/patches/remove_zlib_convenience.patch
+++ b/debian/patches/remove_zlib_convenience.patch
@@ -5,18 +5,18 @@ Forwarded: doesn't make sense upstream
 Author: Ruben Undheim <ruben.undheim at gmail.com>
 Index: berkeley-abc/Makefile
 ===================================================================
---- berkeley-abc.orig/Makefile
-+++ berkeley-abc/Makefile
-@@ -20,7 +20,7 @@ MODULES := \
+--- berkeley-abc.orig/Makefile	2016-02-28 15:39:08.493543911 +0100
++++ berkeley-abc/Makefile	2016-02-28 15:39:24.147311960 +0100
+@@ -18,7 +18,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 \
 -	src/misc/vec src/misc/hash src/misc/tim 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
  
  # LIBS := -ldl -lrt
@@ -27,8 +27,8 @@ Index: berkeley-abc/Makefile
  endif
 Index: berkeley-abc/src/base/io/ioReadAiger.c
 ===================================================================
---- berkeley-abc.orig/src/base/io/ioReadAiger.c
-+++ berkeley-abc/src/base/io/ioReadAiger.c
+--- berkeley-abc.orig/src/base/io/ioReadAiger.c	2016-02-28 15:39:08.493543911 +0100
++++ berkeley-abc/src/base/io/ioReadAiger.c	2016-02-28 15:39:08.485545035 +0100
 @@ -27,7 +27,7 @@
  #include <assert.h>
  
@@ -40,8 +40,8 @@ Index: berkeley-abc/src/base/io/ioReadAiger.c
  ABC_NAMESPACE_IMPL_START
 Index: berkeley-abc/src/base/io/ioWriteAiger.c
 ===================================================================
---- berkeley-abc.orig/src/base/io/ioWriteAiger.c
-+++ berkeley-abc/src/base/io/ioWriteAiger.c
+--- berkeley-abc.orig/src/base/io/ioWriteAiger.c	2016-02-28 15:39:08.493543911 +0100
++++ berkeley-abc/src/base/io/ioWriteAiger.c	2016-02-28 15:39:08.489544473 +0100
 @@ -27,7 +27,7 @@
  #include <assert.h>
  
@@ -53,8 +53,8 @@ Index: berkeley-abc/src/base/io/ioWriteAiger.c
  
 Index: berkeley-abc/src/sat/cnf/cnfMan.c
 ===================================================================
---- berkeley-abc.orig/src/sat/cnf/cnfMan.c
-+++ berkeley-abc/src/sat/cnf/cnfMan.c
+--- berkeley-abc.orig/src/sat/cnf/cnfMan.c	2016-02-28 15:39:08.493543911 +0100
++++ berkeley-abc/src/sat/cnf/cnfMan.c	2016-02-28 15:39:08.489544473 +0100
 @@ -21,7 +21,7 @@
  #include "cnf.h"
  #include "sat/bsat/satSolver.h"
diff --git a/debian/patches/writepla.patch b/debian/patches/writepla.patch
index 6552505..aedfa09 100644
--- a/debian/patches/writepla.patch
+++ b/debian/patches/writepla.patch
@@ -4,9 +4,9 @@ Forwarded: https://bitbucket.org/alanmi/abc/issue/27/assertion-failure-in-write_
 Author: Johann Klammer <klammerj at a1.net>
 Index: berkeley-abc/src/base/io/ioWritePla.c
 ===================================================================
---- berkeley-abc.orig/src/base/io/ioWritePla.c
-+++ berkeley-abc/src/base/io/ioWritePla.c
-@@ -171,7 +171,7 @@ int Io_WritePla( Abc_Ntk_t * pNtk, char
+--- berkeley-abc.orig/src/base/io/ioWritePla.c	2016-02-28 15:42:47.295199324 +0100
++++ berkeley-abc/src/base/io/ioWritePla.c	2016-02-28 15:42:47.291199471 +0100
+@@ -174,7 +174,7 @@
      FILE * pFile;
  
      assert( Abc_NtkIsSopNetlist(pNtk) );

-- 
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