mesa: Changes to 'debian-unstable'
debian/changelog | 5 +++++
debian/control | 2 +-
debian/rules | 33 ++++++++++++---------------------
3 files changed, 18 insertions(+), 22 deletions(-)
New commits:
commit c66417f34483a769ae1bea5f92ad1a5ec2abeb7d
Author: Andreas Boll <andreas.boll.dev@gmail.com>
Date: Thu Jun 27 16:35:39 2013 +0200
Disable silent rules.
diff --git a/debian/changelog b/debian/changelog
index 654084a..2ea885d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ mesa (9.1.3-7) UNRELEASED; urgency=low
[ Andreas Boll ]
* Use dpkg-buildflags.
+ * Disable silent rules.
-- Julien Cristau <jcristau@debian.org> Tue, 25 Jun 2013 21:26:56 +0200
diff --git a/debian/rules b/debian/rules
index 0eea51e..fe26287 100755
--- a/debian/rules
+++ b/debian/rules
@@ -179,7 +179,8 @@ $(STAMP)-build-%: configure
../../configure --prefix=/usr --mandir=\$${prefix}/share/man \
--infodir=\$${prefix}/share/info --sysconfdir=/etc \
--libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) \
- --localstatedir=/var $(confflags) $(confflags-$*) \
+ --localstatedir=/var --disable-silent-rules \
+ $(confflags) $(confflags-$*) \
ac_cv_path_LLVM_CONFIG=llvm-config-3.2
cd $(DEB_BUILD_DIR)/$* && $(MAKE)
>$@
commit 67c321e904a21b3669dfff91be3965def8c9b21c
Author: Andreas Boll <andreas.boll.dev@gmail.com>
Date: Thu Jun 27 16:33:39 2013 +0200
Use dpkg-buildflags.
diff --git a/debian/changelog b/debian/changelog
index f1ed842..654084a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,13 @@
mesa (9.1.3-7) UNRELEASED; urgency=low
+ [ Julien Cristau ]
* Don't call wayland_buffer_is_drm from libgbm, it's in libEGL
(closes: #712556).
* Make sure libgbm doesn't have undefined symbols.
+ [ Andreas Boll ]
+ * Use dpkg-buildflags.
+
-- Julien Cristau <jcristau@debian.org> Tue, 25 Jun 2013 21:26:56 +0200
mesa (9.1.3-6) unstable; urgency=low
diff --git a/debian/control b/debian/control
index 04e5305..7d3a315 100644
--- a/debian/control
+++ b/debian/control
@@ -13,7 +13,7 @@ Build-Depends:
x11proto-gl-dev (>= 1.4.14),
libxxf86vm-dev,
libexpat1-dev,
- dpkg-dev (>= 1.15.6),
+ dpkg-dev (>= 1.16.1),
libxfixes-dev,
libxdamage-dev,
libxext-dev,
diff --git a/debian/rules b/debian/rules
index 26dd735..0eea51e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,15 +5,6 @@
# Uncomment this to turn on verbose mode.
#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)))
MAKEFLAGS += -j$(NUMJOBS)
@@ -32,6 +23,12 @@ else
confflags += --build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE)
endif
+buildflags = \
+ $(shell DEB_CFLAGS_MAINT_APPEND=-Wall DEB_CXXFLAGS_MAINT_APPEND=-Wall dpkg-buildflags --export=configure)
+
+buildflags-i686 = \
+ $(shell DEB_CFLAGS_MAINT_APPEND="-Wall -march=i686" DEB_CXXFLAGS_MAINT_APPEND="-Wall -march=i686" dpkg-buildflags --export=configure)
+
# keep a list of files we don't install (yet), but since it's a bit
# large, use an external file:
include debian/not-installed
@@ -52,10 +49,6 @@ BUILD_STAMPS = $(addprefix $(STAMP)-build-, $(CONFIGS))
QUILT_STAMPFN = $(STAMP_DIR)/patch
include /usr/share/quilt/quilt.make
-confflags-common = \
- CFLAGS="$(CFLAGS)" \
- CXXFLAGS="$(CXXFLAGS)"
-
DRI_DRIVERS =
GALLIUM_DRIVERS =
@@ -126,7 +119,7 @@ confflags-dri = \
$(confflags_GALLIUM) \
$(confflags_GLES) \
$(confflags_OPENVG) \
- $(confflags-common)
+ $(buildflags)
confflags-swx11 = \
--disable-dri \
@@ -135,8 +128,7 @@ confflags-swx11 = \
--enable-xlib-glx \
--disable-egl \
--disable-shared-glapi \
- CFLAGS="$(CFLAGS)" \
- CXXFLAGS="$(CXXFLAGS)"
+ $(buildflags)
confflags-swx11-static = \
--disable-dri \
@@ -146,8 +138,7 @@ confflags-swx11-static = \
--enable-static \
--disable-egl \
--disable-shared-glapi \
- CFLAGS="$(CFLAGS)" \
- CXXFLAGS="$(CXXFLAGS)"
+ $(buildflags)
confflags-swx11-i386-i686 = \
--disable-dri \
@@ -156,8 +147,7 @@ confflags-swx11-i386-i686 = \
--enable-xlib-glx \
--disable-egl \
--libdir=/usr/lib/$(DEB_HOST_MULTIARCH)/i686/cmov \
- CFLAGS="$(CFLAGS) -march=i686" \
- CXXFLAGS="$(CXXFLAGS) -march=i686"
+ $(buildflags-i686)
configure: $(QUILT_STAMPFN) configure.ac
autoreconf -vfi
Reply to: