X Strike Force X.Org X11 SVN commit: r3862 - in branches/experimental/mesa: configs debian
Author: beatle
Date: 2006-10-20 08:15:29 -0400 (Fri, 20 Oct 2006)
New Revision: 3862
Added:
branches/experimental/mesa/configs/debian-swx11+glu-static-amd64
branches/experimental/mesa/configs/debian-swx11+glu-static-any
branches/experimental/mesa/configs/debian-swx11+glu-static-i386
branches/experimental/mesa/configs/debian-swx11+glu-static-ppc64
Removed:
branches/experimental/mesa/configs/debian-swx11+glu-static
Modified:
branches/experimental/mesa/debian/rules
Log:
Build architecture-specific static libraries where available.
Deleted: branches/experimental/mesa/configs/debian-swx11+glu-static
===================================================================
--- branches/experimental/mesa/configs/debian-swx11+glu-static 2006-10-20 12:06:20 UTC (rev 3861)
+++ branches/experimental/mesa/configs/debian-swx11+glu-static 2006-10-20 12:15:29 UTC (rev 3862)
@@ -1,9 +0,0 @@
-# Configuration for building static versions of the libraries (swx11 and GLU).
-
-include $(TOP)/configs/linux-static
-include $(TOP)/configs/debian-swx11+glu-default
-
-CONFIG_NAME = debian-swx11+glu-static
-
-# vim: ft=make
-
Added: branches/experimental/mesa/configs/debian-swx11+glu-static-amd64
===================================================================
--- branches/experimental/mesa/configs/debian-swx11+glu-static-amd64 (rev 0)
+++ branches/experimental/mesa/configs/debian-swx11+glu-static-amd64 2006-10-20 12:15:29 UTC (rev 3862)
@@ -0,0 +1,10 @@
+# Configuration for building static versions of the libraries (swx11 and GLU)
+# on amd64.
+
+include $(TOP)/configs/linux-x86-64-static
+include $(TOP)/configs/debian-swx11+glu-default
+
+CONFIG_NAME = debian-swx11+glu-static-amd64
+
+# vim: ft=make
+
Copied: branches/experimental/mesa/configs/debian-swx11+glu-static-any (from rev 3836, branches/experimental/mesa/configs/debian-swx11+glu-static)
===================================================================
--- branches/experimental/mesa/configs/debian-swx11+glu-static-any (rev 0)
+++ branches/experimental/mesa/configs/debian-swx11+glu-static-any 2006-10-20 12:15:29 UTC (rev 3862)
@@ -0,0 +1,10 @@
+# Configuration for building static versions of the libraries (swx11 and GLU)
+# on the build architecture.
+
+include $(TOP)/configs/linux-static
+include $(TOP)/configs/debian-swx11+glu-default
+
+CONFIG_NAME = debian-swx11+glu-static-any
+
+# vim: ft=make
+
Added: branches/experimental/mesa/configs/debian-swx11+glu-static-i386
===================================================================
--- branches/experimental/mesa/configs/debian-swx11+glu-static-i386 (rev 0)
+++ branches/experimental/mesa/configs/debian-swx11+glu-static-i386 2006-10-20 12:15:29 UTC (rev 3862)
@@ -0,0 +1,10 @@
+# Configuration for building static versions of the libraries (swx11 and GLU)
+# on i386.
+
+include $(TOP)/configs/linux-x86-static
+include $(TOP)/configs/debian-swx11+glu-default
+
+CONFIG_NAME = debian-swx11+glu-static-i386
+
+# vim: ft=make
+
Added: branches/experimental/mesa/configs/debian-swx11+glu-static-ppc64
===================================================================
--- branches/experimental/mesa/configs/debian-swx11+glu-static-ppc64 (rev 0)
+++ branches/experimental/mesa/configs/debian-swx11+glu-static-ppc64 2006-10-20 12:15:29 UTC (rev 3862)
@@ -0,0 +1,11 @@
+# Configuration for building static versions of the libraries (swx11 and GLU)
+# on ppc64.
+
+include $(TOP)/configs/debian-swx11+glu-static-any
+
+CONFIG_NAME = debian-swx11+glu-static-ppc64
+
+LIB_DIR = lib64
+
+# vim: ft=make
+
Modified: branches/experimental/mesa/debian/rules
===================================================================
--- branches/experimental/mesa/debian/rules 2006-10-20 12:06:20 UTC (rev 3861)
+++ branches/experimental/mesa/debian/rules 2006-10-20 12:15:29 UTC (rev 3862)
@@ -26,19 +26,22 @@
export DEB_BUILD_ARCH
-# choose an architecture-specific configuration for building swx11 and GLU if
-# one exists
+# 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
-# build a static version of swx11 and GLU as well
-SWX11_GLU_CONFIGS += debian-swx11+glu-static
+# 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
-# choose an architecture-specific configuration for building the DRI-enabled
-# libGL if one exists
+# and for the GLX/DRI-enabled libGL
ifneq ($(wildcard configs/debian-dri-$(DEB_BUILD_ARCH)),)
DRI_CONFIGS := debian-dri-$(DEB_BUILD_ARCH)
else
@@ -64,10 +67,6 @@
# SWX11_GLU_CONFIGS += debian-swx11+glu-sparc-ultrasparc
#endif
-# Use the following to automatically build all optimized configurations
-# available for the build architecture. Use with caution =)
-#SWX11_GLU_CONFIGS += $(subst configs/,,$(wildcard configs/debian-swx11+glu-$(DEB_BUILD_ARCH)-*))
-
# build the following configurations by default
CONFIGS = $(SWX11_GLU_CONFIGS) \
$(DRI_CONFIGS) \
Reply to: