[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#630602: [PATCH] add CXXFLAGS to mesa build flags



Package: mesa
Version: 7.10.2-4
Tags: patch

mesa also includes C++ code so also add CXXFLAGS to build the whole tree with 
the same flags (it doesn't change anything with current flags, it's useful only 
when changing the defaults). Patch attached.
diff -purN debian_orig//rules debian/rules
--- debian_orig//rules	2011-06-15 15:42:51.613222708 +0200
+++ debian/rules	2011-06-15 15:51:43.539860407 +0200
@@ -6,10 +6,13 @@
 #export DH_VERBOSE=1
 
 CFLAGS = -Wall -g
+CXXFLAGS = -Wall -g
 ifneq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
 	CFLAGS += -O0
+	CXXFLAGS += -O0
 else
 	CFLAGS += -O2
+	CXXFLAGS += -O2
 endif
 ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
 	NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
@@ -58,7 +61,8 @@ confflags-common = \
 	--disable-glu \
 	--disable-glut \
 	--disable-glw \
-	CFLAGS="$(CFLAGS)"
+	CFLAGS="$(CFLAGS)" \
+	CXXFLAGS="$(CXXFLAGS)"
 
 DRI_DRIVERS = swrast
 
@@ -164,7 +168,8 @@ confflags-swx11+glu = \
 	--disable-egl \
 	--disable-glut \
 	--enable-motif \
-	CFLAGS="$(CFLAGS)"
+	CFLAGS="$(CFLAGS)" \
+	CXXFLAGS="$(CXXFLAGS)"
 
 confflags-swx11+glu-static = \
 	--disable-egl \
@@ -175,7 +180,8 @@ confflags-swx11+glu-static = \
 	--disable-egl \
 	--disable-glut \
 	--enable-motif \
-	CFLAGS="$(CFLAGS)"
+	CFLAGS="$(CFLAGS)" \
+	CXXFLAGS="$(CXXFLAGS)"
 
 confflags-swx11+glu-i386-i686 = \
 	--disable-egl \
@@ -186,7 +192,8 @@ confflags-swx11+glu-i386-i686 = \
 	--disable-egl \
 	--enable-motif \
 	--libdir=/usr/lib/$(DEB_HOST_MULTIARCH)/i686/cmov \
-	CFLAGS="$(CFLAGS) -march=i686"
+	CFLAGS="$(CFLAGS) -march=i686" \
+	CXXFLAGS="$(CXXFLAGS) -march=i686"
 
 configure: $(QUILT_STAMPFN) configure.ac
 	autoreconf -vfi

Reply to: