This is an automated email from the git hooks/post-receive script.
afif-guest pushed a commit to branch master
in repository bcftools.
commit 02bd9fc4946c4aea18d4a2f775294a20230fdc50
Author: Afif Elghraoui <a...@ghraoui.name>
Date: Mon Nov 9 23:10:17 2015 -0800
Also use LDFLAGS when compiling the plugins
---
debian/patches/compiler-flags.patch | 21 ++++++++++++++++++---
1 file changed, 18 insertions(+), 3 deletions(-)
diff --git a/debian/patches/compiler-flags.patch
b/debian/patches/compiler-flags.patch
index 7a44a01..69a8270 100644
--- a/debian/patches/compiler-flags.patch
+++ b/debian/patches/compiler-flags.patch
@@ -1,7 +1,10 @@
Description: Allow compiler flags to be passed through to build system
+ The development version of the upstream code already supports LDFLAGS,
+ so many parts of this patch will not be needed in the next upstream
+ release
Author: Afif Elghraoui <a...@ghraoui.name>
-Forwarded: no
-Last-Update: 2015-11-03
+Forwarded: not-needed
+Last-Update: 2015-11-09
--- bcftools.orig/Makefile
+++ bcftools/Makefile
@@ -32,8 +32,8 @@
@@ -29,7 +32,19 @@ Last-Update: 2015-11-03
%.so: %.c version.h version.c
- $(CC) $(CFLAGS) $(INCLUDES) -fPIC -shared -o $@ version.c $< -lhts
-+ $(CC) $(CFLAGS) $(INCLUDES) -fPIC -shared -o $@ version.c $<
++ $(CC) $(CFLAGS) $(INCLUDES) -fPIC -shared $(LDFLAGS) -o $@ version.c $<
-include $(PLUGINM)
+--- bcftools.orig/plugins/fixploidy.mk
++++ bcftools/plugins/fixploidy.mk
+@@ -1,2 +1,2 @@
+ plugins/fixploidy.so: plugins/fixploidy.c version.h version.c ploidy.h
ploidy.c
+- $(CC) $(CFLAGS) $(INCLUDES) -fPIC -shared -o $@ ploidy.c version.c $<
-lhts
++ $(CC) $(CFLAGS) $(INCLUDES) -fPIC -shared -o $@ ploidy.c version.c $<
-lhts $(LDFLAGS)
+--- bcftools.orig/plugins/vcf2sex.mk
++++ bcftools/plugins/vcf2sex.mk
+@@ -1,2 +1,2 @@
+ plugins/vcf2sex.so: plugins/vcf2sex.c version.h version.c ploidy.h ploidy.c
+- $(CC) $(CFLAGS) $(INCLUDES) -fPIC -shared -o $@ ploidy.c version.c $<
-lhts
++ $(CC) $(CFLAGS) $(INCLUDES) -fPIC -shared -o $@ ploidy.c version.c $<
-lhts $(LDFLAGS)
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/debian-med/bcftools.git
_______________________________________________
debian-med-commit mailing list
debian-med-commit@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit
