[qflow] 03/03: Fixed patches so that it works with 1.0.88
Ruben Undheim
rubund-guest at moszumanska.debian.org
Thu Oct 16 21:30:04 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 91c7a02cfa9be0ebeb3c9c5a1731e4c4a47e9903
Author: Ruben Undheim <ruben.undheim at gmail.com>
Date: Thu Oct 16 23:22:27 2014 +0200
Fixed patches so that it works with 1.0.88
---
debian/patches/01_fix_install_dir.patch | 80 ++++++++++++++++++++
debian/patches/02_fix_compile_error.patch | 13 ++++
debian/patches/fixes.patch | 118 ------------------------------
debian/patches/series | 3 +-
4 files changed, 95 insertions(+), 119 deletions(-)
diff --git a/debian/patches/01_fix_install_dir.patch b/debian/patches/01_fix_install_dir.patch
new file mode 100644
index 0000000..5950aa7
--- /dev/null
+++ b/debian/patches/01_fix_install_dir.patch
@@ -0,0 +1,80 @@
+Index: qflow/scripts/Makefile.in
+===================================================================
+--- qflow.orig/scripts/Makefile.in 2014-10-16 22:33:12.551197757 +0200
++++ qflow/scripts/Makefile.in 2014-10-16 22:38:00.375195915 +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/lib/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/lib/qflow/scripts#' \
++ -e '/SUBST_BIN_DIR/s#SUBST_BIN_DIR#/usr/lib/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 22:33:12.551197757 +0200
++++ qflow/src/Makefile.in 2014-10-16 22:39:08.299195480 +0200
+@@ -9,7 +9,7 @@
+ LDFLAGS = @LDFLAGS@
+ INSTALL = @INSTALL@
+
+-QFLOW_LIB_DIR = @QFLOW_LIB_DIR@
++QFLOW_LIB_DIR = ${DESTDIR}/usr/lib/qflow
+ QFLOW_GRAYWOLF_PATH = @QFLOW_GRAYWOLF_PATH@
+ QFLOW_QROUTER_PATH = @QFLOW_QROUTER_PATH@
+ QFLOW_ABC_PATH = @QFLOW_ABC_PATH@
+Index: qflow/tech/Makefile.in
+===================================================================
+--- qflow.orig/tech/Makefile.in 2014-10-16 22:33:12.555197757 +0200
++++ qflow/tech/Makefile.in 2014-10-16 22:39:49.027195220 +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
+
+Index: qflow/tech/osu035/Makefile.in
+===================================================================
+--- qflow.orig/tech/osu035/Makefile.in 2014-10-16 22:33:12.555197757 +0200
++++ qflow/tech/osu035/Makefile.in 2014-10-16 22:40:08.771195093 +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/tech/osu050/Makefile.in
+===================================================================
+--- qflow.orig/tech/osu050/Makefile.in 2014-10-16 22:33:12.555197757 +0200
++++ qflow/tech/osu050/Makefile.in 2014-10-16 22:40:31.907194945 +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
diff --git a/debian/patches/02_fix_compile_error.patch b/debian/patches/02_fix_compile_error.patch
new file mode 100644
index 0000000..0f7716e
--- /dev/null
+++ b/debian/patches/02_fix_compile_error.patch
@@ -0,0 +1,13 @@
+Index: qflow/src/blif2BSpice.c
+===================================================================
+--- qflow.orig/src/blif2BSpice.c 2014-10-16 22:33:12.551197757 +0200
++++ qflow/src/blif2BSpice.c 2014-10-16 22:47:28.079192282 +0200
+@@ -396,7 +396,7 @@
+ CleanupString(InstancePortName);
+ for (tport = tsub->ports; tport; tport = tport->next) {
+ if (!strcmp(tport->name, InstancePortName)) {
+- sprintf(tport->signal, InstancePortWire);
++ //sprintf(tport->signal, InstancePortWire);
+ break;
+ }
+ }
diff --git a/debian/patches/fixes.patch b/debian/patches/fixes.patch
deleted file mode 100644
index 9387f1a..0000000
--- a/debian/patches/fixes.patch
+++ /dev/null
@@ -1,118 +0,0 @@
-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 b4a9e84..32f7c4a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
-fixes.patch
+02_fix_compile_error.patch
+01_fix_install_dir.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