X Strike Force X.Org X11 SVN commit: r3980 - in branches/experimental/mesa/debian: . scripts
Author: beatle
Date: 2006-11-10 04:00:00 -0500 (Fri, 10 Nov 2006)
New Revision: 3980
Added:
branches/experimental/mesa/debian/scripts/choose-configs
Modified:
branches/experimental/mesa/debian/rules
Log:
Move the code to choose which configurations to build to a separate script in
order to keep debian/rules cleaner.
Modified: branches/experimental/mesa/debian/rules
===================================================================
--- branches/experimental/mesa/debian/rules 2006-11-10 08:50:35 UTC (rev 3979)
+++ branches/experimental/mesa/debian/rules 2006-11-10 09:00:00 UTC (rev 3980)
@@ -26,47 +26,12 @@
export DEB_BUILD_ARCH
-# 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
+# choose which configurations to build
+SWX11_GLU_CONFIGS =
+DRI_CONFIGS =
-# 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
+include debian/scripts/choose-configs
-# and for the GLX/DRI-enabled libGL
-ifneq ($(wildcard configs/debian-dri-$(DEB_BUILD_ARCH)),)
- DRI_CONFIGS := debian-dri-$(DEB_BUILD_ARCH)
-else
- DRI_CONFIGS := debian-dri-any
-endif
-
-# additional configurations optimized for CPU's supported by the build
-# architecture
-ifeq ($(DEB_BUILD_ARCH), i386)
- SWX11_GLU_CONFIGS += debian-swx11+glu-i386-i686
-# DRI_CONFIGS += debian-dri-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
-
# build the following configurations by default
CONFIGS = $(SWX11_GLU_CONFIGS) \
$(DRI_CONFIGS) \
Added: branches/experimental/mesa/debian/scripts/choose-configs
===================================================================
--- branches/experimental/mesa/debian/scripts/choose-configs (rev 0)
+++ branches/experimental/mesa/debian/scripts/choose-configs 2006-11-10 09:00:00 UTC (rev 3980)
@@ -0,0 +1,52 @@
+# 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
+
+# and for the GLX/DRI-enabled libGL
+ifneq ($(wildcard configs/debian-dri-$(DEB_BUILD_ARCH)),)
+ DRI_CONFIGS := debian-dri-$(DEB_BUILD_ARCH)
+else
+ DRI_CONFIGS := debian-dri-any
+endif
+
+##############################################################################
+## CPU-optimized configurations ##############################################
+
+ifeq ($(DEB_BUILD_ARCH), i386)
+ SWX11_GLU_CONFIGS += debian-swx11+glu-i386-i686
+# DRI_CONFIGS += debian-dri-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: