--- debian/changelog | 1 + debian/rules | 8 +++----- 2 filer ändrade, 4 tillägg(+), 5 borttagningar(-)
diff --git a/debian/changelog b/debian/changelog index 059c666..5053505 100644 --- a/debian/changelog +++ b/debian/changelog @@ -51,6 +51,7 @@ mesa (9.0~git20120917.7cfd42ce-1) UNRELEASED; urgency=low * control: Add libtxc-dxtn-s2tc0 to libgl1-mesa-dri Recommends. * libosmesa*.install.in: Install files into the correct path. * control: Add libglapi-mesa to liosmesa6 Depends. + * rules: Clean up confflags -- Julien Cristau <jcris...@debian.org> Fri, 03 Aug 2012 23:17:16 +0200 diff --git a/debian/rules b/debian/rules index 248e7a0..ada5ae9 100755 --- a/debian/rules +++ b/debian/rules @@ -52,10 +52,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 +122,8 @@ confflags-dri = \ $(confflags_GALLIUM) \ $(confflags_GLES) \ $(confflags_OPENVG) \ - $(confflags-common) + CFLAGS="$(CFLAGS)" \ + CXXFLAGS="$(CXXFLAGS)" confflags-swx11 = \ --disable-dri \ @@ -155,6 +152,7 @@ confflags-swx11-i386-i686 = \ --with-gallium-drivers= \ --enable-xlib-glx \ --disable-egl \ + --disable-shared-glapi \ --libdir=/usr/lib/$(DEB_HOST_MULTIARCH)/i686/cmov \ CFLAGS="$(CFLAGS) -march=i686" \ CXXFLAGS="$(CXXFLAGS) -march=i686" -- 1.7.10.4 -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/1348389533-5185-5-git-send-email-...@severinsson.net