[med-svn] [daligner] 07/09: Refresh/adjust patches

Afif Elghraoui afif-guest at moszumanska.debian.org
Sat Jan 9 07:25:28 UTC 2016


This is an automated email from the git hooks/post-receive script.

afif-guest pushed a commit to branch master
in repository daligner.

commit e2ca303fb02a43ec6e1ef5ad67b9faf1b5073dc9
Author: Afif Elghraoui <afif at ghraoui.name>
Date:   Fri Jan 8 22:46:16 2016 -0800

    Refresh/adjust patches
---
 debian/patches/cflags.patch          | 10 +++++++---
 debian/patches/destdir-install.patch |  6 +++++-
 debian/patches/lddflags.patch        | 16 +++++++++++++++-
 3 files changed, 27 insertions(+), 5 deletions(-)

diff --git a/debian/patches/cflags.patch b/debian/patches/cflags.patch
index b207fc1..ad6e94f 100644
--- a/debian/patches/cflags.patch
+++ b/debian/patches/cflags.patch
@@ -1,8 +1,12 @@
+Description: Append to CFLAGS
+Author: Afif Elghraoui <afif at ghraoui.name>
+Forwarded: not-needed
+Last-Update: 2016-01-08
 --- daligner.orig/Makefile
 +++ daligner/Makefile
 @@ -1,4 +1,4 @@
--CFLAGS = -O3 -Wall -Wextra -fno-strict-aliasing
-+CFLAGS += -O3 -Wall -Wextra -fno-strict-aliasing
+-CFLAGS = -O3 -Wall -Wextra -Wno-unused-result -fno-strict-aliasing
++CFLAGS += -O3 -Wall -Wextra -Wno-unused-result -fno-strict-aliasing
  
- ALL = daligner HPCdaligner HPCmapper LAsort LAmerge LAsplit LAcat LAshow LAcheck
+ ALL = daligner HPCdaligner HPCmapper LAsort LAmerge LAsplit LAcat LAshow LAdump LAcheck LAindex
  
diff --git a/debian/patches/destdir-install.patch b/debian/patches/destdir-install.patch
index 4b283f5..5bfb224 100644
--- a/debian/patches/destdir-install.patch
+++ b/debian/patches/destdir-install.patch
@@ -1,6 +1,10 @@
+Description: Use DESTDIR during installation
+Author: Afif Elghraoui <afif at ghraoui.name>
+Forwarded: not-needed
+Last-Update: 2016-01-08
 --- daligner.orig/Makefile
 +++ daligner/Makefile
-@@ -41,7 +41,8 @@
+@@ -47,7 +47,8 @@
  	rm -f daligner.tar.gz
  
  install:
diff --git a/debian/patches/lddflags.patch b/debian/patches/lddflags.patch
index 2fd7038..092704e 100644
--- a/debian/patches/lddflags.patch
+++ b/debian/patches/lddflags.patch
@@ -1,6 +1,12 @@
+Description: Support LDFLAGS in upstream build system
+ This patch was made using the following command:
+   sed -i 's/\(gcc.*\)/\1 \$(LDFLAGS)/' Makefile
+Author: Afif Elghraoui <afif at ghraoui.name>
+Forwarded: not-needed
+Last-Update: 2016-01-08
 --- daligner.orig/Makefile
 +++ daligner/Makefile
-@@ -5,34 +5,34 @@
+@@ -5,40 +5,40 @@
  all: $(ALL)
  
  daligner: daligner.c filter.c filter.h align.c align.h DB.c DB.h QV.c QV.h
@@ -27,6 +33,10 @@
 -	gcc $(CFLAGS) -o LAshow LAshow.c align.c DB.c QV.c -lm
 +	gcc $(CFLAGS) -o LAshow LAshow.c align.c DB.c QV.c -lm $(LDFLAGS)
  
+ LAdump: LAdump.c align.c align.h DB.c DB.h QV.c QV.h
+-	gcc $(CFLAGS) -o LAdump LAdump.c align.c DB.c QV.c -lm
++	gcc $(CFLAGS) -o LAdump LAdump.c align.c DB.c QV.c -lm $(LDFLAGS)
+ 
  LAcat: LAcat.c align.h DB.c DB.h QV.c QV.h
 -	gcc $(CFLAGS) -o LAcat LAcat.c DB.c QV.c -lm
 +	gcc $(CFLAGS) -o LAcat LAcat.c DB.c QV.c -lm $(LDFLAGS)
@@ -43,5 +53,9 @@
 -	gcc $(CFLAGS) -o LAupgrade.Dec.31.2014 LAupgrade.Dec.31.2014.c align.c DB.c QV.c -lm
 +	gcc $(CFLAGS) -o LAupgrade.Dec.31.2014 LAupgrade.Dec.31.2014.c align.c DB.c QV.c -lm $(LDFLAGS)
  
+ LAindex: LAindex.c align.c align.h DB.c DB.h QV.c QV.h
+-	gcc $(CFLAGS) -o LAindex LAindex.c align.c DB.c QV.c -lm
++	gcc $(CFLAGS) -o LAindex LAindex.c align.c DB.c QV.c -lm $(LDFLAGS)
+ 
  clean:
  	rm -f $(ALL)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/daligner.git



More information about the debian-med-commit mailing list