[med-svn] r17545 - trunk/packages/raxml/trunk/debian

[Andreas Tille]

Author: tille
Date: 2014-07-29 14:12:35 +0000 (Tue, 29 Jul 2014)
New Revision: 17545

Modified:
   trunk/packages/raxml/trunk/debian/changelog
   trunk/packages/raxml/trunk/debian/install
   trunk/packages/raxml/trunk/debian/rules
Log:
enable SIMD and threading support


Modified: trunk/packages/raxml/trunk/debian/changelog
===================================================================
--- trunk/packages/raxml/trunk/debian/changelog	2014-07-29 13:15:53 UTC (rev 17544)
+++ trunk/packages/raxml/trunk/debian/changelog	2014-07-29 14:12:35 UTC (rev 17545)
@@ -1,3 +1,10 @@
+raxml (8.0.26-2) UNRELEASED; urgency=medium
+
+  * enable SIMD and threading support
+    Closes: #756392, #729537
+
+ -- Andreas Tille <tille at debian.org>  Tue, 29 Jul 2014 15:11:35 +0200
+
 raxml (8.0.26-1) unstable; urgency=medium
 
   * New upstream version (patches applied upstream)

Modified: trunk/packages/raxml/trunk/debian/install
===================================================================
--- trunk/packages/raxml/trunk/debian/install	2014-07-29 13:15:53 UTC (rev 17544)
+++ trunk/packages/raxml/trunk/debian/install	2014-07-29 14:12:35 UTC (rev 17545)
@@ -1 +1 @@
-raxmlHPC                        usr/bin
+debian/tmpbuild/*	usr/bin

Modified: trunk/packages/raxml/trunk/debian/rules
===================================================================
--- trunk/packages/raxml/trunk/debian/rules	2014-07-29 13:15:53 UTC (rev 17544)
+++ trunk/packages/raxml/trunk/debian/rules	2014-07-29 14:12:35 UTC (rev 17545)
@@ -6,19 +6,43 @@
 DEBPKGNAME     := $(shell dpkg-parsechangelog | awk '/^Source:/ {print $$2}')
 exe=raxmlHPC
 
+MFILES:=Makefile.gcc \
+	Makefile.PTHREADS.gcc \
+	Makefile.SSE3.PTHREADS.gcc \
+	Makefile.AVX.PTHREADS.gcc
+
+BINDIR=$(CURDIR)/debian/tmpbuild
+
 %:
 	dh $@
 
 override_dh_auto_clean:
-	$(MAKE) -f Makefile.gcc clean
+	for mfile in $(MFILES); do $(MAKE) -f $${mfile} clean ; done
+	rm -rf $(BINDIR)
 
 override_dh_auto_build:
-	$(MAKE) -f Makefile.gcc
+	mkdir -p $(BINDIR)
+	for mfile in $(MFILES); do \
+	    $(MAKE) -f $${mfile} ; \
+	    curexe=`ls $(exe)* | head -n 1` ; \
+	    if [ -e $(BINDIR)/$${curexe} ] ; then \
+		echo "**** ERROR: $${curexe} was created before!!" && false ; \
+	    else \
+		mv $${curexe} $(BINDIR)/$${curexe} ; \
+	    fi ; \
+	    $(MAKE) -f $${mfile} clean ; \
+	done
 
-override_dh_auto_install:
+override_dh_installman:
 	help2man --no-info --help-option="-h" --version-option="-v" \
 	         --name="Randomized Axelerated Maximum Likelihood" \
-	         $(CURDIR)/$(exe) > $(CURDIR)/debian/$(DEBPKGNAME)/usr/share/man/man1/$(exe).1
+	         $(CURDIR)/debian/$(DEBPKGNAME)/usr/bin/$(exe) > $(CURDIR)/debian/$(DEBPKGNAME)/usr/share/man/man1/$(exe).1
+	for cexe in `ls $(BINDIR)/$(exe)*` ; do \
+	    curexe=`basename $${cexe}` ; \
+	    if [ $${curexe} != $(exe) ] ; then \
+		ln -s $(exe).1.gz $(CURDIR)/debian/$(DEBPKGNAME)/usr/share/man/man1/$${curexe}.1.gz ; \
+	    fi ; \
+	done
 
 override_dh_installexamples:
 	dh_installexamples