[depqbf] 03/09: depqbf-makefile.patch: regenerated from gbp pq
Thomas Krennwallner
tkren-guest at moszumanska.debian.org
Sun Nov 27 17:47:48 UTC 2016
This is an automated email from the git hooks/post-receive script.
tkren-guest pushed a commit to branch devel
in repository depqbf.
commit e51f450301d7b7d8bfc5f6cde6292b9df2e3e420
Author: Thomas Krennwallner <tkren at kr.tuwien.ac.at>
Date: Sun Nov 27 17:13:46 2016 +0100
depqbf-makefile.patch: regenerated from gbp pq
---
debian/patches/depqbf-makefile.patch | 35 +++++++++++++++++++++--------------
1 file changed, 21 insertions(+), 14 deletions(-)
diff --git a/debian/patches/depqbf-makefile.patch b/debian/patches/depqbf-makefile.patch
index b661f9f..c0e37cc 100644
--- a/debian/patches/depqbf-makefile.patch
+++ b/debian/patches/depqbf-makefile.patch
@@ -1,12 +1,19 @@
-Author: Thomas Krennwallner <tkren at kr.tuwien.ac.at>
-Description: Add dpkg-buildflags support and use gcc as C compiler.
-Index: depqbf-git-gbp/makefile
+From: Thomas Krennwallner <tkren at kr.tuwien.ac.at>
+Date: Sun, 27 Nov 2016 17:05:56 +0100
+Subject: Add dpkg-buildflags support and use gcc as C compiler
+
===================================================================
---- depqbf-git-gbp.orig/makefile
-+++ depqbf-git-gbp/makefile
-@@ -2,6 +2,11 @@ CFLAGS=-Wextra -Wall -Wno-unused-paramet
+---
+ makefile | 9 +++++++--
+ 1 file changed, 7 insertions(+), 2 deletions(-)
+
+diff --git a/makefile b/makefile
+index 81347b5..0a594b5 100644
+--- a/makefile
++++ b/makefile
+@@ -2,6 +2,11 @@ CFLAGS=-Wextra -Wall -Wno-unused -pedantic -std=c99 -DNDEBUG -O3
#CFLAGS=-Wextra -Wall -Wno-unused -pedantic -std=c99 -g3 -DNDEBUG
- #CFLAGS=-Wextra -Wall -Wno-unused-parameter -Wno-unused -pedantic -std=c99 -g3
+ #CFLAGS=-Wextra -Wall -Wno-unused -pedantic -std=c99 -g3
#CFLAGS=-Wextra -Wall -Wno-unused -pedantic -std=c99 -DNDEBUG -g3 -pg -fprofile-arcs -ftest-coverage -static
+CFLAGS += `dpkg-buildflags --get CFLAGS`
+CFLAGS += `dpkg-buildflags --get CPPFLAGS`
@@ -16,21 +23,21 @@ Index: depqbf-git-gbp/makefile
OBJECTS=qdpll_main.o qdpll_app.o qdpll.o qdpll_mem.o qdpll_dep_man_qdag.o qdpll_pqueue.o
MAJOR=1
-@@ -17,7 +22,7 @@ VERSION=$(MAJOR).$(MINOR)
+@@ -30,7 +35,7 @@ endif
$(CC) $(CFLAGS) -c $< -o $@
- depqbf: qdpll_main.o qdpll_app.o libqdpll.a libqdpll.so.$(VERSION)
+ depqbf: $(TARGETS)
- $(CC) $(CFLAGS) qdpll_main.o qdpll_app.o -L. -lqdpll -o depqbf
+ $(CC) $(CFLAGS) $(LDFLAGS) qdpll_main.o qdpll_app.o -L. -lqdpll -o depqbf
qdpll_main.o: qdpll_main.c qdpll.h
-@@ -54,7 +59,7 @@ libqdpll.a: qdpll.o qdpll_pqueue.o qdpll
+@@ -67,7 +72,7 @@ libqdpll.a: qdpll.o qdpll_pqueue.o qdpll_mem.o qdpll_dep_man_qdag.o
ranlib $@
libqdpll.so.$(VERSION): qdpll.fpico qdpll_pqueue.fpico qdpll_mem.fpico qdpll_dep_man_qdag.fpico
-- $(CC) -shared -Wl,-soname,libqdpll.so.$(MAJOR) $^ -o $@
-+ $(CC) $(LDFLAGS) -shared -Wl,-soname,libqdpll.so.$(MAJOR) $^ -o $@
+- $(CC) -shared -Wl,$(SONAME),libqdpll.so.$(MAJOR) $^ -o $@
++ $(CC) $(LDFLAGS) -shared -Wl,$(SONAME),libqdpll.so.$(MAJOR) $^ -o $@
- clean:
- rm -f *.so.$(VERSION) *.fpico *.a *.o *.gcno *.gcda *.gcov *~ gmon.out depqbf
+ libqdpll.$(VERSION).dylib: libqdpll.so.$(VERSION)
+ cp $< $@
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/depqbf.git
More information about the debian-science-commits
mailing list