[SCM] whitedune/master: Use dpkg-buildflags

sramacher at users.alioth.debian.org sramacher at users.alioth.debian.org
Sat Jan 9 20:58:30 UTC 2016


The following commit has been merged in the master branch:
commit 297df4eb61fc6f07097aa9a58a300842c3bd15c5
Author: Sebastian Ramacher <sramacher at debian.org>
Date:   Sat Jan 9 20:31:43 2016 +0100

    Use dpkg-buildflags

diff --git a/debian/rules b/debian/rules
index 378ab72..dff6b3e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,21 +6,12 @@ package=whitedune
 DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
-CFLAGS?=-Wall -g
-
 tmpdir = $(CURDIR)/debian/tmp
 DESTDIR?=$(CURDIR)/debian/${package}/usr
 
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-	CFLAGS += -O0
-else
-	CFLAGS += -O2
-endif
-
 config.status: configure
 	dh_testdir
-	CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs" \
-	 ./configure \
+	./configure $(shell env DEB_LDFLAGS_MAINT_APPEND="-Wl,-z,defs -Wl,--as-needed" dpkg-buildflags --export=cmdline) \
  --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \
  --prefix=/usr --mandir=/usr/share/man  --infodir=/usr/share/info \
  --without-usrlocalinclude \
@@ -66,10 +57,10 @@ generated_files?=\
 clean:
 	dh_testdir
 	dh_testroot
-	rm -f build-stamp 
+	rm -f build-stamp
 	$(MAKE) clean realclean distclean  || echo "# $@"
 	rm -f ${generated_files}
-	dh_clean 
+	dh_clean
 
 install: build
 	dh_testdir

-- 
whitedune packaging



More information about the pkg-multimedia-commits mailing list