[med-svn] [sambamba] 02/02: replace rdmd

[Andreas Tille]

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

tille pushed a commit to branch master
in repository sambamba.

commit 69a3a586d9ac09fd63f5389054c38a4d871f82bd
Author: Andreas Tille <tille at debian.org>
Date:   Sat Mar 4 22:21:55 2017 +0100

    replace rdmd
---
 debian/control                    |  1 +
 debian/patches/replace_rdmd.patch | 72 +++++++++++++++++++++++++++++++++++++++
 debian/patches/series             |  1 +
 3 files changed, 74 insertions(+)

diff --git a/debian/control b/debian/control
index b1469dc..2799444 100644
--- a/debian/control
+++ b/debian/control
@@ -4,6 +4,7 @@ Priority: optional
 Maintainer: Debian Med Packaging Team <debian-med-packaging at lists.alioth.debian.org>
 Uploaders: Andreas Tille <tille at debian.org>
 Build-Depends: debhelper (>= 10),
+               ldc,
                libbiod-dev,
                liblz4-dev,
                libhts-dev
diff --git a/debian/patches/replace_rdmd.patch b/debian/patches/replace_rdmd.patch
new file mode 100644
index 0000000..4806384
--- /dev/null
+++ b/debian/patches/replace_rdmd.patch
@@ -0,0 +1,72 @@
+--- a/Makefile
++++ b/Makefile
+@@ -1,8 +1,8 @@
+-D_COMPILER=dmd
+-D_FLAGS=--compiler=dmd -IBioD -g -d#-O -release -inline # -version=serial
++D_COMPILER=ldc2
++D_FLAGS= -IBioD -g -d#-O -release -inline # -version=serial
+ 
+ STATIC_LIB_SUBCMD=-lhts -llz4 -Wl,-Bdynamic
+-RDMD_FLAGS=--force --build-only --compiler=$(D_COMPILER) $(D_FLAGS)
++RDMD_FLAGS=--build-only --compiler=$(D_COMPILER) $(D_FLAGS)
+ 
+ PLATFORM := $(shell uname -s)
+ 
+@@ -17,7 +17,7 @@ endif
+ # DMD only - this goal is used because of fast compilation speed, during development
+ all:
+ 	mkdir -p build/
+-	rdmd --force --build-only $(D_FLAGS) $(DMD_STATIC_LIBS) -ofbuild/sambamba main.d
++	ldmd2 $(D_FLAGS) $(DMD_STATIC_LIBS) -ofbuild/sambamba main.d
+ 
+ # This is the main Makefile goal, used for building releases (best performance)
+ sambamba-ldmd2-64: htslib-static lz4-static
+@@ -43,39 +43,39 @@ lz4/lib/liblz4.a: lz4/lib/lz4.c lz4/lib/
+ 
+ sambamba-flagstat:
+ 	mkdir -p build/
+-	rdmd $(RDMD_FLAGS) -L-lhts -version=standalone -ofbuild/sambamba-flagstat sambamba/flagstat.d
++	ldmd2 $(RDMD_FLAGS) -L-lhts -version=standalone -ofbuild/sambamba-flagstat sambamba/flagstat.d
+ 
+ sambamba-merge:
+ 	mkdir -p build/
+-	rdmd $(RDMD_FLAGS) -L-lhts -version=standalone -ofbuild/sambamba-merge sambamba/merge.d
++	ldmd2 $(RDMD_FLAGS) -L-lhts -version=standalone -ofbuild/sambamba-merge sambamba/merge.d
+ 
+ sambamba-index:
+ 	mkdir -p build/
+-	rdmd $(RDMD_FLAGS) -L-lhts -version=standalone -ofbuild/sambamba-index sambamba/index.d
++	ldmd2 $(RDMD_FLAGS) -L-lhts -version=standalone -ofbuild/sambamba-index sambamba/index.d
+ 
+ sambamba-sort:
+ 	mkdir -p build/
+-	rdmd $(RDMD_FLAGS) -L-lhts -version=standalone -ofbuild/sambamba-sort sambamba/sort.d
++	ldmd2 $(RDMD_FLAGS) -L-lhts -version=standalone -ofbuild/sambamba-sort sambamba/sort.d
+ 
+ sambamba-view:
+ 	mkdir -p build/
+-	rdmd $(RDMD_FLAGS) -L-lhts -version=standalone -ofbuild/sambamba-view sambamba/view.d
++	ldmd2 $(RDMD_FLAGS) -L-lhts -version=standalone -ofbuild/sambamba-view sambamba/view.d
+ 
+ sambamba-slice:
+ 	mkdir -p build/
+-	rdmd $(RDMD_FLAGS) -L-lhts -version=standalone -ofbuild/sambamba-slice sambamba/slice.d
++	ldmd2 $(RDMD_FLAGS) -L-lhts -version=standalone -ofbuild/sambamba-slice sambamba/slice.d
+ 
+ sambamba-markdup:
+ 	mkdir -p build/
+-	rdmd $(RDMD_FLAGS) -L-lhts -version=standalone -ofbuild/sambamba-markdup sambamba/markdup.d
++	ldmd2 $(RDMD_FLAGS) -L-lhts -version=standalone -ofbuild/sambamba-markdup sambamba/markdup.d
+ 
+ sambamba-depth:
+ 	mkdir -p build/
+-	rdmd $(RDMD_FLAGS) -L-lhts -version=standalone -ofbuild/sambamba-depth sambamba/depth.d
++	ldmd2 $(RDMD_FLAGS) -L-lhts -version=standalone -ofbuild/sambamba-depth sambamba/depth.d
+ 
+ sambamba-pileup:
+ 	mkdir -p build/
+-	rdmd $(RDMD_FLAGS) -L-lhts -version=standalone -ofbuild/sambamba-pileup sambamba/pileup.d
++	ldmd2 $(RDMD_FLAGS) -L-lhts -version=standalone -ofbuild/sambamba-pileup sambamba/pileup.d
+ 
+ .PHONY: clean
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 866f5f9..fffaae3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 use_debian_packaged_libs.patch
+replace_rdmd.patch

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