[openblas] 07/10: Use DEB_BUILD_OPTIONS=custom as new interface for building custom package.

Sébastien Villemot sebastien at debian.org
Thu Jul 27 16:29:56 UTC 2017


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

sebastien pushed a commit to branch master
in repository openblas.

commit 377b258f8fe0581a81890c9d8baa319e83ac3dae
Author: Sébastien Villemot <sebastien at debian.org>
Date:   Thu Jul 27 15:35:52 2017 +0200

    Use DEB_BUILD_OPTIONS=custom as new interface for building custom package.
    
    By the way, no longer automatically append a changelog entry.
    
    Gbp-Dch: Full
    Closes: #854784
---
 debian/README.Debian |  5 ++---
 debian/rules         | 13 ++++---------
 2 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/debian/README.Debian b/debian/README.Debian
index 381e451..0e01bbc 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -30,7 +30,6 @@ machine, proceed as follows.
 Install the build dependencies:
 
 $ sudo aptitude build-dep openblas
-$ sudo aptitude install devscripts
 
 Get the sources of the package:
 
@@ -39,11 +38,11 @@ $ apt-get source openblas
 Compile the package:
 
 $ cd openblas-<VERSION>
-$ fakeroot debian/rules custom
+$ DEB_BUILD_OPTIONS=custom dpkg-buildpackage -uc -b
 
 It should produce a package that you can install with:
 
 $ sudo dpkg -i ../libopenblas-base_<DEBVERSION>.deb
 
- -- Sébastien Villemot <sebastien at debian.org>, Tue,  6 Sep 2016 11:36:05 +0200
+ -- Sébastien Villemot <sebastien at debian.org>, Thu, 27 Jul 2017 15:17:29 +0200
  -- Sylvestre Ledru <sylvestre at debian.org>  Tue, 31 May 2011 13:56:22 +0200
diff --git a/debian/rules b/debian/rules
index 1d5ac76..e141f0b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -52,14 +52,13 @@ ifeq ($(DEB_HOST_ARCH),sparc64)
 endif
 
 
-ifeq ($(TARGET),)
+ifeq (,$(filter custom,$(DEB_BUILD_OPTIONS)))
 	# Generic package
 	MAKE_OPTIONS += $(GENERIC_OPTIONS)
-else ifeq ($(TARGET),custom)
-	# Custom package, leave the arch detection to OpenBLAS
 else
-	# Use the TARGET value provided by the user
-	MAKE_OPTIONS += TARGET=$(TARGET)
+	# Custom package: leave the arch detection to OpenBLAS, and optimize for the current CPU
+	export DEB_CFLAGS_MAINT_APPEND := -march=native -mtune=native
+	export DEB_FFLAGS_MAINT_APPEND := -march=native -mtune=native
 endif
 
 
@@ -84,10 +83,6 @@ override_dh_auto_clean:
 	dh_auto_clean
 	rm -f debian/*.pc
 
-custom:
-	dch --local='+custom'  "custom build on: `uname -a`"
-	LANG=C DEB_CFLAGS_MAINT_APPEND="-march=native -mtune=native" debian/rules TARGET=custom build binary
-
 # We want packages linked with -lblas to depend on any BLAS alternative, and we
 # want packages linked with -lopenblas to depend specifically on
 # libopenblas-base.

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/openblas.git



More information about the debian-science-commits mailing list