[qflow] 01/01: Updated patch
Ruben Undheim
rubund-guest at moszumanska.debian.org
Thu Oct 16 20:27: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 qflow.
commit 70e50e96aae00f468e31912618bcf602bd49e93b
Author: Ruben Undheim <ruben.undheim at gmail.com>
Date: Thu Oct 16 20:24:14 2014 +0000
Updated patch
---
debian/patches/fixes.diff | 460 ---------------------------------------------
debian/patches/fixes.patch | 118 ++++++++++++
debian/patches/series | 2 +-
3 files changed, 119 insertions(+), 461 deletions(-)
diff --git a/debian/patches/fixes.diff b/debian/patches/fixes.diff
deleted file mode 100644
index 5975c2b..0000000
--- a/debian/patches/fixes.diff
+++ /dev/null
@@ -1,460 +0,0 @@
-Index: qflow-1.0/Makefile
-===================================================================
---- qflow-1.0.orig/Makefile 2014-04-18 10:53:00.958281597 +0200
-+++ /dev/null 1970-01-01 00:00:00.000000000 +0000
-@@ -1,34 +0,0 @@
--#
--# qflow project main Makefile
--#
--
--SHELL = /bin/sh
--
--EXEEXT =
--
--TARGETS = src scripts tech
--
--all: $(TARGETS)
-- @for target in $(TARGETS); do\
-- (cd $$target ; $(MAKE) all) ;\
-- done
--
--install:
-- @for target in $(TARGETS); do\
-- (cd $$target ; $(MAKE) install) ;\
-- done
--
--clean:
-- @for target in $(TARGETS); do\
-- (cd $$target ; $(MAKE) clean) ;\
-- done
--
--distclean:
-- @for target in $(TARGETS); do\
-- (cd $$target ; $(MAKE) distclean) ;\
-- done
--
--uninstall:
-- @for target in $(TARGETS); do\
-- (cd $$target ; $(MAKE) uninstall) ;\
-- done
-Index: qflow-1.0/Makefile.in
-===================================================================
---- qflow-1.0.orig/Makefile.in 2014-04-18 10:53:00.958281597 +0200
-+++ qflow-1.0/Makefile.in 2014-04-18 10:53:30.010281845 +0200
-@@ -24,9 +24,6 @@
- done
-
- distclean:
-- @for target in $(TARGETS); do\
-- (cd $$target ; $(MAKE) distclean) ;\
-- done
-
- uninstall:
- @for target in $(TARGETS); do\
-Index: qflow-1.0/scripts/Makefile
-===================================================================
---- qflow-1.0.orig/scripts/Makefile 2014-04-18 10:53:00.974281598 +0200
-+++ /dev/null 1970-01-01 00:00:00.000000000 +0000
-@@ -1,71 +0,0 @@
--#
--# qflow project scripts makefile
--#
--
--# Main compiler arguments
--CFLAGS = -g -O2
--DEFS = -DPACKAGE_NAME=\"\" -DPACKAGE_TARNAME=\"\" -DPACKAGE_VERSION=\"\" -DPACKAGE_STRING=\"\" -DPACKAGE_BUGREPORT=\"\" -DPACKAGE_URL=\"\" -DSTDC_HEADERS=1 -DHAVE_SETENV=1 -DHAVE_PUTENV=1 -DTCLSH_PATH=\"tclsh\" -DQFLOW_MAGIC_PATH=\"/usr/local/bin/magic\" -DQFLOW_QROUTER_PATH=\"/usr/local/bin/qrouter\" -DQFLOW_TWRC_PATH=\"/home/tim/src/timberwolf-6.3/.twrc\" -DQFLOW_YOSYS_PATH=\"/usr/local/bin/yosys\" -DQFLOW_ODIN_PATH=\"/home/tim/src/vtr/ODIN_II/odin_II.exe\" -DQFLOW_ABC_PATH=\"/home/ti [...]
--LIBS =
--LDFLAGS =
--INSTALL = /usr/bin/install -c
--
--QFLOW_LIB_DIR = /usr/local/share/qflow
--QFLOW_BIN_DIR = /usr/local/bin
--
--DEFAULTPARSER = @QFLOW_DEFAULT_PARSER@
--
--TCL_SCRIPTS = blif2cel.tcl clocktree.tcl place2def.tcl place2lef2.tcl
--TCL_SCRIPTS += place2net2.tcl postproc.tcl ypostproc.tcl ybuffer.tcl
--TCL_SCRIPTS += setreset.tcl vmunge.tcl decongest.tcl
--TCL_SCRIPTS += addspacers.tcl getfillcell.tcl vispreproc.tcl outputprep.tcl
--SHELL_SCRIPTS = placement.sh router.sh vesta.sh
--SHELL_SCRIPTS += synthesize_odin.sh synthesize_yosys.sh
--SHELL_SCRIPTS += resynthesize.sh qflow.sh checkdirs.sh
--SHELL_SCRIPTS += cleanup.sh display.sh createGDS.sh
--MAIN_SCRIPT = qflow
--
--SCRIPTINSTALL = ${QFLOW_LIB_DIR}/scripts
--TECHINSTALL = ${QFLOW_LIB_DIR}/tech
--QFLOWEXECPATH = ${QFLOW_LIB_DIR}/bin
--EXECINSTALL = ${QFLOW_BIN_DIR}
--
--all: $(MAIN_SCRIPT).in qflow.sh
-- $(MAKE) launcher
--
--launcher: $(MAIN_SCRIPT).in
-- sed -e '/QFLOW_SCRIPT_DIR/s#QFLOW_SCRIPT_DIR#$(SCRIPTINSTALL)#' \
-- $(MAIN_SCRIPT).in > $(MAIN_SCRIPT)
--
--checkdirs.sh: checkdirs.sh.in
-- sed -e '/SUBST_TECH_DIR/s#SUBST_TECH_DIR#$(TECHINSTALL)#' \
-- -e '/SUBST_SCRIPT_DIR/s#SUBST_SCRIPT_DIR#$(SCRIPTINSTALL)#' \
-- -e '/SUBST_BIN_DIR/s#SUBST_BIN_DIR#$(QFLOWEXECPATH)#' \
-- checkdirs.sh.in > checkdirs.sh
--
--qflow.sh: qflow.sh.in
-- sed -e '/QFLOW_SCRIPT_DIR/s#QFLOW_SCRIPT_DIR#$(SCRIPTINSTALL)#' \
-- -e '/QFLOW_DEFAULT_PARSER/s#QFLOW_DEFAULT_PARSER#$(DEFAULTPARSER)#' \
-- qflow.sh.in > qflow.sh
--
--install: $(TCL_SCRIPTS) $(SHELL_SCRIPTS) $(MAIN_SCRIPT)
-- @echo "Installing qflow scripts"
-- $(INSTALL) -d ${SCRIPTINSTALL}
-- for target in $(TCL_SCRIPTS); do \
-- $(INSTALL) $$target ${SCRIPTINSTALL} ;\
-- done
-- for target in $(SHELL_SCRIPTS); do \
-- $(INSTALL) $$target ${SCRIPTINSTALL} ;\
-- done
-- @echo "Installing qflow executable"
-- $(INSTALL) -d ${EXECINSTALL}
-- $(INSTALL) ${MAIN_SCRIPT} ${EXECINSTALL}
--
--clean:
-- $(RM) $(MAIN_SCRIPT)
-- $(RM) checkdirs.sh
-- $(RM) qflow.sh
--
--uninstall:
-- $(RM) -rf ${SCRIPTINSTALL}
-- $(RM) ${EXECINSTALL}/${MAIN_SCRIPT}
--
-Index: qflow-1.0/scripts/Makefile.in
-===================================================================
---- qflow-1.0.orig/scripts/Makefile.in 2014-04-18 10:53:00.974281598 +0200
-+++ qflow-1.0/scripts/Makefile.in 2014-04-18 10:55:17.810282762 +0200
-@@ -9,8 +9,8 @@
- LDFLAGS = @LDFLAGS@
- INSTALL = @INSTALL@
-
--QFLOW_LIB_DIR = @QFLOW_LIB_DIR@
--QFLOW_BIN_DIR = @QFLOW_BIN_DIR@
-+QFLOW_LIB_DIR = ${DESTDIR}/usr/share/qflow
-+QFLOW_BIN_DIR = ${DESTDIR}/usr/bin
-
- DEFAULTPARSER = @QFLOW_DEFAULT_PARSER@
-
-@@ -37,9 +37,9 @@
- $(MAIN_SCRIPT).in > $(MAIN_SCRIPT)
-
- checkdirs.sh: checkdirs.sh.in
-- sed -e '/SUBST_TECH_DIR/s#SUBST_TECH_DIR#$(TECHINSTALL)#' \
-- -e '/SUBST_SCRIPT_DIR/s#SUBST_SCRIPT_DIR#$(SCRIPTINSTALL)#' \
-- -e '/SUBST_BIN_DIR/s#SUBST_BIN_DIR#$(QFLOWEXECPATH)#' \
-+ sed -e '/SUBST_TECH_DIR/s#SUBST_TECH_DIR#/usr/share/qflow/tech#' \
-+ -e '/SUBST_SCRIPT_DIR/s#SUBST_SCRIPT_DIR#/usr/share/qflow/scripts#' \
-+ -e '/SUBST_BIN_DIR/s#SUBST_BIN_DIR#/usr/share/qflow/bin#' \
- checkdirs.sh.in > checkdirs.sh
-
- qflow.sh: qflow.sh.in
-Index: qflow-1.0/src/Makefile
-===================================================================
---- qflow-1.0.orig/src/Makefile 2014-04-18 10:53:00.986281598 +0200
-+++ /dev/null 1970-01-01 00:00:00.000000000 +0000
-@@ -1,86 +0,0 @@
--#
--# qflow project source compile makefile
--#
--
--# Main compiler arguments
--CFLAGS = -g
--DEFS = -DPACKAGE_NAME=\"\" -DPACKAGE_TARNAME=\"\" -DPACKAGE_VERSION=\"\" -DPACKAGE_STRING=\"\" -DPACKAGE_BUGREPORT=\"\" -DPACKAGE_URL=\"\" -DSTDC_HEADERS=1 -DHAVE_SETENV=1 -DHAVE_PUTENV=1 -DTCLSH_PATH=\"tclsh\" -DQFLOW_MAGIC_PATH=\"/usr/local/bin/magic\" -DQFLOW_QROUTER_PATH=\"/usr/local/bin/qrouter\" -DQFLOW_TWRC_PATH=\"/home/tim/src/timberwolf-6.3/.twrc\" -DQFLOW_YOSYS_PATH=\"/usr/local/bin/yosys\" -DQFLOW_ODIN_PATH=\"/home/tim/src/vtr/ODIN_II/odin_II.exe\" -DQFLOW_ABC_PATH=\"/home/ti [...]
--LIBS =
--LDFLAGS =
--INSTALL = /usr/bin/install -c
--
--QFLOW_LIB_DIR = /usr/local/share/qflow
--QFLOW_TW_PATH = /home/tim/src/timberwolf-6.3
--QFLOW_QROUTER_PATH = /usr/local/bin/qrouter
--QFLOW_ABC_PATH = /home/tim/src/vtr/abc_with_bb_support/abc
--QFLOW_ODIN_PATH = /home/tim/src/vtr/ODIN_II/odin_II.exe
--QFLOW_MAGIC_PATH = /usr/local/bin/magic
--QFLOW_YOSYS_PATH = /usr/local/bin/yosys
--
--HAVE_ABC = 1
--HAVE_YOSYS = 1
--HAVE_ODIN_II = 1
--
--OBJECTS = blif2BSpice.o blif2Verilog.o blifFanout.o
--OBJECTS += verilogpp.o dcombine.o liberty2tech.o vesta.o
--SOURCES := $(patsubst %.o,%.c,$(OBJECTS))
--TARGETS := $(patsubst %.o,%$(EXEEXT),$(OBJECTS))
--
--BININSTALL = ${QFLOW_LIB_DIR}/bin
--
--all: $(TARGETS)
--
--blif2BSpice$(EXEEXT): blif2BSpice.o
-- $(CC) $(LDFLAGS) blif2BSpice.o -o $@ $(LIBS)
--
--blifFanout$(EXEEXT): blifFanout.o
-- $(CC) $(LDFLAGS) blifFanout.o -o $@ $(LIBS)
--
--blif2Verilog$(EXEEXT): blif2Verilog.o
-- $(CC) $(LDFLAGS) blif2Verilog.o -o $@ $(LIBS)
--
--verilogpp$(EXEEXT): verilogpp.o
-- $(CC) $(LDFLAGS) verilogpp.o -o $@ $(LIBS)
--
--vesta$(EXEEXT): vesta.o
-- $(CC) $(LDFLAGS) vesta.o -o $@ $(LIBS)
--
--dcombine$(EXEEXT): dcombine.o
-- $(CC) $(LDFLAGS) dcombine.o -o $@ $(LIBS)
--
--liberty2tech$(EXEEXT): liberty2tech.o
-- $(CC) $(LDFLAGS) liberty2tech.o -o $@ $(LIBS)
--
--install: $(TARGETS)
-- @echo "Installing verilog and BDNET file format handlers"
-- $(INSTALL) -d ${BININSTALL}
-- @for target in $(TARGETS); do \
-- $(INSTALL) $$target ${BININSTALL} ;\
-- done
-- @echo "Installing links to TimberWolf, qrouter, odin_ii, and abc"
-- (cd ${BININSTALL}; $(RM) -f twdir; ln -s $(QFLOW_TW_PATH) twdir)
-- (cd ${BININSTALL}; $(RM) -f qrouter; ln -s $(QFLOW_QROUTER_PATH) qrouter)
-- @if test "${HAVE_ABC}" = "1"; then \
-- (cd ${BININSTALL}; $(RM) -f abc; ln -s $(QFLOW_ABC_PATH) abc); \
-- fi
-- @if test "${HAVE_ODIN_II}" = "1"; then \
-- (cd ${BININSTALL}; $(RM) -f odin_ii; ln -s $(QFLOW_ODIN_PATH) odin_ii); \
-- fi
-- (cd ${BININSTALL}; $(RM) -f magic; ln -s $(QFLOW_MAGIC_PATH) magic)
-- @if test "${HAVE_YOSYS}" = "1"; then \
-- (cd ${BININSTALL}; $(RM) -f yosys; ln -s $(QFLOW_YOSYS_PATH) yosys); \
-- fi
--
--uninstall:
-- $(RM) -rf ${BININSTALL}
--
--clean:
-- $(RM) -f $(OBJECTS)
-- $(RM) -f $(TARGETS)
--
--veryclean:
-- $(RM) -f $(OBJECTS)
-- $(RM) -f $(TARGETS)
--
--.c.o:
-- $(CC) $(CFLAGS) $(CPPFLAGS) $(DEFS) -c $< -o $@
-Index: qflow-1.0/tech/Makefile
-===================================================================
---- qflow-1.0.orig/tech/Makefile 2014-04-18 10:53:00.994281598 +0200
-+++ /dev/null 1970-01-01 00:00:00.000000000 +0000
-@@ -1,41 +0,0 @@
--#
--# qflow project tech makefile
--#
--
--# Main compiler arguments
--CFLAGS = -g -O2
--DEFS = -DPACKAGE_NAME=\"\" -DPACKAGE_TARNAME=\"\" -DPACKAGE_VERSION=\"\" -DPACKAGE_STRING=\"\" -DPACKAGE_BUGREPORT=\"\" -DPACKAGE_URL=\"\" -DSTDC_HEADERS=1 -DHAVE_SETENV=1 -DHAVE_PUTENV=1 -DTCLSH_PATH=\"tclsh\" -DQFLOW_MAGIC_PATH=\"/usr/local/bin/magic\" -DQFLOW_QROUTER_PATH=\"/usr/local/bin/qrouter\" -DQFLOW_TWRC_PATH=\"/home/tim/src/timberwolf-6.3/.twrc\" -DQFLOW_YOSYS_PATH=\"/usr/local/bin/yosys\" -DQFLOW_ODIN_PATH=\"/home/tim/src/vtr/ODIN_II/odin_II.exe\" -DQFLOW_ABC_PATH=\"/home/ti [...]
--LIBS =
--LDFLAGS =
--INSTALL = /usr/bin/install -c
--
--QFLOW_LIB_DIR = /usr/local/share/qflow
--
--TECH_DIRS = osu035 osu050
--
--TECHINSTALL = ${QFLOW_LIB_DIR}/tech
--
--all:
-- @echo "Making all in tech directories"
-- for target in $(TECH_DIRS); do \
-- (cd $$target ; $(MAKE) all) ;\
-- done
--
--install:
-- @echo "Installing built-in tech files"
-- $(INSTALL) -d ${TECHINSTALL}
-- for target in $(TECH_DIRS); do \
-- (cd $$target ; $(MAKE) install) ;\
-- done
--
--clean:
-- @echo "Cleaning up built-in tech files"
-- for target in $(TECH_DIRS); do \
-- (cd $$target ; $(MAKE) clean) ;\
-- done
--
--
--uninstall:
-- @echo "Uninstalling built-in tech files
-- $(RM) -rf ${TECHINSTALL}
--
-Index: qflow-1.0/tech/osu035/Makefile
-===================================================================
---- qflow-1.0.orig/tech/osu035/Makefile 2014-04-18 10:53:00.994281598 +0200
-+++ /dev/null 1970-01-01 00:00:00.000000000 +0000
-@@ -1,40 +0,0 @@
--#
--# qflow project included technology osu035 files
--#
--
--# Main compiler arguments
--CFLAGS = -g -O2
--DEFS = -DPACKAGE_NAME=\"\" -DPACKAGE_TARNAME=\"\" -DPACKAGE_VERSION=\"\" -DPACKAGE_STRING=\"\" -DPACKAGE_BUGREPORT=\"\" -DPACKAGE_URL=\"\" -DSTDC_HEADERS=1 -DHAVE_SETENV=1 -DHAVE_PUTENV=1 -DTCLSH_PATH=\"tclsh\" -DQFLOW_MAGIC_PATH=\"/usr/local/bin/magic\" -DQFLOW_QROUTER_PATH=\"/usr/local/bin/qrouter\" -DQFLOW_TWRC_PATH=\"/home/tim/src/timberwolf-6.3/.twrc\" -DQFLOW_YOSYS_PATH=\"/usr/local/bin/yosys\" -DQFLOW_ODIN_PATH=\"/home/tim/src/vtr/ODIN_II/odin_II.exe\" -DQFLOW_ABC_PATH=\"/home/ti [...]
--LIBS =
--LDFLAGS =
--INSTALL = /usr/bin/install -c
--
--QFLOW_LIB_DIR = /usr/local/share/qflow
--
--TECH_FILES = osu035.genlib osu035.super osu035.par osu035_stdcells.lef
--TECH_FILES += osu035.sh osu035_stdcells.sp osu035.magicrc osu035.prm
--TECH_FILES += gate.cfg SCN4M_SUBM.20.tech osu035_stdcells.lib
--
--TECHINSTALL = ${QFLOW_LIB_DIR}/tech
--
--# Substitute the target qflow tech directory name in .magicrc so that magic
--# can find the OSU035 techfile
--
--all: osu035.magicrc.in
-- $(RM) -f osu035.magicrc
-- cat osu035.magicrc.in | sed -e \
-- '/QFLOW_LIB_DIR/s#QFLOW_LIB_DIR#$(QFLOW_LIB_DIR)#' \
-- > osu035.magicrc
--
--install: ${TECH_FILES}
-- @echo "Installing osu035 tech files"
-- $(INSTALL) -d $(TECHINSTALL)/osu035
-- for target in $(TECH_FILES); do \
-- $(INSTALL) $$target $(TECHINSTALL)/osu035 ;\
-- done
--
--clean:
-- $(RM) -f osu035.magicrc
--
--uninstall:
--
-Index: qflow-1.0/tech/osu050/Makefile
-===================================================================
---- qflow-1.0.orig/tech/osu050/Makefile 2014-04-18 10:53:01.006281598 +0200
-+++ /dev/null 1970-01-01 00:00:00.000000000 +0000
-@@ -1,40 +0,0 @@
--#
--# qflow project included technology osu050 files
--#
--
--# Main compiler arguments
--CFLAGS = -g -O2
--DEFS = -DPACKAGE_NAME=\"\" -DPACKAGE_TARNAME=\"\" -DPACKAGE_VERSION=\"\" -DPACKAGE_STRING=\"\" -DPACKAGE_BUGREPORT=\"\" -DPACKAGE_URL=\"\" -DSTDC_HEADERS=1 -DHAVE_SETENV=1 -DHAVE_PUTENV=1 -DTCLSH_PATH=\"tclsh\" -DQFLOW_MAGIC_PATH=\"/usr/local/bin/magic\" -DQFLOW_QROUTER_PATH=\"/usr/local/bin/qrouter\" -DQFLOW_TWRC_PATH=\"/home/tim/src/timberwolf-6.3/.twrc\" -DQFLOW_YOSYS_PATH=\"/usr/local/bin/yosys\" -DQFLOW_ODIN_PATH=\"/home/tim/src/vtr/ODIN_II/odin_II.exe\" -DQFLOW_ABC_PATH=\"/home/ti [...]
--LIBS =
--LDFLAGS =
--INSTALL = /usr/bin/install -c
--
--QFLOW_LIB_DIR = /usr/local/share/qflow
--
--TECH_FILES = osu050.genlib osu050.super osu050.par osu050_stdcells.lef
--TECH_FILES += osu050.sh osu050_stdcells.sp osu050.magicrc osu050.prm
--TECH_FILES += gate.cfg SCN3ME_SUBM.30.tech osu05_stdcells.lib
--
--TECHINSTALL = ${QFLOW_LIB_DIR}/tech
--
--# Substitute the target qflow tech directory name in .magicrc so that magic
--# can find the OSU050 techfile
--
--all: osu050.magicrc.in
-- $(RM) -f osu050.magicrc
-- cat osu050.magicrc.in | sed -e \
-- '/QFLOW_LIB_DIR/s#QFLOW_LIB_DIR#$(QFLOW_LIB_DIR)#' \
-- > osu050.magicrc
--
--install: ${TECH_FILES}
-- @echo "Installing osu050 tech files"
-- $(INSTALL) -d $(TECHINSTALL)/osu050
-- for target in $(TECH_FILES); do \
-- $(INSTALL) $$target $(TECHINSTALL)/osu050 ;\
-- done
--
--clean:
-- $(RM) -f osu050.magicrc
--
--uninstall:
--
-Index: qflow-1.0/src/Makefile.in
-===================================================================
---- qflow-1.0.orig/src/Makefile.in 2014-04-18 10:53:00.986281598 +0200
-+++ qflow-1.0/src/Makefile.in 2014-04-18 10:53:30.014281845 +0200
-@@ -9,7 +9,7 @@
- LDFLAGS = @LDFLAGS@
- INSTALL = @INSTALL@
-
--QFLOW_LIB_DIR = @QFLOW_LIB_DIR@
-+QFLOW_LIB_DIR = ${DESTDIR}/usr/share/qflow
- QFLOW_TW_PATH = @QFLOW_TW_PATH@
- QFLOW_QROUTER_PATH = @QFLOW_QROUTER_PATH@
- QFLOW_ABC_PATH = @QFLOW_ABC_PATH@
-@@ -58,17 +58,17 @@
- $(INSTALL) $$target ${BININSTALL} ;\
- done
- @echo "Installing links to TimberWolf, qrouter, odin_ii, and abc"
-- (cd ${BININSTALL}; $(RM) -f twdir; ln -s $(QFLOW_TW_PATH) twdir)
-- (cd ${BININSTALL}; $(RM) -f qrouter; ln -s $(QFLOW_QROUTER_PATH) qrouter)
-+ (cd ${BININSTALL}; $(RM) -f twdir; ln -s /usr/lib/timberwolf twdir)
-+ (cd ${BININSTALL}; $(RM) -f qrouter; ln -s /usr/bin/qrouter qrouter)
- @if test "${HAVE_ABC}" = "1"; then \
-- (cd ${BININSTALL}; $(RM) -f abc; ln -s $(QFLOW_ABC_PATH) abc); \
-+ (cd ${BININSTALL}; $(RM) -f abc; ln -s /usr/bin/qrouter-abc abc); \
- fi
- @if test "${HAVE_ODIN_II}" = "1"; then \
-- (cd ${BININSTALL}; $(RM) -f odin_ii; ln -s $(QFLOW_ODIN_PATH) odin_ii); \
-+ (cd ${BININSTALL}; $(RM) -f odin_ii; ln -s /usr/bin/odin_ii odin_ii); \
- fi
-- (cd ${BININSTALL}; $(RM) -f magic; ln -s $(QFLOW_MAGIC_PATH) magic)
-+ (cd ${BININSTALL}; $(RM) -f magic; ln -s /usr/bin/magic magic)
- @if test "${HAVE_YOSYS}" = "1"; then \
-- (cd ${BININSTALL}; $(RM) -f yosys; ln -s $(QFLOW_YOSYS_PATH) yosys); \
-+ (cd ${BININSTALL}; $(RM) -f yosys; ln -s /usr/bin/yosys yosys); \
- fi
-
- uninstall:
-Index: qflow-1.0/tech/osu035/Makefile.in
-===================================================================
---- qflow-1.0.orig/tech/osu035/Makefile.in 2014-04-18 10:53:00.994281598 +0200
-+++ qflow-1.0/tech/osu035/Makefile.in 2014-04-18 10:53:30.014281845 +0200
-@@ -9,7 +9,7 @@
- LDFLAGS = @LDFLAGS@
- INSTALL = @INSTALL@
-
--QFLOW_LIB_DIR = @QFLOW_LIB_DIR@
-+QFLOW_LIB_DIR = ${DESTDIR}/usr/share/qflow
-
- TECH_FILES = osu035.genlib osu035.super osu035.par osu035_stdcells.lef
- TECH_FILES += osu035.sh osu035_stdcells.sp osu035.magicrc osu035.prm
-Index: qflow-1.0/tech/osu050/Makefile.in
-===================================================================
---- qflow-1.0.orig/tech/osu050/Makefile.in 2014-04-18 10:53:01.006281598 +0200
-+++ qflow-1.0/tech/osu050/Makefile.in 2014-04-18 10:53:30.018281845 +0200
-@@ -9,7 +9,7 @@
- LDFLAGS = @LDFLAGS@
- INSTALL = @INSTALL@
-
--QFLOW_LIB_DIR = @QFLOW_LIB_DIR@
-+QFLOW_LIB_DIR = ${DESTDIR}/usr/share/qflow
-
- TECH_FILES = osu050.genlib osu050.super osu050.par osu050_stdcells.lef
- TECH_FILES += osu050.sh osu050_stdcells.sp osu050.magicrc osu050.prm
-Index: qflow-1.0/tech/Makefile.in
-===================================================================
---- qflow-1.0.orig/tech/Makefile.in 2014-04-18 10:53:00.994281598 +0200
-+++ qflow-1.0/tech/Makefile.in 2014-04-18 10:53:30.018281845 +0200
-@@ -9,7 +9,7 @@
- LDFLAGS = @LDFLAGS@
- INSTALL = @INSTALL@
-
--QFLOW_LIB_DIR = @QFLOW_LIB_DIR@
-+QFLOW_LIB_DIR = ${DESTDIR}/usr/share/qflow
-
- TECH_DIRS = osu035 osu050
-
diff --git a/debian/patches/fixes.patch b/debian/patches/fixes.patch
new file mode 100644
index 0000000..9387f1a
--- /dev/null
+++ b/debian/patches/fixes.patch
@@ -0,0 +1,118 @@
+Index: qflow/Makefile.in
+===================================================================
+--- qflow.orig/Makefile.in 2014-10-16 20:21:10.000000000 +0000
++++ qflow/Makefile.in 2014-10-16 20:21:44.543366747 +0000
+@@ -24,9 +24,6 @@
+ done
+
+ distclean:
+- @for target in $(TARGETS); do\
+- (cd $$target ; $(MAKE) distclean) ;\
+- done
+
+ uninstall:
+ @for target in $(TARGETS); do\
+Index: qflow/scripts/Makefile.in
+===================================================================
+--- qflow.orig/scripts/Makefile.in 2014-10-16 20:21:10.000000000 +0000
++++ qflow/scripts/Makefile.in 2014-10-16 20:22:48.647358486 +0000
+@@ -9,8 +9,8 @@
+ LDFLAGS = @LDFLAGS@
+ INSTALL = @INSTALL@
+
+-QFLOW_LIB_DIR = @QFLOW_LIB_DIR@
+-QFLOW_BIN_DIR = @QFLOW_BIN_DIR@
++QFLOW_LIB_DIR = ${DESTDIR}/usr/share/qflow
++QFLOW_BIN_DIR = ${DESTDIR}/usr/bin
+
+ DEFAULTPARSER = @QFLOW_DEFAULT_PARSER@
+
+@@ -37,9 +37,9 @@
+ $(MAIN_SCRIPT).in > $(MAIN_SCRIPT)
+
+ checkdirs.sh: checkdirs.sh.in
+- sed -e '/SUBST_TECH_DIR/s#SUBST_TECH_DIR#$(TECHINSTALL)#' \
+- -e '/SUBST_SCRIPT_DIR/s#SUBST_SCRIPT_DIR#$(SCRIPTINSTALL)#' \
+- -e '/SUBST_BIN_DIR/s#SUBST_BIN_DIR#$(QFLOWEXECPATH)#' \
++ sed -e '/SUBST_TECH_DIR/s#SUBST_TECH_DIR#/usr/share/qflow/tech#' \
++ -e '/SUBST_SCRIPT_DIR/s#SUBST_SCRIPT_DIR#/usr/share/qflow/scripts#' \
++ -e '/SUBST_BIN_DIR/s#SUBST_BIN_DIR#/usr/share/qflow/bin#' \
+ checkdirs.sh.in > checkdirs.sh
+
+ qflow.sh: qflow.sh.in
+Index: qflow/src/Makefile.in
+===================================================================
+--- qflow.orig/src/Makefile.in 2014-10-16 20:22:30.063358166 +0000
++++ qflow/src/Makefile.in 2014-10-16 20:22:36.623349257 +0000
+@@ -9,7 +9,7 @@
+ LDFLAGS = @LDFLAGS@
+ INSTALL = @INSTALL@
+
+-QFLOW_LIB_DIR = @QFLOW_LIB_DIR@
++QFLOW_LIB_DIR = ${DESTDIR}/usr/share/qflow
+ QFLOW_TW_PATH = @QFLOW_TW_PATH@
+ QFLOW_QROUTER_PATH = @QFLOW_QROUTER_PATH@
+ QFLOW_ABC_PATH = @QFLOW_ABC_PATH@
+@@ -58,17 +58,17 @@
+ $(INSTALL) $$target ${BININSTALL} ;\
+ done
+ @echo "Installing links to TimberWolf, qrouter, odin_ii, and abc"
+- (cd ${BININSTALL}; $(RM) -f twdir; ln -s $(QFLOW_TW_PATH) twdir)
+- (cd ${BININSTALL}; $(RM) -f qrouter; ln -s $(QFLOW_QROUTER_PATH) qrouter)
++ (cd ${BININSTALL}; $(RM) -f twdir; ln -s /usr/lib/timberwolf twdir)
++ (cd ${BININSTALL}; $(RM) -f qrouter; ln -s /usr/bin/qrouter qrouter)
+ @if test "${HAVE_ABC}" = "1"; then \
+- (cd ${BININSTALL}; $(RM) -f abc; ln -s $(QFLOW_ABC_PATH) abc); \
++ (cd ${BININSTALL}; $(RM) -f abc; ln -s /usr/bin/qrouter-abc abc); \
+ fi
+ @if test "${HAVE_ODIN_II}" = "1"; then \
+- (cd ${BININSTALL}; $(RM) -f odin_ii; ln -s $(QFLOW_ODIN_PATH) odin_ii); \
++ (cd ${BININSTALL}; $(RM) -f odin_ii; ln -s /usr/bin/odin_ii odin_ii); \
+ fi
+- (cd ${BININSTALL}; $(RM) -f magic; ln -s $(QFLOW_MAGIC_PATH) magic)
++ (cd ${BININSTALL}; $(RM) -f magic; ln -s /usr/bin/magic magic)
+ @if test "${HAVE_YOSYS}" = "1"; then \
+- (cd ${BININSTALL}; $(RM) -f yosys; ln -s $(QFLOW_YOSYS_PATH) yosys); \
++ (cd ${BININSTALL}; $(RM) -f yosys; ln -s /usr/bin/yosys yosys); \
+ fi
+
+ uninstall:
+Index: qflow/tech/Makefile.in
+===================================================================
+--- qflow.orig/tech/Makefile.in 2014-10-16 20:21:10.000000000 +0000
++++ qflow/tech/Makefile.in 2014-10-16 20:23:06.603357576 +0000
+@@ -9,7 +9,7 @@
+ LDFLAGS = @LDFLAGS@
+ INSTALL = @INSTALL@
+
+-QFLOW_LIB_DIR = @QFLOW_LIB_DIR@
++QFLOW_LIB_DIR = ${DESTDIR}/usr/share/qflow
+
+ TECH_DIRS = osu035 osu050
+
+Index: qflow/tech/osu035/Makefile.in
+===================================================================
+--- qflow.orig/tech/osu035/Makefile.in 2014-10-16 20:21:10.000000000 +0000
++++ qflow/tech/osu035/Makefile.in 2014-10-16 20:23:19.915370508 +0000
+@@ -9,7 +9,7 @@
+ LDFLAGS = @LDFLAGS@
+ INSTALL = @INSTALL@
+
+-QFLOW_LIB_DIR = @QFLOW_LIB_DIR@
++QFLOW_LIB_DIR = ${DESTDIR}/usr/share/qflow
+
+ TECH_FILES = osu035.genlib osu035.super osu035.par osu035_stdcells.lef
+ TECH_FILES += osu035.sh osu035_stdcells.sp osu035.magicrc osu035.prm
+Index: qflow/tech/osu050/Makefile.in
+===================================================================
+--- qflow.orig/tech/osu050/Makefile.in 2014-10-16 20:21:10.000000000 +0000
++++ qflow/tech/osu050/Makefile.in 2014-10-16 20:23:32.591362868 +0000
+@@ -9,7 +9,7 @@
+ LDFLAGS = @LDFLAGS@
+ INSTALL = @INSTALL@
+
+-QFLOW_LIB_DIR = @QFLOW_LIB_DIR@
++QFLOW_LIB_DIR = ${DESTDIR}/usr/share/qflow
+
+ TECH_FILES = osu050.genlib osu050.super osu050.par osu050_stdcells.lef
+ TECH_FILES += osu050.sh osu050_stdcells.sp osu050.magicrc osu050.prm
diff --git a/debian/patches/series b/debian/patches/series
index 42f8512..b4a9e84 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1 @@
-fixes.diff
+fixes.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/qflow.git
More information about the debian-science-commits
mailing list