r45693 - in /packages/lapack/trunk/debian: changelog control patches/parallel_build.patch patches/series rules

sebastien at users.alioth.debian.org sebastien at users.alioth.debian.org
Wed Mar 27 11:33:11 UTC 2013 

Author: sebastien
Date: Wed Mar 27 11:33:10 2013
New Revision: 45693

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=45693
Log:
Fixes and improvements in package build logic
 + fix build-arch and build-indep rules
 + use Build-Depends-Indep field
 + enable parallel build (in particular, new patch parallel_build.patch)
 + move test failure notice from obsolete liblapack3gf to liblapack3


Added:
    packages/lapack/trunk/debian/patches/parallel_build.patch
Modified:
    packages/lapack/trunk/debian/changelog
    packages/lapack/trunk/debian/control
    packages/lapack/trunk/debian/patches/series
    packages/lapack/trunk/debian/rules

Modified: packages/lapack/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/lapack/trunk/debian/changelog?rev=45693&op=diff
==============================================================================
--- packages/lapack/trunk/debian/changelog (original)
+++ packages/lapack/trunk/debian/changelog Wed Mar 27 11:33:10 2013
@@ -4,6 +4,11 @@
     lapacke/examples/example_{D,Z}GESV_rowmajor.c. (Closes: #703916)
   * Use my @debian.org email address
   * Remove obsolete DM-Upload-Allowed control flag
+  * Fixes and improvements in package build logic
+    + fix build-arch and build-indep rules
+    + use Build-Depends-Indep field
+    + enable parallel build (in particular, new patch parallel_build.patch)
+    + move test failure notice from obsolete liblapack3gf to liblapack3
 
  -- Sébastien Villemot <sebastien at debian.org>  Mon, 25 Mar 2013 21:51:05 +0100
 

Modified: packages/lapack/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-science/packages/lapack/trunk/debian/control?rev=45693&op=diff
==============================================================================
--- packages/lapack/trunk/debian/control (original)
+++ packages/lapack/trunk/debian/control Wed Mar 27 11:33:10 2013
@@ -5,7 +5,8 @@
 Uploaders: Sylvestre Ledru <sylvestre at debian.org>,
            Sébastien Villemot <sebastien at debian.org>
 Build-Depends: debhelper (>= 7), gfortran, libblas-dev (>= 1.2.20110419-3),
- doxygen, python, graphviz
+ python
+Build-Depends-Indep: doxygen, graphviz
 Standards-Version: 3.9.3
 Homepage: http://www.netlib.org/lapack/
 Vcs-Svn: svn://svn.debian.org/svn/debian-science/packages/lapack/

Added: packages/lapack/trunk/debian/patches/parallel_build.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/lapack/trunk/debian/patches/parallel_build.patch?rev=45693&op=file
==============================================================================
--- packages/lapack/trunk/debian/patches/parallel_build.patch (added)
+++ packages/lapack/trunk/debian/patches/parallel_build.patch Wed Mar 27 11:33:10 2013
@@ -1,0 +1,94 @@
+Description: Make build system compatible with parallel make (-jN)
+Author: Sébastien Villemot <sebastien at debian.org>
+Forwarded: no
+Last-Update: 2013-03-27
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/testing/LIN/Makefile
++++ b/testing/LIN/Makefile
+@@ -244,75 +244,45 @@
+ proto-complex: ../xlintstrfc
+ proto-complex16: ../xlintstzc ../xlintstrfz
+ 
+-xlintsts : $(ALINTST) $(SLINTST) $(SCLNTST) ../../$(LAPACKLIB)
++../xlintsts : $(ALINTST) $(SLINTST) $(SCLNTST) ../../$(LAPACKLIB)
+ 	$(LOADER) $(LOADOPTS)  $(ALINTST) $(SCLNTST) $(SLINTST) \
+         ../../$(TMGLIB) ../../$(LAPACKLIB) $(XBLASLIB)  $(BLASLIB) -o $@
+ 
+-xlintstc : $(ALINTST) $(CLINTST) $(SCLNTST) ../../$(LAPACKLIB)
++../xlintstc : $(ALINTST) $(CLINTST) $(SCLNTST) ../../$(LAPACKLIB)
+ 	$(LOADER) $(LOADOPTS)  $(ALINTST) $(SCLNTST) $(CLINTST) \
+         ../../$(TMGLIB) ../../$(LAPACKLIB) $(XBLASLIB)  $(BLASLIB) -o $@
+  
+-xlintstd : $(ALINTST) $(DLINTST) $(DZLNTST) ../../$(LAPACKLIB)
++../xlintstd : $(ALINTST) $(DLINTST) $(DZLNTST) ../../$(LAPACKLIB)
+ 	$(LOADER) $(LOADOPTS) $^ \
+         ../../$(TMGLIB) ../../$(LAPACKLIB) $(XBLASLIB) $(BLASLIB) -o $@
+  
+-xlintstz : $(ALINTST) $(ZLINTST) $(DZLNTST) ../../$(LAPACKLIB)
++../xlintstz : $(ALINTST) $(ZLINTST) $(DZLNTST) ../../$(LAPACKLIB)
+ 	$(LOADER) $(LOADOPTS)  $(ALINTST) $(DZLNTST) $(ZLINTST) \
+         ../../$(TMGLIB) ../../$(LAPACKLIB) $(XBLASLIB)  $(BLASLIB) -o $@
+  
+-xlintstds : $(DSLINTST) ../../$(LAPACKLIB)
++../xlintstds : $(DSLINTST) ../../$(LAPACKLIB)
+ 	$(LOADER) $(LOADOPTS)  $(DSLINTST) \
+         ../../$(TMGLIB) ../../$(LAPACKLIB) $(BLASLIB) -o $@
+  
+-xlintstzc : $(ZCLINTST) ../../$(LAPACKLIB)
++../xlintstzc : $(ZCLINTST) ../../$(LAPACKLIB)
+ 	$(LOADER) $(LOADOPTS)  $(ZCLINTST) \
+         ../../$(TMGLIB) ../../$(LAPACKLIB) $(BLASLIB) -o $@
+  
+-xlintstrfs : $(SLINTSTRFP) ../../$(LAPACKLIB)
++../xlintstrfs : $(SLINTSTRFP) ../../$(LAPACKLIB)
+ 	$(LOADER) $(LOADOPTS)  $(SLINTSTRFP) \
+         ../../$(TMGLIB) ../../$(LAPACKLIB) $(BLASLIB) -o $@
+  
+-xlintstrfd : $(DLINTSTRFP) ../../$(LAPACKLIB)
++../xlintstrfd : $(DLINTSTRFP) ../../$(LAPACKLIB)
+ 	$(LOADER) $(LOADOPTS)  $(DLINTSTRFP) \
+         ../../$(TMGLIB) ../../$(LAPACKLIB) $(BLASLIB) -o $@
+  
+-xlintstrfc : $(CLINTSTRFP) ../../$(LAPACKLIB)
++../xlintstrfc : $(CLINTSTRFP) ../../$(LAPACKLIB)
+ 	$(LOADER) $(LOADOPTS)  $(CLINTSTRFP) \
+         ../../$(TMGLIB) ../../$(LAPACKLIB) $(BLASLIB) -o $@
+  
+-xlintstrfz : $(ZLINTSTRFP) ../../$(LAPACKLIB)
++../xlintstrfz : $(ZLINTSTRFP) ../../$(LAPACKLIB)
+ 	$(LOADER) $(LOADOPTS)  $(ZLINTSTRFP) \
+         ../../$(TMGLIB) ../../$(LAPACKLIB) $(BLASLIB) -o $@
+- 
+-../xlintsts: xlintsts
+-	mv xlintsts $@
+-
+-../xlintstc: xlintstc
+-	mv xlintstc $@
+-
+-../xlintstz: xlintstz
+-	mv xlintstz $@
+-
+-../xlintstd: xlintstd
+-	mv xlintstd $@
+-
+-../xlintstds: xlintstds
+-	mv xlintstds $@
+-
+-../xlintstzc: xlintstzc
+-	mv xlintstzc $@
+-
+-../xlintstrfs: xlintstrfs
+-	mv xlintstrfs $@
+-
+-../xlintstrfc: xlintstrfc
+-	mv xlintstrfc $@
+-
+-../xlintstrfd: xlintstrfd
+-	mv xlintstrfd $@
+-
+-../xlintstrfz: xlintstrfz
+-	mv xlintstrfz $@
+ 
+ $(ALINTST): $(FRC)
+ $(SCLNTST): $(FRC)

Modified: packages/lapack/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/debian-science/packages/lapack/trunk/debian/patches/series?rev=45693&op=diff
==============================================================================
--- packages/lapack/trunk/debian/patches/series (original)
+++ packages/lapack/trunk/debian/patches/series Wed Mar 27 11:33:10 2013
@@ -4,3 +4,4 @@
 no_blas_manpages.patch
 lapacke_no_matgen.patch
 decouple_gcc.diff
+parallel_build.patch

Modified: packages/lapack/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/lapack/trunk/debian/rules?rev=45693&op=diff
==============================================================================
--- packages/lapack/trunk/debian/rules (original)
+++ packages/lapack/trunk/debian/rules Wed Mar 27 11:33:10 2013
@@ -38,7 +38,13 @@
   export ignore_testing_failures = -
 endif
 
-doc: 
+# Support parallel build
+ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
+	NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
+	MAKEFLAGS += -j$(NUMJOBS)
+endif
+
+doc: make.inc
 	$(MAKE) html
 	$(MAKE) man
 
@@ -172,7 +178,7 @@
 	$(F77) -v >>$@
 	cat $^ >>$@
 
-debian/liblapack3gf.templates: debian/test_results
+debian/liblapack3.templates: debian/test_results
 	cp debian/main_templates $@
 
 #
@@ -188,15 +194,15 @@
 	[ -L $* ] || install -m 644 $< $(@D)
 	! [ -L $* ] || cp -d $< $@
 
-$(addprefix debian/tmp/usr/lib/liblapack3gf/,$(subst testing/,,$(TB))): \
-	debian/tmp/usr/lib/liblapack3gf/%: testing/%
+$(addprefix debian/tmp/usr/lib/liblapack3/,$(subst testing/,,$(TB))): \
+	debian/tmp/usr/lib/liblapack3/%: testing/%
 	dh_testdir
 
 	install -m 755 -d $(@D)
 	install -m 755 $< $(@D)
 
 
-install: $(IF) $(MF3) debian/test_results debian/liblapack3gf.templates
+install: debian/test_results debian/liblapack3.templates
 	dh_testdir
 
 
@@ -212,7 +218,7 @@
 	rm -rf debian/*_stamp debian/*_results lib* testing/*out
 #	find man -name "*.$(MANEXT)" -exec rm {} \;
 	rm -rf *.a install/test* debian/test/ debian/time/
-	rm -f debian/test_results debian/liblapack3gf.templates
+	rm -f debian/test_results debian/liblapack3.templates
 	rm -f testing/tmp
 	cd lapacke && $(MAKE) clean
 	touch TESTING/xlinfoo TESTING/xeigfoo  && $(MAKE) clean
@@ -228,13 +234,12 @@
 # Package rules
 #
 #
-build: $(BF) make.inc build-arch build-indep
-build-arch: build-stamp
-build-indep: build-stamp
-build-stamp: install
+build: build-arch build-indep
+build-arch: $(BF) install
+build-indep: doc
 
 # Build architecture-independent files here.
-binary-indep: doc install
+binary-indep: build-indep
 	dh_testdir -i
 	dh_install -i
 	dh_installdocs -i
@@ -254,7 +259,7 @@
 	dh_builddeb -i
 
 # Build architecture-dependent files here.
-binary-arch: install
+binary-arch: build-arch
 	dh_testdir -a
 	dh_install -a
 	dh_installdocs -a
@@ -276,4 +281,8 @@
 
 binary: binary-indep binary-arch
 .PHONY: clean binary-indep binary-arch binary \
-	doc build
+	build build-arch build-indep doc install
+
+# This Makefile must be run serially (because non-PIC and PIC versions must be
+# built sequentially), but the sub-makes can still be parallized
+.NOTPARALLEL:

More information about the debian-science-commits mailing list