[Glibc-bsd-commits] r3391 - trunk/libbsd/debian

[Guillem Jover]

Author: guillem
Date: 2011-06-02 18:25:33 +0000 (Thu, 02 Jun 2011)
New Revision: 3391

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


Modified: trunk/libbsd/debian/changelog
===================================================================
--- trunk/libbsd/debian/changelog	2011-06-02 18:18:53 UTC (rev 3390)
+++ trunk/libbsd/debian/changelog	2011-06-02 18:25:33 UTC (rev 3391)
@@ -6,6 +6,7 @@
   * Use kfreebsd-any instead of explicit list in libbsd0 Conflicts field.
   * Now using Standards-Version 3.9.2 (no changes needed).
   * Switch the symbols file to use symver tags instead of symbol patterns.
+  * Use dpkg-buildflags to set CPPFLAGS, CFLAGS and LDFLAGS.
 
  -- Guillem Jover <guillem at debian.org>  Mon, 28 Jun 2010 21:05:00 +0200
 

Modified: trunk/libbsd/debian/control
===================================================================
--- trunk/libbsd/debian/control	2011-06-02 18:18:53 UTC (rev 3390)
+++ trunk/libbsd/debian/control	2011-06-02 18:25:33 UTC (rev 3391)
@@ -6,7 +6,7 @@
  Guillem Jover <guillem at debian.org>, Aurelien Jarno <aurel32 at debian.org>
 Vcs-Browser: http://svn.debian.org/wsvn/glibc-bsd/trunk/libbsd/
 Vcs-Svn: svn://svn.debian.org/glibc-bsd/trunk/libbsd/
-Build-Depends: debhelper (>= 7)
+Build-Depends: dpkg-dev (>= 1.15.7), debhelper (>= 7)
 Standards-Version: 3.9.2
 Homepage: http://libbsd.freedesktop.org/
 

Modified: trunk/libbsd/debian/rules
===================================================================
--- trunk/libbsd/debian/rules	2011-06-02 18:18:53 UTC (rev 3390)
+++ trunk/libbsd/debian/rules	2011-06-02 18:25:33 UTC (rev 3391)
@@ -3,13 +3,10 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-CFLAGS = -Wall -g
+CPPFLAGS := $(shell dpkg-buildflags --get CPPFLAGS)
+CFLAGS := -Wall $(shell dpkg-buildflags --get CFLAGS)
+LDFLAGS := $(shell dpkg-buildflags --get LDFLAGS)
 
-ifneq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
-	CFLAGS += -O0
-else
-	CFLAGS += -O2
-endif
 
 lib := libbsd0
 libdbg := $(lib)-dbg
@@ -21,7 +18,7 @@
 build-arch:
 	dh_testdir
 
-	$(MAKE)
+	$(MAKE) CPPFLAGS="$(CPPFLAGS)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)"
 
 build: build-indep build-arch