[Glibc-bsd-commits] r3363 - trunk/ufsutils/debian

[Guillem Jover]

Author: guillem
Date: 2011-05-30 06:17:09 +0000 (Mon, 30 May 2011)
New Revision: 3363

Modified:
   trunk/ufsutils/debian/changelog
   trunk/ufsutils/debian/control
   trunk/ufsutils/debian/rules
Log:
Use dpkg-buildflags to set CPPFLAGS, CFLAGS and LDFLAGS

Based-on-patch-by: Peter Pentchev <roam at ringlet.net>


Modified: trunk/ufsutils/debian/changelog
===================================================================
--- trunk/ufsutils/debian/changelog	2011-05-30 06:01:17 UTC (rev 3362)
+++ trunk/ufsutils/debian/changelog	2011-05-30 06:17:09 UTC (rev 3363)
@@ -24,6 +24,8 @@
   * Update CVS to Subversion reference to upstream source code in
     debian/copyright.
   * Remove unused lib variable from debian/rules.
+  * Use dpkg-buildflags to set CPPFLAGS, CFLAGS and LDFLAGS.
+    Based on a patch by Peter Pentchev.
 
   [ Peter Pentchev ]
   * Remove duplicate section “utils” from ufsutils binary package.

Modified: trunk/ufsutils/debian/control
===================================================================
--- trunk/ufsutils/debian/control	2011-05-30 06:01:17 UTC (rev 3362)
+++ trunk/ufsutils/debian/control	2011-05-30 06:17:09 UTC (rev 3363)
@@ -3,7 +3,8 @@
 Priority: optional
 Maintainer: GNU/kFreeBSD Maintainers <debian-bsd at lists.debian.org>
 Uploaders: Aurelien Jarno <aurel32 at debian.org>, Guillem Jover <guillem at debian.org>
-Build-Depends: debhelper (>= 7), libedit-dev, libbsd-dev, libc0.1-dev (>= 2.10.1) [kfreebsd-any]
+Build-Depends: dpkg-dev (>= 1.15.7), debhelper (>= 7), libbsd-dev, libedit-dev,
+ libc0.1-dev (>= 2.10.1) [kfreebsd-any]
 Vcs-Browser: http://svn.debian.org/wsvn/glibc-bsd/trunk/ufsutils/
 Vcs-Svn: svn://svn.debian.org/glibc-bsd/trunk/ufsutils/
 Standards-Version: 3.9.2

Modified: trunk/ufsutils/debian/rules
===================================================================
--- trunk/ufsutils/debian/rules	2011-05-30 06:01:17 UTC (rev 3362)
+++ trunk/ufsutils/debian/rules	2011-05-30 06:17:09 UTC (rev 3363)
@@ -8,10 +8,12 @@
 
 DESTDIR = $(CURDIR)/debian/tmp
 
-CFLAGS = -Wall -g
-
 DEB_HOST_ARCH_OS = $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
 
+CFLAGS := -Wall $(shell dpkg-buildflags --get CFLAGS)
+CPPFLAGS := $(shell dpkg-buildflags --get CPPFLAGS)
+LDFLAGS := $(shell dpkg-buildflags --get LDFLAGS)
+
 # GNU/kFreeBSD already have off_t 64bit. It must not be enabled,
 # as it would change size of ino_t
 ifneq (kfreebsd,$(DEB_HOST_ARCH_OS))
@@ -20,12 +22,6 @@
 CFLAGS += -D_FILE_OFFSET_BITS=64 -I$(CURDIR)/sys
 endif
 
-ifneq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
-	CFLAGS += -O0
-else
-	CFLAGS += -O2
-endif
-
 SOURCE = $(shell dpkg-parsechangelog | sed -e '/^Source:/!d' -e 's/^Source: //g')
 VERSION = $(shell dpkg-parsechangelog | sed -e '/^Version:/!d' -e 's/^Version: //g' -e 's/-.*//g')
 SVN = http://svn.freebsd.org/base/release/$(VERSION).0
@@ -49,7 +45,7 @@
 build:
 	dh_testdir
 
-	CFLAGS="$(CFLAGS)" LDADD="$(LDADD)" $(MAKE)
+	CPPFLAGS="$(CPPFLAGS)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" $(MAKE)
 
 clean:
 	dh_testdir