From 1a3923d912ff263087fef48e2994c9e268038186 Mon Sep 17 00:00:00 2001 From: Ruben Undheim Date: Sun, 6 Nov 2016 10:08:50 +0100 Subject: Import berkeley-abc_1.01+20161002hgeb6eca6+dfsg-1.debian.tar.xz [dgit import tarball berkeley-abc 1.01+20161002hgeb6eca6+dfsg-1 berkeley-abc_1.01+20161002hgeb6eca6+dfsg-1.debian.tar.xz] --- README.source | 9 ++ berkeley-abc.install | 1 + berkeley-abc.manpages | 1 + changelog | 74 ++++++++++ compat | 1 + control | 27 ++++ copyright | 239 +++++++++++++++++++++++++++++++++ docs | 1 + gbp.conf | 2 + man/berkeley-abc.1 | 74 ++++++++++ man/berkeley-abc.txt | 30 +++++ man/genmanpages.sh | 4 + patches/cflags_ldflags.patch | 51 +++++++ patches/remove_bzlib_convenience.patch | 53 ++++++++ patches/remove_zlib_convenience.patch | 66 +++++++++ patches/reproducibility.patch | 29 ++++ patches/series | 5 + patches/writepla.patch | 17 +++ rules | 20 +++ source/format | 1 + 20 files changed, 705 insertions(+) create mode 100644 README.source create mode 100644 berkeley-abc.install create mode 100644 berkeley-abc.manpages create mode 100644 changelog create mode 100644 compat create mode 100644 control create mode 100644 copyright create mode 100644 docs create mode 100644 gbp.conf create mode 100644 man/berkeley-abc.1 create mode 100644 man/berkeley-abc.txt create mode 100755 man/genmanpages.sh create mode 100644 patches/cflags_ldflags.patch create mode 100644 patches/remove_bzlib_convenience.patch create mode 100644 patches/remove_zlib_convenience.patch create mode 100644 patches/reproducibility.patch create mode 100644 patches/series create mode 100644 patches/writepla.patch create mode 100755 rules create mode 100644 source/format diff --git a/README.source b/README.source new file mode 100644 index 0000000..251b0f6 --- /dev/null +++ b/README.source @@ -0,0 +1,9 @@ +The source tar ball was repackaged since it contained pre-compiled binary +libraries for Windows: + + abc/lib/x64/pthreadVC2.dll | Bin 82944 -> 0 bytes + abc/lib/x64/pthreadVC2.lib | Bin 29738 -> 0 bytes + abc/lib/x86/pthreadVC2.dll | Bin 86070 -> 0 bytes + abc/lib/x86/pthreadVC2.lib | Bin 29280 -> 0 bytes + +These are the only files that have been removed in the +dfsg tar ball. diff --git a/berkeley-abc.install b/berkeley-abc.install new file mode 100644 index 0000000..0315a88 --- /dev/null +++ b/berkeley-abc.install @@ -0,0 +1 @@ +berkeley-abc usr/bin diff --git a/berkeley-abc.manpages b/berkeley-abc.manpages new file mode 100644 index 0000000..5f8e787 --- /dev/null +++ b/berkeley-abc.manpages @@ -0,0 +1 @@ +debian/man/berkeley-abc.1 diff --git a/changelog b/changelog new file mode 100644 index 0000000..d77366e --- /dev/null +++ b/changelog @@ -0,0 +1,74 @@ +berkeley-abc (1.01+20161002hgeb6eca6+dfsg-1) unstable; urgency=medium + + * New upstream release + * Refreshed patches + * d/control: New Standards Version 3.9.8 - no needed changes + + -- Ruben Undheim Sun, 06 Nov 2016 10:08:50 +0100 + +berkeley-abc (1.01+20160215hgae7d65e+dfsg-1) unstable; urgency=low + + * New upstream version + - Refreshed patches + * d/control: + - Vcs URLs now using https. + - Standards version 3.9.7 - no needed changes + * d/copyright: Updated copyright year for Debian packaging + + -- Ruben Undheim Sun, 28 Feb 2016 15:48:32 +0100 + +berkeley-abc (1.01+20150706hgc3698e0+dfsg-2) unstable; urgency=low + + * debian/man: + - Added more sensible info in man page + - Using txt2man to generate man page from .txt file + + -- Ruben Undheim Sat, 22 Aug 2015 21:36:28 +0200 + +berkeley-abc (1.01+20150706hgc3698e0+dfsg-1) unstable; urgency=low + + * New upstream version + + -- Ruben Undheim Tue, 18 Aug 2015 12:16:35 +0200 + +berkeley-abc (1.01+20150424hg779de2d+dfsg-1) unstable; urgency=low + + * New upstream release + + -- Ruben Undheim Fri, 29 May 2015 16:20:05 +0200 + +berkeley-abc (1.01+20141105hg5b5af75+dfsg-3) unstable; urgency=medium + + * debian/patches/04_memory_alignment_fix.patch: + - Fixed error in patch.. + + -- Ruben Undheim Mon, 13 Apr 2015 21:56:02 +0200 + +berkeley-abc (1.01+20141105hg5b5af75+dfsg-2) unstable; urgency=medium + + * debian/patches/04_memory_alignment_fix.patch: + - Patch for memory alignment issue - already applied upstream + * debian/patches/abc-bugfix-20150403.diff (Closes: #782027) + * Patches from Johann Klammer (Thanks): + - debian/patches/reproducibility.patch + Patch for reproducibility (Closes: #780449) + - debian/patches/writepla.patch + Fixed "fails to export trivial .PLA files" (Closes: #780450) + + -- Ruben Undheim Tue, 31 Mar 2015 16:12:51 +0200 + +berkeley-abc (1.01+20141105hg5b5af75+dfsg-1) unstable; urgency=medium + + * New upstream version + * Updated standards version to 3.9.6 + * Added new copyright info for new files to d/copyright + * Regenerated all patches + * Enabled hardening=+all + + -- Ruben Undheim Sat, 08 Nov 2014 23:22:34 +0100 + +berkeley-abc (1.01+20140822hg4d547a5+dfsg-1) unstable; urgency=low + + * Initial release (Closes: #761364) + + -- Ruben Undheim Fri, 05 Sep 2014 21:17:26 +0200 diff --git a/compat b/compat new file mode 100644 index 0000000..ec63514 --- /dev/null +++ b/compat @@ -0,0 +1 @@ +9 diff --git a/control b/control new file mode 100644 index 0000000..d65ce9a --- /dev/null +++ b/control @@ -0,0 +1,27 @@ +Source: berkeley-abc +Section: electronics +Priority: optional +Maintainer: Debian Science Maintainers +Uploaders: Ruben Undheim +Build-Depends: debhelper (>= 9), libreadline-dev, libbz2-dev, + zlib1g-dev +Standards-Version: 3.9.8 +Vcs-Browser: https://anonscm.debian.org/cgit/debian-science/packages/berkeley-abc.git +Vcs-Git: https://anonscm.debian.org/git/debian-science/packages/berkeley-abc.git +Homepage: http://www.eecs.berkeley.edu/~alanmi/abc/ + +Package: berkeley-abc +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: ABC - A System for Sequential Synthesis and Verification + This is a growing software system for synthesis and verification of binary + sequential logic circuits appearing in synchronous hardware designs. ABC + combines scalable logic optimization based on And-Inverter Graphs (AIGs), + optimal-delay DAG-based technology mapping for look-up tables and standard + cells, and innovative algorithms for sequential synthesis and verification. + . + ABC provides an experimental implementation of these algorithms and a + programming environment for building similar applications. Future development + will focus on improving the algorithms and making most of the packages + stand-alone. This will allow the user to customize ABC for their needs as if + it were a tool-box rather than a complete tool. diff --git a/copyright b/copyright new file mode 100644 index 0000000..41f8c55 --- /dev/null +++ b/copyright @@ -0,0 +1,239 @@ +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: ABC +Source: http://www.eecs.berkeley.edu/~alanmi/abc/ + +Files: * +Copyright: The Regents of the University of California +License: University-of-California-Berkeley + +Files: src/bdd/cudd/* src/bdd/mtr/* src/bdd/epd/* +Copyright: 1995-2004 Regents of the University of Colorado +License: University-of-Colorado + +Files: lib/pthread.h lib/sched.h lib/semaphore.h +Copyright: 1998 John E. Bossom + 1999,2005 Pthreads-win32 contributors +License: GPL-2+ + +Files: src/sat/lsat/solver.h +Copyright: 2008 Niklas Sorensson + 2008 Koen Claessen +License: MIT + +Files: src/sat/bsat/* +Copyright: 2005 Niklas Sorensson +License: MIT + +Files: src/sat/bsat2/* +Copyright: 2003-2006 Niklas Een, Niklas Sorensson + 2006-2010 Niklas Sorensson +License: MIT + +Files: src/sat/bsat2/pstdint.h +Copyright: 2005-2014 Paul Hsieh +License: BSD-3 + +Files: src/misc/bzlib/* +Copyright: 1996-2007 Julian Seward +License: BSD-4 + +Files: src/misc/zlib/* +Copyright: 1995-2010 Mark Adler + 1995-2010 Jean-loup Gailly +License: zlib-license + +Files: src/base/abci/abcSaucy.c +Copyright: 2004 The Regents of the University of Michigan +License: University-of-Michigan + +Files: debian/* +Copyright: 2014-2016 Ruben Undheim +License: GPL-2+ + + + + + +License: University-of-California-Berkeley + Permission is hereby granted, without written agreement and without license or + royalty fees, to use, copy, modify, and distribute this software and its + documentation for any purpose, provided that the above copyright notice and + the following two paragraphs appear in all copies of this software. + . + IN NO EVENT SHALL THE UNIVERSITY OF CALIFORNIA BE LIABLE TO ANY PARTY FOR + DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT OF + THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF THE UNIVERSITY OF + CALIFORNIA HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + . + THE UNIVERSITY OF CALIFORNIA SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, + BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS ON AN "AS IS" BASIS, + AND THE UNIVERSITY OF CALIFORNIA HAS NO OBLIGATION TO PROVIDE MAINTENANCE, + SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. + +License: GPL-2+ + This package is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + . + This package is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + . + You should have received a copy of the GNU General Public License + along with this program. If not, see + . + On Debian systems, the complete text of the GNU General + Public License version 2 can be found in "/usr/share/common-licenses/GPL-2". + +License: University-of-Colorado + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions + are met: + . + Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + . + Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + . + Neither the name of the University of Colorado nor the names of its + contributors may be used to endorse or promote products derived from + this software without specific prior written permission. + . + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + POSSIBILITY OF SUCH DAMAGE.] + +License: zlib-license + This software is provided 'as-is', without any express or implied + warranty. In no event will the authors be held liable for any damages + arising from the use of this software. + . + Permission is granted to anyone to use this software for any purpose, + including commercial applications, and to alter it and redistribute it + freely, subject to the following restrictions: + . + 1. The origin of this software must not be misrepresented; you must not + claim that you wrote the original software. If you use this software + in a product, an acknowledgment in the product documentation would be + appreciated but is not required. + 2. Altered source versions must be plainly marked as such, and must not be + misrepresented as being the original software. + 3. This notice may not be removed or altered from any source distribution. + +License: University-of-Michigan + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions + are met: + . + Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + . + Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + . + Neither the name of the University of Michigan nor the names of its + contributors may be used to endorse or promote products derived from + this software without specific prior written permission. + . + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + POSSIBILITY OF SUCH DAMAGE.] + +License: MIT + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated documentation files (the "Software"), to deal + in the Software without restriction, including without limitation the rights + to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + copies of the Software, and to permit persons to whom the Software is + furnished to do so, subject to the following conditions: + . + The above copyright notice and this permission notice shall be included in + all copies or substantial portions of the Software. + . + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + SOFTWARE. + +License: BSD-3 + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions + are met: + 1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + 2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + 3. Neither the name of the University nor the names of its contributors + may be used to endorse or promote products derived from this software + without specific prior written permission. + . + THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + +License: BSD-4 + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions + are met: + . + 1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + . + 2. The origin of this software must not be misrepresented; you must + not claim that you wrote the original software. If you use this + software in a product, an acknowledgment in the product + documentation would be appreciated but is not required. + . + 3. Altered source versions must be plainly marked as such, and must + not be misrepresented as being the original software. + . + 4. The name of the author may not be used to endorse or promote + products derived from this software without specific prior written + permission. + . + THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS + OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY + DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE + GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, + WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE + diff --git a/docs b/docs new file mode 100644 index 0000000..cdb5f04 --- /dev/null +++ b/docs @@ -0,0 +1 @@ +readme.md diff --git a/gbp.conf b/gbp.conf new file mode 100644 index 0000000..cec628c --- /dev/null +++ b/gbp.conf @@ -0,0 +1,2 @@ +[DEFAULT] +pristine-tar = True diff --git a/man/berkeley-abc.1 b/man/berkeley-abc.1 new file mode 100644 index 0000000..bed1e5a --- /dev/null +++ b/man/berkeley-abc.1 @@ -0,0 +1,74 @@ +.\" Text automatically generated by txt2man +.TH BERKELEY-ABC 1 "22 August 2015" "" "" +.SH NAME +\fBberkeley-abc \fP- A System for Sequential Synthesis and Verification +\fB +.SH SYNOPSIS +.nf +.fam C +\fBberkeley-abc\fP [\fB-c\fP \fIcmd\fP] [\fB-f\fP \fIscript\fP] [\fB-h\fP] [\fB-o\fP \fIfile\fP] [\fB-s\fP] [\fB-t\fP \fItype\fP] [\fB-T\fP \fItype\fP] [\fB-x\fP] [\fB-b\fP] <\fIfile\fP> + +.fam T +.fi +.fam T +.fi +.SH DESCRIPTION +This manual page documents briefly the \fBberkeley-abc\fP command. +.PP +\fBberkeley-abc\fP is a program that synthesizes RTL to gate-level logic. +.SH OPTIONS +.TP +.B +\fB-c\fP \fIcmd\fP +execute commands `\fIcmd\fP' +.TP +.B +\fB-q\fP \fIcmd\fP +execute commands `\fIcmd\fP' quietly +.TP +.B +\fB-C\fP \fIcmd\fP +execute commands `\fIcmd\fP', then continue in interactive mode +.TP +.B +\fB-F\fP \fIscript\fP +execute commands from a \fIscript\fP \fIfile\fP and echo commands +.TP +.B +\fB-f\fP \fIscript\fP +execute commands from a \fIscript\fP \fIfile\fP +.TP +.B +\fB-h\fP +print the command usage +.TP +.B +\fB-o\fP \fIfile\fP +specify output filename to store the result +.TP +.B +\fB-s\fP +do not read any initialization \fIfile\fP +.TP +.B +\fB-t\fP \fItype\fP +specify input \fItype\fP (blif_mv (default), blif_mvs, blif, or none) +.TP +.B +\fB-T\fP \fItype\fP +specify output \fItype\fP (blif_mv (default), blif_mvs, blif, or none) +.TP +.B +\fB-x\fP +equivalent to '\fB-t\fP none \fB-T\fP none' +.TP +.B +\fB-b\fP +running in bridge mode +.RE +.PP + + + +.SH AUTHOR +This manual page was written by Ruben Undheim for the Debian project (and may be used by others). diff --git a/man/berkeley-abc.txt b/man/berkeley-abc.txt new file mode 100644 index 0000000..f970ab9 --- /dev/null +++ b/man/berkeley-abc.txt @@ -0,0 +1,30 @@ +NAME + berkeley-abc - A System for Sequential Synthesis and Verification + +SYNOPSIS + berkeley-abc [-c cmd] [-f script] [-h] [-o file] [-s] [-t type] [-T type] [-x] [-b] + +DESCRIPTION + This manual page documents briefly the berkeley-abc command. + + berkeley-abc is a program that synthesizes RTL to gate-level logic. + +OPTIONS + -c cmd execute commands `cmd' + -q cmd execute commands `cmd' quietly + -C cmd execute commands `cmd', then continue in interactive mode + -F script execute commands from a script file and echo commands + -f script execute commands from a script file + -h print the command usage + -o file specify output filename to store the result + -s do not read any initialization file + -t type specify input type (blif_mv (default), blif_mvs, blif, or none) + -T type specify output type (blif_mv (default), blif_mvs, blif, or none) + -x equivalent to '-t none -T none' + -b running in bridge mode + + + + +AUTHOR + This manual page was written by Ruben Undheim for the Debian project (and may be used by others). diff --git a/man/genmanpages.sh b/man/genmanpages.sh new file mode 100755 index 0000000..440c4a2 --- /dev/null +++ b/man/genmanpages.sh @@ -0,0 +1,4 @@ +#!/bin/bash + + +txt2man -t BERKELEY-ABC -s 1 berkeley-abc.txt > berkeley-abc.1 diff --git a/patches/cflags_ldflags.patch b/patches/cflags_ldflags.patch new file mode 100644 index 0000000..823227d --- /dev/null +++ b/patches/cflags_ldflags.patch @@ -0,0 +1,51 @@ +Description: Using LDFLAGS and CPPFLAGSpassed down from + dpkg-buildflags such that hardening gets enabled. +Forwarded: doesn't make sense upstream +Author: Ruben Undheim +Index: berkeley-abc/Makefile +=================================================================== +--- berkeley-abc.orig/Makefile 2016-11-03 23:13:32.919307349 +0000 ++++ berkeley-abc/Makefile 2016-11-03 23:13:32.915307349 +0000 +@@ -145,27 +145,27 @@ + + %.o: %.c + @echo "$(MSG_PREFIX)\`\` Compiling:" $(LOCAL_PATH)/$< +- $(VERBOSE)$(CC) -c $(OPTFLAGS) $(INCLUDES) $(CFLAGS) $< -o $@ ++ $(VERBOSE)$(CC) -c $(OPTFLAGS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $< -o $@ + + %.o: %.cc + @echo "$(MSG_PREFIX)\`\` Compiling:" $(LOCAL_PATH)/$< +- $(VERBOSE)$(CXX) -c $(OPTFLAGS) $(INCLUDES) $(CXXFLAGS) $< -o $@ ++ $(VERBOSE)$(CXX) -c $(OPTFLAGS) $(INCLUDES) $(CPPFLAGS) $(CXXFLAGS) $< -o $@ + + %.o: %.cpp + @echo "$(MSG_PREFIX)\`\` Compiling:" $(LOCAL_PATH)/$< +- $(VERBOSE)$(CXX) -c $(OPTFLAGS) $(INCLUDES) $(CXXFLAGS) $< -o $@ ++ $(VERBOSE)$(CXX) -c $(OPTFLAGS) $(INCLUDES) $(CPPFLAGS) $(CXXFLAGS) $< -o $@ + + %.d: %.c + @echo "$(MSG_PREFIX)\`\` Generating dependency:" $(LOCAL_PATH)/$< +- $(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)/$< +- $(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)/$< +- $(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) +@@ -184,7 +184,7 @@ + + $(PROG): $(OBJ) + @echo "$(MSG_PREFIX)\`\` Building binary:" $(notdir $@) +- $(VERBOSE)$(LD) -o $@ $^ $(LIBS) ++ $(VERBOSE)$(LD) -o $@ $^ $(LIBS) $(LDFLAGS) + + lib$(PROG).a: $(OBJ) + @echo "$(MSG_PREFIX)\`\` Linking:" $(notdir $@) diff --git a/patches/remove_bzlib_convenience.patch b/patches/remove_bzlib_convenience.patch new file mode 100644 index 0000000..5a4c94a --- /dev/null +++ b/patches/remove_bzlib_convenience.patch @@ -0,0 +1,53 @@ +Description: The library bzlib is included in the source and + built as a convenience library. This patch prevents this from being + built and links berkeley-abc with debian's bzlib library instead. +Forwarded: doesn't make sense upstream +Author: Ruben Undheim +Index: berkeley-abc/Makefile +=================================================================== +--- berkeley-abc.orig/Makefile 2016-11-03 23:13:04.679307046 +0000 ++++ berkeley-abc/Makefile 2016-11-03 23:13:04.675307046 +0000 +@@ -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/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 \ +@@ -117,7 +117,7 @@ + endif + + # LIBS := -ldl -lrt +-LIBS += -ldl -lm ++LIBS += -ldl -lm -lbz2 + ifneq ($(findstring Darwin, $(shell uname)), Darwin) + LIBS += -lrt + endif +Index: berkeley-abc/src/base/io/ioReadAiger.c +=================================================================== +--- berkeley-abc.orig/src/base/io/ioReadAiger.c 2016-11-03 23:13:04.679307046 +0000 ++++ berkeley-abc/src/base/io/ioReadAiger.c 2016-11-03 23:13:04.679307046 +0000 +@@ -26,7 +26,7 @@ + #include + #include + +-#include "misc/bzlib/bzlib.h" ++#include + #include "misc/zlib/zlib.h" + #include "ioAbc.h" + +Index: berkeley-abc/src/base/io/ioWriteAiger.c +=================================================================== +--- berkeley-abc.orig/src/base/io/ioWriteAiger.c 2016-11-03 23:13:04.679307046 +0000 ++++ berkeley-abc/src/base/io/ioWriteAiger.c 2016-11-03 23:13:04.679307046 +0000 +@@ -26,7 +26,7 @@ + #include + #include + +-#include "misc/bzlib/bzlib.h" ++#include + #include "misc/zlib/zlib.h" + #include "ioAbc.h" + diff --git a/patches/remove_zlib_convenience.patch b/patches/remove_zlib_convenience.patch new file mode 100644 index 0000000..2eea64d --- /dev/null +++ b/patches/remove_zlib_convenience.patch @@ -0,0 +1,66 @@ +Description: The library zlib is included in the source and + built as a convenience library. This patch prevents this from being + built and links berkeley-abc with debian's zlib library instead. +Forwarded: doesn't make sense upstream +Author: Ruben Undheim +Index: berkeley-abc/Makefile +=================================================================== +--- berkeley-abc.orig/Makefile 2016-11-03 23:13:26.263307278 +0000 ++++ berkeley-abc/Makefile 2016-11-03 23:13:26.259307278 +0000 +@@ -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/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 \ +@@ -117,7 +117,7 @@ + endif + + # LIBS := -ldl -lrt +-LIBS += -ldl -lm -lbz2 ++LIBS += -ldl -lm -lbz2 -lz + ifneq ($(findstring Darwin, $(shell uname)), Darwin) + LIBS += -lrt + endif +Index: berkeley-abc/src/base/io/ioReadAiger.c +=================================================================== +--- berkeley-abc.orig/src/base/io/ioReadAiger.c 2016-11-03 23:13:26.263307278 +0000 ++++ berkeley-abc/src/base/io/ioReadAiger.c 2016-11-03 23:13:26.259307278 +0000 +@@ -27,7 +27,7 @@ + #include + + #include +-#include "misc/zlib/zlib.h" ++#include + #include "ioAbc.h" + + ABC_NAMESPACE_IMPL_START +Index: berkeley-abc/src/base/io/ioWriteAiger.c +=================================================================== +--- berkeley-abc.orig/src/base/io/ioWriteAiger.c 2016-11-03 23:13:26.263307278 +0000 ++++ berkeley-abc/src/base/io/ioWriteAiger.c 2016-11-03 23:13:26.263307278 +0000 +@@ -27,7 +27,7 @@ + #include + + #include +-#include "misc/zlib/zlib.h" ++#include + #include "ioAbc.h" + + +Index: berkeley-abc/src/sat/cnf/cnfMan.c +=================================================================== +--- berkeley-abc.orig/src/sat/cnf/cnfMan.c 2016-11-03 23:13:26.263307278 +0000 ++++ berkeley-abc/src/sat/cnf/cnfMan.c 2016-11-03 23:13:26.263307278 +0000 +@@ -21,7 +21,7 @@ + #include "cnf.h" + #include "sat/bsat/satSolver.h" + #include "sat/bsat/satSolver2.h" +-#include "misc/zlib/zlib.h" ++#include + + ABC_NAMESPACE_IMPL_START + diff --git a/patches/reproducibility.patch b/patches/reproducibility.patch new file mode 100644 index 0000000..3534b8c --- /dev/null +++ b/patches/reproducibility.patch @@ -0,0 +1,29 @@ +Description: Remove the __TIME__ etc macros + Otherwise the debian package checking complains... +Author: Johann Klammer +Index: berkeley-abc/src/base/cmd/cmdUtils.c +=================================================================== +--- berkeley-abc.orig/src/base/cmd/cmdUtils.c 2016-11-03 23:13:41.607307443 +0000 ++++ berkeley-abc/src/base/cmd/cmdUtils.c 2016-11-03 23:13:41.603307442 +0000 +@@ -589,7 +589,7 @@ + nColumns = 79 / (LenghtMax + 2); + + // print the starting message +- fprintf( pAbc->Out, " Welcome to ABC compiled on %s %s!", __DATE__, __TIME__ ); ++ fprintf( pAbc->Out, " Welcome to ABC!"); + + // print the command by group + sGroupCur = NULL; +Index: berkeley-abc/src/base/main/mainUtils.c +=================================================================== +--- berkeley-abc.orig/src/base/main/mainUtils.c 2016-11-03 23:13:41.607307443 +0000 ++++ berkeley-abc/src/base/main/mainUtils.c 2016-11-03 23:13:41.603307442 +0000 +@@ -52,7 +52,7 @@ + char * Abc_UtilsGetVersion( Abc_Frame_t * pAbc ) + { + static char Version[1000]; +- sprintf(Version, "%s (compiled %s %s)", ABC_VERSION, __DATE__, __TIME__); ++ sprintf(Version, "%s", ABC_VERSION); + return Version; + } + diff --git a/patches/series b/patches/series new file mode 100644 index 0000000..55f6398 --- /dev/null +++ b/patches/series @@ -0,0 +1,5 @@ +remove_bzlib_convenience.patch +remove_zlib_convenience.patch +cflags_ldflags.patch +reproducibility.patch +writepla.patch diff --git a/patches/writepla.patch b/patches/writepla.patch new file mode 100644 index 0000000..e8adee6 --- /dev/null +++ b/patches/writepla.patch @@ -0,0 +1,17 @@ +Description: soften an overzealous assert + otherwise the abc will refuse to output trivial functions(constant 1 or 0). +Forwarded: https://bitbucket.org/alanmi/abc/issue/27/assertion-failure-in-write_pla-command +Author: Johann Klammer +Index: berkeley-abc/src/base/io/ioWritePla.c +=================================================================== +--- berkeley-abc.orig/src/base/io/ioWritePla.c 2016-11-03 23:13:46.431307494 +0000 ++++ berkeley-abc/src/base/io/ioWritePla.c 2016-11-03 23:13:46.431307494 +0000 +@@ -174,7 +174,7 @@ + FILE * pFile; + + assert( Abc_NtkIsSopNetlist(pNtk) ); +- assert( Abc_NtkLevel(pNtk) == 1 ); ++ assert( Abc_NtkLevel(pNtk) <= 1 ); + + pFile = fopen( pFileName, "w" ); + if ( pFile == NULL ) diff --git a/rules b/rules new file mode 100755 index 0000000..eaa83f4 --- /dev/null +++ b/rules @@ -0,0 +1,20 @@ +#!/usr/bin/make -f + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed + +export DEB_BUILD_MAINT_OPTIONS = hardening=+all + +%: + dh $@ + +override_dh_auto_clean: + rm -f berkeley-abc + dh_auto_clean + +override_dh_auto_build: + make PROG="abc" MSG_PREFIX="ABC: " + cp abc berkeley-abc + diff --git a/source/format b/source/format new file mode 100644 index 0000000..163aaf8 --- /dev/null +++ b/source/format @@ -0,0 +1 @@ +3.0 (quilt) -- cgit v1.2.3