[pkg-wine-party] [PATCH 03/10] Use dpkg-buildflags to set compiler environment variables, thanks to Moritz Muehlenhoff (Closes: #658039)

Hilko Bengen bengen at debian.org
Tue May 15 06:44:04 UTC 2012


---
 debian/rules |   14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/debian/rules b/debian/rules
index 23405d9..a129dc6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,17 +6,15 @@ export SHELL=bash
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-ifneq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
-CFLAGS=-O0 -g
-else
-CFLAGS=-O2 -g
-endif
-LDFLAGS=
 ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
 NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
 MAKEFLAGS += -j$(NUMJOBS)
 endif
 
+CFLAGS = `dpkg-buildflags --get CFLAGS`
+LDFLAGS = `dpkg-buildflags --get LDFLAGS`
+CPPFLAGS = `dpkg-buildflags --get CPPFLAGS`
+
 CONFIGOPTS = --with-x --disable-tests
 
 DEB_HOST_GNU_SYSTEM	?= $(shell dpkg-architecture -qDEB_HOST_GNU_SYSTEM)
@@ -51,11 +49,13 @@ LIBDIRS=$(LIBDIR)
 IA32_CC := $(CC)
 IA32_CFLAGS := $(CFLAGS)
 IA32_LDFLAGS := $(LDFLAGS)
+IA32_CPPFLAGS := $(CPPFLAGS)
 IA32_LIBDIR := $(LIBDIR)
 
 # Win64 version requires gcc >= 4.4
 AMD64_CC := gcc-4.4
 AMD64_CFLAGS := $(CFLAGS)
+AMD64_CPPFLAGS := $(CPPFLAGS)
 AMD64_LDFLAGS := $(LDFLAGS)
 AMD64_LIBDIR := $(LIBDIR)
 
@@ -155,6 +155,7 @@ ifeq (,$(DEB_SAVEBUILD))
 	cd build32 && \
 	CC="$(IA32_CC)" \
 	CFLAGS="$(IA32_CFLAGS)" \
+	CPPFLAGS="$(IA32_CPPFLAGS)" \
 	LDFLAGS="$(IA32_LDFLAGS)" \
 	../configure --disable-win64 $(CONFIGOPTS) \
 	--prefix=/usr \
@@ -177,6 +178,7 @@ ifeq (,$(DEB_SAVEBUILD))
 	cd build64 && \
 	CC="$(AMD64_CC)" \
 	CFLAGS="$(AMD64_CFLAGS)" \
+	CPPFLAGS="$(AMD64_CFLAGS)" \
 	LDFLAGS="$(AMD64_LDFLAGS)" \
 	../configure --enable-win64 $(CONFIGOPTS) \
 	--prefix=/usr \
-- 
1.7.10




More information about the pkg-wine-party mailing list