[Pkg-electronics-commits] [pcb-rnd] 08/26: patch update
Dima Kogan
dima at secretsauce.net
Mon Jan 16 22:31:52 UTC 2017
This is an automated email from the git hooks/post-receive script.
dkogan pushed a commit to branch master
in repository pcb-rnd.
commit 60c7bce3600853c550bfceb6fae76451fdd99e94
Author: Dima Kogan <dima at secretsauce.net>
Date: Sun Dec 18 21:05:13 2016 -0800
patch update
---
...es-recurse-with-MAKE-to-allow-parallelism.patch | 41 ++++++------
...tch => 0002-renamed-install_root-DESTDIR.patch} | 2 +-
...I-use-the-CFLAGS-from-.-configure-CFLAGS.patch} | 2 +-
...uses-the-CFLAGS-LDFLAGS-from-.-configure.patch} | 4 +-
debian/patches/0006-not-trying-to-build-gts.patch | 76 ----------------------
debian/patches/series | 7 +-
6 files changed, 28 insertions(+), 104 deletions(-)
diff --git a/debian/patches/0001-Makefiles-recurse-with-MAKE-to-allow-parallelism.patch b/debian/patches/0001-Makefiles-recurse-with-MAKE-to-allow-parallelism.patch
index 2d0a1f5..e327026 100644
--- a/debian/patches/0001-Makefiles-recurse-with-MAKE-to-allow-parallelism.patch
+++ b/debian/patches/0001-Makefiles-recurse-with-MAKE-to-allow-parallelism.patch
@@ -1,5 +1,5 @@
From: Dima Kogan <dima at secretsauce.net>
-Date: Sat, 17 Dec 2016 15:30:27 -0800
+Date: Sun, 18 Dec 2016 21:02:51 -0800
Subject: Makefiles: recurse with $(MAKE) to allow parallelism
The child 'make' processes now know about and can use the jobserver
@@ -91,10 +91,10 @@ The child 'make' processes now know about and can use the jobserver
84 files changed, 157 insertions(+), 157 deletions(-)
diff --git a/Makefile b/Makefile
-index 9b94591..2012124 100644
+index 9bfe337..da06dd9 100644
--- a/Makefile
+++ b/Makefile
-@@ -1,44 +1,44 @@
+@@ -1,43 +1,43 @@
all: FORCE
- cd src && make
- cd util && make
@@ -167,8 +167,7 @@ index 9b94591..2012124 100644
+ cd pcblib && $(MAKE) uninstall
+ cd doc-rnd && $(MAKE) uninstall
- deb: FORCE
- fakeroot debian/rules clean
+ FORCE:
diff --git a/data/Makefile b/data/Makefile
index 3cefb09..7ca473d 100644
--- a/data/Makefile
@@ -318,10 +317,10 @@ index 068e0f7..1d1ec24 100644
regression/Makefile: regression/Makefile.in tester
./tester -e < regression/Makefile.in > regression/Makefile
diff --git a/src/Makefile.in b/src/Makefile.in
-index 800e417..96b2634 100644
+index 4857a2b..e3e5b46 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
-@@ -234,8 +234,8 @@ SPHASH_PATH=../src_3rd/sphash
+@@ -237,8 +237,8 @@ SPHASH_PATH=../src_3rd/sphash
SPHASH=$(SPHASH_PATH)/sphash
all:
@@ -332,7 +331,7 @@ index 800e417..96b2634 100644
include ../Makefile.conf
-@@ -304,10 +304,10 @@ install_:
+@@ -307,10 +307,10 @@ install_:
install:
@@ -1243,11 +1242,11 @@ index 3663b61..2b7e079 100644
- cd tests && make all
+ cd tests && $(MAKE) all
diff --git a/util/Makefile b/util/Makefile
-index 772f210..de1f950 100644
+index 9a22c8f..1472124 100644
--- a/util/Makefile
+++ b/util/Makefile
-@@ -3,28 +3,28 @@
- SCMDIR=$(DATADIR)/../gEDA/scheme
+@@ -1,12 +1,12 @@
+ # plain old hand crafted Makefile
all:
- cd gsch2pcb-rnd && make all
@@ -1260,10 +1259,11 @@ index 772f210..de1f950 100644
+ cd gsch2pcb-rnd && $(MAKE) clean
install_:
- $(MKDIR) "$(BINDIR)" "$(LIBDIR)" "$(SCMDIR)"
- $(CPC) "`pwd`/fp2anim" "$(BINDIR)/fp2anim"
+ $(MKDIR) "$(BINDIR)" "$(LIBDIR)"
+@@ -14,17 +14,17 @@ install_:
$(CPC) "`pwd`/pcb-strip" "$(BINDIR)/pcb-strip"
- $(CPC) "`pwd`/gnet-pcbrndfwd.scm" "$(SCMDIR)/gnet-pcbrndfwd.scm"
+ $(CPC) "`pwd`/gnet-pcbrndfwd.scm" "$(LIBDIR)/gnet-pcbrndfwd.scm"
+ $(CPC) "`pwd`/gnet-pcbrndfwd_elem.scm" "$(LIBDIR)/gnet-pcbrndfwd_elem.scm"
- cd gsch2pcb-rnd && make install_ CPC="$(CPC)"
+ cd gsch2pcb-rnd && $(MAKE) install_ CPC="$(CPC)"
@@ -1278,15 +1278,16 @@ index 772f210..de1f950 100644
uninstall:
$(RM) "$(BINDIR)/fp2anim"
$(RM) "$(BINDIR)/pcb-strip"
- $(RM) "$(SCMDIR)/gnet-pcbrndfwd.scm"
+ $(RM) "$(LIBDIR)/gnet-pcbrndfwd.scm"
+ $(RM) "$(LIBDIR)/gnet-pcbrndfwd_elem.scm"
- cd gsch2pcb-rnd && make uninstall
+ cd gsch2pcb-rnd && $(MAKE) uninstall
diff --git a/util/gsch2pcb-rnd/Makefile.in b/util/gsch2pcb-rnd/Makefile.in
-index cd240bc..1b4fcc6 100644
+index 35bf4fc..c311f5d 100644
--- a/util/gsch2pcb-rnd/Makefile.in
+++ b/util/gsch2pcb-rnd/Makefile.in
-@@ -50,8 +50,8 @@ FP_CFLAGS = @/local/pcb/CFLAGS@
- OBJS=gsch2pcb.o help.o
+@@ -57,8 +57,8 @@ OBJS = \
+ method_import.o
all:
- make revcheck
@@ -1296,7 +1297,7 @@ index cd240bc..1b4fcc6 100644
revcheck:
cd ../../scconfig && ./revtest Rev.stamp < Rev.tab
-@@ -63,7 +63,7 @@ gsch2pcb.o: gsch2pcb.c ../../config.h
+@@ -70,7 +70,7 @@ gsch2pcb.o: gsch2pcb.c ../../config.h
$(CC) -c $(CFLAGS) $(FP_CFLAGS) gsch2pcb.c -o gsch2pcb.o
../../src/pcb-rnd:
@@ -1305,7 +1306,7 @@ index cd240bc..1b4fcc6 100644
$(HASHOBJ): ../../src/pcb-rnd
-@@ -109,10 +109,10 @@ install_:
+@@ -116,10 +116,10 @@ install_:
$(CPC) "`pwd`/gnet-gsch2pcb-rnd.scm" "$(LIBDIR)/gnet-gsch2pcb-rnd.scm"
install:
diff --git a/debian/patches/0003-renamed-install_root-DESTDIR.patch b/debian/patches/0002-renamed-install_root-DESTDIR.patch
similarity index 99%
rename from debian/patches/0003-renamed-install_root-DESTDIR.patch
rename to debian/patches/0002-renamed-install_root-DESTDIR.patch
index cb8bdfe..d6eacb3 100644
--- a/debian/patches/0003-renamed-install_root-DESTDIR.patch
+++ b/debian/patches/0002-renamed-install_root-DESTDIR.patch
@@ -1,5 +1,5 @@
From: Dima Kogan <dima at secretsauce.net>
-Date: Sat, 17 Dec 2016 16:12:37 -0800
+Date: Sun, 18 Dec 2016 21:03:34 -0800
Subject: renamed install_root -> DESTDIR
This is more standard, and simplifies the packaging
diff --git a/debian/patches/0004-I-use-the-CFLAGS-from-.-configure-CFLAGS.patch b/debian/patches/0003-I-use-the-CFLAGS-from-.-configure-CFLAGS.patch
similarity index 94%
rename from debian/patches/0004-I-use-the-CFLAGS-from-.-configure-CFLAGS.patch
rename to debian/patches/0003-I-use-the-CFLAGS-from-.-configure-CFLAGS.patch
index 4a138d6..00630d0 100644
--- a/debian/patches/0004-I-use-the-CFLAGS-from-.-configure-CFLAGS.patch
+++ b/debian/patches/0003-I-use-the-CFLAGS-from-.-configure-CFLAGS.patch
@@ -1,5 +1,5 @@
From: Dima Kogan <dima at secretsauce.net>
-Date: Sat, 17 Dec 2016 19:27:16 -0800
+Date: Sun, 18 Dec 2016 21:04:06 -0800
Subject: I use the CFLAGS from './configure --CFLAGS=...'
---
diff --git a/debian/patches/0005-gsch2pcb-uses-the-CFLAGS-LDFLAGS-from-.-configure.patch b/debian/patches/0004-gsch2pcb-uses-the-CFLAGS-LDFLAGS-from-.-configure.patch
similarity index 93%
rename from debian/patches/0005-gsch2pcb-uses-the-CFLAGS-LDFLAGS-from-.-configure.patch
rename to debian/patches/0004-gsch2pcb-uses-the-CFLAGS-LDFLAGS-from-.-configure.patch
index 99d2d41..f70338b 100644
--- a/debian/patches/0005-gsch2pcb-uses-the-CFLAGS-LDFLAGS-from-.-configure.patch
+++ b/debian/patches/0004-gsch2pcb-uses-the-CFLAGS-LDFLAGS-from-.-configure.patch
@@ -1,5 +1,5 @@
From: Dima Kogan <dima at secretsauce.net>
-Date: Sat, 17 Dec 2016 19:35:23 -0800
+Date: Sun, 18 Dec 2016 21:04:36 -0800
Subject: gsch2pcb uses the CFLAGS, LDFLAGS from ./configure
---
@@ -7,7 +7,7 @@ Subject: gsch2pcb uses the CFLAGS, LDFLAGS from ./configure
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/util/gsch2pcb-rnd/Makefile.in b/util/gsch2pcb-rnd/Makefile.in
-index 1b4fcc6..4a6415a 100644
+index c311f5d..f1a41f5 100644
--- a/util/gsch2pcb-rnd/Makefile.in
+++ b/util/gsch2pcb-rnd/Makefile.in
@@ -1,10 +1,12 @@
diff --git a/debian/patches/0006-not-trying-to-build-gts.patch b/debian/patches/0006-not-trying-to-build-gts.patch
deleted file mode 100644
index 06fb341..0000000
--- a/debian/patches/0006-not-trying-to-build-gts.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-From: Dima Kogan <dima at secretsauce.net>
-Date: Sat, 17 Dec 2016 20:21:18 -0800
-Subject: not trying to build gts
-
----
- Makefile | 1 -
- scconfig/hooks.c | 1 -
- src_plugins/Common_enabled.tmpasm | 2 +-
- src_plugins/toporouter/Plug.tmpasm | 10 ----------
- 4 files changed, 1 insertion(+), 13 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 2012124..f80a28d 100644
---- a/Makefile
-+++ b/Makefile
-@@ -17,7 +17,6 @@ distclean: FORCE
- cd src_3rd/genlist && $(MAKE) clean ; true
- cd src_3rd/genregex && $(MAKE) clean ; true
- cd src_3rd/genvector && $(MAKE) clean ; true
-- cd src_3rd/gts && $(MAKE) clean ; true
- cd src_3rd/liblihata && $(MAKE) clean ; true
- cd src_3rd/liblihata/genht && $(MAKE) clean ; true
- cd src_3rd/qparse && $(MAKE) clean ; true
-diff --git a/scconfig/hooks.c b/scconfig/hooks.c
-index c911e04..ad6cd0c 100644
---- a/scconfig/hooks.c
-+++ b/scconfig/hooks.c
-@@ -665,7 +665,6 @@ int hook_generate()
-
- printf("Generating Makefile.conf (%d)\n", generr |= tmpasm("..", "Makefile.conf.in", "Makefile.conf"));
-
-- printf("Generating gts/Makefile (%d)\n", generr |= tmpasm("../src_3rd/gts", "Makefile.in", "Makefile"));
- printf("Generating pcb/Makefile (%d)\n", generr |= tmpasm("../src", "Makefile.in", "Makefile"));
-
- /* Has to be after pcb/Makefile so that all the modules are loaded. */
-diff --git a/src_plugins/Common_enabled.tmpasm b/src_plugins/Common_enabled.tmpasm
-index 25f4d15..144e9cd 100644
---- a/src_plugins/Common_enabled.tmpasm
-+++ b/src_plugins/Common_enabled.tmpasm
-@@ -63,7 +63,7 @@ switch /local/pcb/mod/CONF
- default
- put /local/pcb/mod/CONFOUT /local/pcb/mod/CONF
- sub {/local/pcb/mod/CONFOUT} {.h$} {_fields.h}
-- append /local/pcb/CLEANFILES /local/pcb/mod/CONFOUT
-+ append /local/pcb/CLEANFILES [@ @] /local/pcb/mod/CONFOUT
- append /local/pcb/RULES [@
- # conf generation for @/local/pcb/mod@ '@/local/pcb/mod/CONF@'
- @/local/pcb/mod/CONFOUT@: @/local/pcb/mod/CONF@
-diff --git a/src_plugins/toporouter/Plug.tmpasm b/src_plugins/toporouter/Plug.tmpasm
-index 2afd67e..32e6379 100644
---- a/src_plugins/toporouter/Plug.tmpasm
-+++ b/src_plugins/toporouter/Plug.tmpasm
-@@ -1,23 +1,13 @@
- put /local/pcb/mod {toporouter}
- put /local/pcb/mod/OBJS [@ $(PLUGDIR)/toporouter/toporouter.o @]
-
--append /local/pcb/CFLAGS {-I../src_3rd/gts}
--
--put /local/pcb/toporouter_rules [@
--../src_3rd/gts/libgts.a:
-- cd ../src_3rd/gts && make
--@]
--
- switch /local/pcb/toporouter/controls
- case {buildin}
- append /local/pcb/RULES /local/pcb/toporouter_rules
-- append /local/pcb/LIBS { ../src_3rd/gts/libgts.a }
-- append /local/pcb/EXEDEPS { ../src_3rd/gts/libgts.a }
- include /local/pcb/tmpasm/buildin
- end;
- case {plugin}
- append /local/pcb/RULES /local/pcb/toporouter_rules
-- append /local/pcb/toporouter/OBJS { ../src_3rd/gts/libgts.a }
- include /local/pcb/tmpasm/plugin
- end
- case {disable} include /local/pcb/tmpasm/disable; end;
diff --git a/debian/patches/series b/debian/patches/series
index aad8887..3a2b8e7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,4 @@
0001-Makefiles-recurse-with-MAKE-to-allow-parallelism.patch
-0003-renamed-install_root-DESTDIR.patch
-0004-I-use-the-CFLAGS-from-.-configure-CFLAGS.patch
-0005-gsch2pcb-uses-the-CFLAGS-LDFLAGS-from-.-configure.patch
-0006-not-trying-to-build-gts.patch
+0002-renamed-install_root-DESTDIR.patch
+0003-I-use-the-CFLAGS-from-.-configure-CFLAGS.patch
+0004-gsch2pcb-uses-the-CFLAGS-LDFLAGS-from-.-configure.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-electronics/pcb-rnd.git
More information about the Pkg-electronics-commits
mailing list