mesa: Changes to 'debian-unstable'
debian/changelog | 6 +++++
debian/rules | 11 +++++-----
debian/scripts/choose-configs | 46 ------------------------------------------
3 files changed, 12 insertions(+), 51 deletions(-)
New commits:
commit b5a21b23d67a5efabbd8c493242971dde520af6d
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Aug 28 19:47:22 2011 +0200
Inline what's left of debian/scripts/choose-configs in debian/rules.
diff --git a/debian/changelog b/debian/changelog
index 07c59f9..7641d2a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+mesa (7.11-6) UNRELEASED; urgency=low
+
+ * Inline what's left of debian/scripts/choose-configs in debian/rules.
+
+ -- Julien Cristau <jcristau@debian.org> Sun, 28 Aug 2011 19:46:58 +0200
+
mesa (7.11-5) unstable; urgency=low
* Merge patch from Pino Tiscano (thanks!):
diff --git a/debian/rules b/debian/rules
index 81e01fb..a842bab 100755
--- a/debian/rules
+++ b/debian/rules
@@ -20,7 +20,6 @@ ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
endif
DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
-DEB_BUILD_ARCH ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
@@ -33,15 +32,13 @@ else
confflags += --build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE)
endif
-# choose which configurations to build
-include debian/scripts/choose-configs
-
# 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
# build the following configurations by default
-CONFIGS = $(SWX11_GLU_CONFIGS) \
+CONFIGS = swx11+glu \
+ swx11+glu-static \
dri \
osmesa \
osmesa-static \
@@ -50,6 +47,10 @@ CONFIGS = $(SWX11_GLU_CONFIGS) \
osmesa32 \
osmesa32-static
+ifeq ($(DEB_HOST_ARCH_CPU), i386)
+ CONFIGS += swx11+glu-i386-i686
+endif
+
STAMP_DIR = debian/stamp
STAMP = $(STAMP_DIR)/$(DEB_BUILD_GNU_TYPE)
BUILD_STAMPS = $(addprefix $(STAMP)-build-, $(CONFIGS))
diff --git a/debian/scripts/choose-configs b/debian/scripts/choose-configs
deleted file mode 100644
index a4c8d6b..0000000
--- a/debian/scripts/choose-configs
+++ /dev/null
@@ -1,46 +0,0 @@
-# Script to choose which configurations are to be built depending on the value
-# of the DEB_BUILD_ARCH variable.
-#
-# Copyright © 2006 Thierry Reding <thierry@gilfi.de>
-
-##############################################################################
-## architecture-specific configurations ######################################
-
-# choose an architecture-specific build of swx11 and GLU if a matching
-# configuration exists
-#ifneq ($(wildcard configs/debian-swx11+glu-$(DEB_BUILD_ARCH)),)
-# SWX11_GLU_CONFIGS := debian-swx11+glu-$(DEB_BUILD_ARCH)
-#else
-# SWX11_GLU_CONFIGS := debian-swx11+glu-any
-#endif
-
-# same for static builds
-#ifneq ($(wildcard configs/debian-swx11+glu-static-$(DEB_BUILD_ARCH)),)
-# SWX11_GLU_CONFIGS += debian-swx11+glu-static-$(DEB_BUILD_ARCH)
-#else
-# SWX11_GLU_CONFIGS += debian-swx11+glu-static-any
-#endif
-
-SWX11_GLU_CONFIGS := swx11+glu swx11+glu-static
-
-##############################################################################
-## CPU-optimized configurations ##############################################
-
-ifeq ($(DEB_HOST_ARCH_CPU), i386)
- SWX11_GLU_CONFIGS += swx11+glu-i386-i686
-endif
-
-#ifeq ($(DEB_BUILD_ARCH), alpha)
-# SWX11_GLU_CONFIGS += debian-swx11+glu-alpha-ev5
-#endif
-
-#ifeq ($(DEB_BUILD_ARCH), powerpc)
-# SWX11_GLU_CONFIGS += debian-swx11+glu-powerpc-603
-#endif
-
-#ifeq ($(DEB_BUILD_ARCH), sparc)
-# SWX11_GLU_CONFIGS += debian-swx11+glu-sparc-ultrasparc
-#endif
-
-# vim: ft=make
-
Reply to: