[Pkg-octave-commit] [octave-pkg-dev] 01/01: Pass flags from dpkg-buildflags to mkoctfile.

[Sébastien Villemot]

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

sebastien pushed a commit to branch master
in repository octave-pkg-dev.

commit 96dc844b4cefb76e6036ec3e2f9d04aabe3eb23e
Author: Sébastien Villemot <sebastien at debian.org>
Date:   Sat Feb 22 14:38:39 2014 +0100

    Pass flags from dpkg-buildflags to mkoctfile.
    
    Among other consequences, it means that rebuilding octave packages with
    DEB_BUILD_OPTIONS=noopt will work.
    
    Git-Dch: Full
---
 debian/control |  2 +-
 octave-pkg.mk  | 10 +++++++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/debian/control b/debian/control
index 64f152d..945c136 100644
--- a/debian/control
+++ b/debian/control
@@ -12,7 +12,7 @@ Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-octave/octave-pkg-dev.git
 Package: octave-pkg-dev
 Architecture: all
 Depends: liboctave-dev (>= 3.8.0), debhelper (>= 6), cdbs,
- ${misc:Depends}, ${perl:Depends}
+ dpkg-dev (>= 1.16.1~), ${misc:Depends}, ${perl:Depends}
 Description: infrastructure to build Octave packages
  Since version 3.0 of Octave (a numerical computation software),
  add-ons can be installed through the pkg.m system.  This package
diff --git a/octave-pkg.mk b/octave-pkg.mk
index 070c7c2..1a8e66d 100644
--- a/octave-pkg.mk
+++ b/octave-pkg.mk
@@ -42,11 +42,19 @@ local_list = local-list
 # 'verbose'.  Users must set its value after inclusion of octave-pkg.mk.
 OCTPKG_TEST_OPT =
 
-export LDFLAGS=-Wl,--as-needed
 export OCTAVE_HISTFILE=/dev/null
 # even with '--no-history', Octave creates an empty .octave_hist at startup,
 # resulting in 'permission denied errors on the buildds
 
+# Export buildflags to the environment, they will be picked up by mkoctfile.
+# Link with --as-needed since that drastically reduces the number of linked
+# libraries.
+DEB_LDFLAGS_MAINT_APPEND=-Wl,--as-needed
+DPKG_EXPORT_BUILDFLAGS = 1
+include /usr/share/dpkg/buildflags.mk
+# Oct-files ldflags are taken from the following variable
+export OCT_LINK_OPTS=$(LDFLAGS)
+
 install/$(package)::	\
 	check-version	\
 	create-dirs	\

-- 
Alioth's /home/groups/pkg-octave/bin/git-commit-notice on /srv/git.debian.org/git/pkg-octave/octave-pkg-dev.git