Author: beatle Date: 2006-10-16 05:39:59 -0400 (Mon, 16 Oct 2006) New Revision: 3825
Added: branches/experimental/mesa/configs/debian-swx11+glu-alpha-ev5 branches/experimental/mesa/configs/debian-swx11+glu-amd64 branches/experimental/mesa/configs/debian-swx11+glu-any branches/experimental/mesa/configs/debian-swx11+glu-arch branches/experimental/mesa/configs/debian-swx11+glu-i386 branches/experimental/mesa/configs/debian-swx11+glu-i386-i686 branches/experimental/mesa/configs/debian-swx11+glu-powerpc-603 branches/experimental/mesa/configs/debian-swx11+glu-ppc64 branches/experimental/mesa/configs/debian-swx11+glu-sparc branches/experimental/mesa/configs/debian-swx11+glu-sparc-ultrasparc Removed: branches/experimental/mesa/configs/debian-alpha-ev5 branches/experimental/mesa/configs/debian-amd64 branches/experimental/mesa/configs/debian-any branches/experimental/mesa/configs/debian-arch branches/experimental/mesa/configs/debian-i386-i686 branches/experimental/mesa/configs/debian-powerpc-603 branches/experimental/mesa/configs/debian-ppc64 branches/experimental/mesa/configs/debian-sparc-ultrasparc branches/experimental/mesa/configs/debian-swx11+glu Modified: branches/experimental/mesa/configs/debian-dri-any branches/experimental/mesa/debian/rules Log: Rename the CPU optimization configurations to make it clear that they only build swx11 and GLU. Build architecture-optimized swx11 and GLU where possible. Deleted: branches/experimental/mesa/configs/debian-alpha-ev5 =================================================================== --- branches/experimental/mesa/configs/debian-alpha-ev5 2006-10-16 08:58:05 UTC (rev 3824) +++ branches/experimental/mesa/configs/debian-alpha-ev5 2006-10-16 09:39:59 UTC (rev 3825) @@ -1,11 +0,0 @@ -# Configuration for building Mesa on alpha. - -include $(TOP)/configs/debian-default -include $(TOP)/configs/linux-alpha - -CONFIG_NAME = debian-alpha - -override LIB_DIR = lib/ev5/cmov - -# vim: ft=make - Deleted: branches/experimental/mesa/configs/debian-amd64 =================================================================== --- branches/experimental/mesa/configs/debian-amd64 2006-10-16 08:58:05 UTC (rev 3824) +++ branches/experimental/mesa/configs/debian-amd64 2006-10-16 09:39:59 UTC (rev 3825) @@ -1,11 +0,0 @@ -# Configuration for building Mesa on amd64. - -include $(TOP)/configs/debian-default -include $(TOP)/configs/linux-x86-64 - -CONFIG_NAME = debian-amd64 - -override LIB_DIR = lib64 - -# vim: ft=make - Deleted: branches/experimental/mesa/configs/debian-any =================================================================== --- branches/experimental/mesa/configs/debian-any 2006-10-16 08:58:05 UTC (rev 3824) +++ branches/experimental/mesa/configs/debian-any 2006-10-16 09:39:59 UTC (rev 3825) @@ -1,7 +0,0 @@ -# Chicken-out configuration for architectures where optimized builds are not -# supported. - -CONFIG_NAME = debian-any - -# vim: ft=make - Deleted: branches/experimental/mesa/configs/debian-arch =================================================================== --- branches/experimental/mesa/configs/debian-arch 2006-10-16 08:58:05 UTC (rev 3824) +++ branches/experimental/mesa/configs/debian-arch 2006-10-16 09:39:59 UTC (rev 3825) @@ -1,13 +0,0 @@ -# Configuration for building a version of Mesa optimized for the build -# architecture. - -ifneq ($(wildcard $(TOP)/configs/debian-$(DEB_BUILD_ARCH)),) - include $(TOP)/configs/debian-$(DEB_BUILD_ARCH) -else - include $(TOP)/configs/debian-any -endif - -CONFIG_NAME = debian-arch - -# vim: ft=make - Modified: branches/experimental/mesa/configs/debian-dri-any =================================================================== --- branches/experimental/mesa/configs/debian-dri-any 2006-10-16 08:58:05 UTC (rev 3824) +++ branches/experimental/mesa/configs/debian-dri-any 2006-10-16 09:39:59 UTC (rev 3825) @@ -3,7 +3,7 @@ include $(TOP)/configs/debian-dri-default include $(TOP)/configs/linux-dri -CONFIG_NAME = debian-dri +CONFIG_NAME = debian-dri-any # vim: ft=make Deleted: branches/experimental/mesa/configs/debian-i386-i686 =================================================================== --- branches/experimental/mesa/configs/debian-i386-i686 2006-10-16 08:58:05 UTC (rev 3824) +++ branches/experimental/mesa/configs/debian-i386-i686 2006-10-16 09:39:59 UTC (rev 3825) @@ -1,12 +0,0 @@ -# Configuration for building Mesa on i386. - -include $(TOP)/configs/debian-default -include $(TOP)/configs/linux-x86 - -CONFIG_NAME = debian-i386 - -override ARCH_FLAGS += -mcpu=i686 -override LIB_DIR = lib/i686/cmov - -# vim: ft=make - Deleted: branches/experimental/mesa/configs/debian-powerpc-603 =================================================================== --- branches/experimental/mesa/configs/debian-powerpc-603 2006-10-16 08:58:05 UTC (rev 3824) +++ branches/experimental/mesa/configs/debian-powerpc-603 2006-10-16 09:39:59 UTC (rev 3825) @@ -1,11 +0,0 @@ -# Configuration for building Mesa on powerpc. - -include $(TOP)/configs/debian-default -include $(TOP)/configs/linux-ppc - -CONFIG_NAME = debian-powerpc - -override LIB_DIR = lib/603/cmov - -# vim: ft=make - Deleted: branches/experimental/mesa/configs/debian-ppc64 =================================================================== --- branches/experimental/mesa/configs/debian-ppc64 2006-10-16 08:58:05 UTC (rev 3824) +++ branches/experimental/mesa/configs/debian-ppc64 2006-10-16 09:39:59 UTC (rev 3825) @@ -1,10 +0,0 @@ -# Configuration for building Mesa on ppc64. - -include $(TOP)/configs/debian-ppc - -CONFIG_NAME = debian-ppc64 - -override LIB_DIR = lib64 - -# vim: ft=make - Deleted: branches/experimental/mesa/configs/debian-sparc-ultrasparc =================================================================== --- branches/experimental/mesa/configs/debian-sparc-ultrasparc 2006-10-16 08:58:05 UTC (rev 3824) +++ branches/experimental/mesa/configs/debian-sparc-ultrasparc 2006-10-16 09:39:59 UTC (rev 3825) @@ -1,11 +0,0 @@ -# Configuration for building Mesa on sparc. - -include $(TOP)/configs/debian-default -include $(TOP)/configs/linux-sparc - -CONFIG_NAME = debian-sparc - -override LIB_DIR = lib/ultrasparc/cmov - -# vim: ft=make - Deleted: branches/experimental/mesa/configs/debian-swx11+glu =================================================================== --- branches/experimental/mesa/configs/debian-swx11+glu 2006-10-16 08:58:05 UTC (rev 3824) +++ branches/experimental/mesa/configs/debian-swx11+glu 2006-10-16 09:39:59 UTC (rev 3825) @@ -1,11 +0,0 @@ -# Configuration for building Mesa (swx11 and GLU) on the build architecture. - -include $(TOP)/configs/debian-default -include $(TOP)/configs/linux - -CONFIG_NAME = debian - -override SRC_DIRS = mesa glu - -# vim: ft=make - Copied: branches/experimental/mesa/configs/debian-swx11+glu-alpha-ev5 (from rev 3824, branches/experimental/mesa/configs/debian-alpha-ev5) =================================================================== --- branches/experimental/mesa/configs/debian-swx11+glu-alpha-ev5 (rev 0) +++ branches/experimental/mesa/configs/debian-swx11+glu-alpha-ev5 2006-10-16 09:39:59 UTC (rev 3825) @@ -0,0 +1,11 @@ +# Configuration for building Mesa (swx11 and GLU) on alpha (ev5 optimized). + +include $(TOP)/configs/debian-default +include $(TOP)/configs/linux-alpha + +CONFIG_NAME = debian-swx11+glu-alpha-ev5 + +override LIB_DIR = lib/ev5/cmov + +# vim: ft=make + Added: branches/experimental/mesa/configs/debian-swx11+glu-amd64 =================================================================== --- branches/experimental/mesa/configs/debian-swx11+glu-amd64 (rev 0) +++ branches/experimental/mesa/configs/debian-swx11+glu-amd64 2006-10-16 09:39:59 UTC (rev 3825) @@ -0,0 +1,10 @@ +# Configuration for building Mesa (swx11 and GLU) with runtime-detected +# assembler optimizations on amd64. + +include $(TOP)/configs/debian-default +include $(TOP)/configs/linux-x86-64 + +CONFIG_NAME = debian-swx11+glu-amd64 + +# vim: ft=make + Copied: branches/experimental/mesa/configs/debian-swx11+glu-any (from rev 3824, branches/experimental/mesa/configs/debian-swx11+glu) =================================================================== --- branches/experimental/mesa/configs/debian-swx11+glu-any (rev 0) +++ branches/experimental/mesa/configs/debian-swx11+glu-any 2006-10-16 09:39:59 UTC (rev 3825) @@ -0,0 +1,9 @@ +# Configuration for building Mesa (swx11 and GLU) on the build architecture. + +include $(TOP)/configs/debian-default +include $(TOP)/configs/linux + +CONFIG_NAME = debian-swx11+glu-any + +# vim: ft=make + Copied: branches/experimental/mesa/configs/debian-swx11+glu-arch (from rev 3823, branches/experimental/mesa/configs/debian-arch) =================================================================== --- branches/experimental/mesa/configs/debian-swx11+glu-arch (rev 0) +++ branches/experimental/mesa/configs/debian-swx11+glu-arch 2006-10-16 09:39:59 UTC (rev 3825) @@ -0,0 +1,15 @@ +# Configuration for building a version of swx11 and libGLU optimized for the +# build architecture. + +ifneq ($(wildcard $(TOP)/configs/debian-swx11+glu-$(DEB_BUILD_ARCH)),) + include $(TOP)/configs/debian-swx11+glu-$(DEB_BUILD_ARCH) +else + include $(TOP)/configs/debian-swx11+glu-any +endif + +CONFIG_NAME = debian-swx11+glu-arch + +override SRC_DIRS = mesa glu + +# vim: ft=make + Added: branches/experimental/mesa/configs/debian-swx11+glu-i386 =================================================================== --- branches/experimental/mesa/configs/debian-swx11+glu-i386 (rev 0) +++ branches/experimental/mesa/configs/debian-swx11+glu-i386 2006-10-16 09:39:59 UTC (rev 3825) @@ -0,0 +1,10 @@ +# Configuration for building Mesa (swx11 and GLU) with runtime-detected +# assembler optimizations on i386. + +include $(TOP)/configs/debian-default +include $(TOP)/configs/linux-x86 + +CONFIG_NAME = debian-swx11+glu-i386 + +# vim: ft=make + Copied: branches/experimental/mesa/configs/debian-swx11+glu-i386-i686 (from rev 3824, branches/experimental/mesa/configs/debian-i386-i686) =================================================================== --- branches/experimental/mesa/configs/debian-swx11+glu-i386-i686 (rev 0) +++ branches/experimental/mesa/configs/debian-swx11+glu-i386-i686 2006-10-16 09:39:59 UTC (rev 3825) @@ -0,0 +1,13 @@ +# Configuration for building Mesa (swx11 and GLU) with runtime-detected +# assembler optimizations on i386 (i686 optimized). + +include $(TOP)/configs/debian-default +include $(TOP)/configs/linux-x86 + +CONFIG_NAME = debian-swx11+glu-i386-i686 + +override ARCH_FLAGS += -mcpu=i686 +override LIB_DIR = lib/i686/cmov + +# vim: ft=make + Copied: branches/experimental/mesa/configs/debian-swx11+glu-powerpc-603 (from rev 3824, branches/experimental/mesa/configs/debian-powerpc-603) =================================================================== --- branches/experimental/mesa/configs/debian-swx11+glu-powerpc-603 (rev 0) +++ branches/experimental/mesa/configs/debian-swx11+glu-powerpc-603 2006-10-16 09:39:59 UTC (rev 3825) @@ -0,0 +1,12 @@ +# Configuration for building Mesa (swx11 and GLU) with runtime-detected +# assembler optimizations on powerpc (603 optimized). + +include $(TOP)/configs/debian-default +include $(TOP)/configs/linux-ppc + +CONFIG_NAME = debian-swx11+glu-powerpc-603 + +override LIB_DIR = lib/603/cmov + +# vim: ft=make + Copied: branches/experimental/mesa/configs/debian-swx11+glu-ppc64 (from rev 3824, branches/experimental/mesa/configs/debian-ppc64) =================================================================== --- branches/experimental/mesa/configs/debian-swx11+glu-ppc64 (rev 0) +++ branches/experimental/mesa/configs/debian-swx11+glu-ppc64 2006-10-16 09:39:59 UTC (rev 3825) @@ -0,0 +1,11 @@ +# Configuration for building Mesa (swx11 and GLU) with runtime-detected +# assembler optimizations on ppc64. + +include $(TOP)/configs/debian-ppc + +CONFIG_NAME = debian-swx11+glu-ppc64 + +override LIB_DIR = lib64 + +# vim: ft=make + Added: branches/experimental/mesa/configs/debian-swx11+glu-sparc =================================================================== --- branches/experimental/mesa/configs/debian-swx11+glu-sparc (rev 0) +++ branches/experimental/mesa/configs/debian-swx11+glu-sparc 2006-10-16 09:39:59 UTC (rev 3825) @@ -0,0 +1,10 @@ +# Configuration for building Mesa (swx11 and GLU) with runtime-detected +# assembler optimizations on sparc. + +include $(TOP)/configs/debian-default +include $(TOP)/configs/linux-sparc + +CONFIG_NAME = debian-swx11+glu-sparc + +# vim: ft=make + Copied: branches/experimental/mesa/configs/debian-swx11+glu-sparc-ultrasparc (from rev 3824, branches/experimental/mesa/configs/debian-sparc-ultrasparc) =================================================================== --- branches/experimental/mesa/configs/debian-swx11+glu-sparc-ultrasparc (rev 0) +++ branches/experimental/mesa/configs/debian-swx11+glu-sparc-ultrasparc 2006-10-16 09:39:59 UTC (rev 3825) @@ -0,0 +1,12 @@ +# Configuration for building Mesa (swx11 and GLU) with runtime-detected +# assembler optimizations on sparc (ultrasparc-optimized). + +include $(TOP)/configs/debian-default +include $(TOP)/configs/linux-ultrasparc + +CONFIG_NAME = debian-swx11+glu-sparc-ultrasparc + +override LIB_DIR = lib/ultrasparc/cmov + +# vim: ft=make + Modified: branches/experimental/mesa/debian/rules =================================================================== --- branches/experimental/mesa/debian/rules 2006-10-16 08:58:05 UTC (rev 3824) +++ branches/experimental/mesa/debian/rules 2006-10-16 09:39:59 UTC (rev 3825) @@ -27,7 +27,7 @@ export DEB_BUILD_ARCH # build the following configurations -CONFIGS = debian-swx11+glu \ +CONFIGS = debian-swx11+glu-arch \ debian-dri-arch \ debian-osmesa16 \ debian-osmesa16-static \ @@ -45,10 +45,6 @@ # CONFIGS += debian-alpha-ev5 #endif -ifeq ($(DEB_BUILD_ARCH), amd64) - CONFIGS += debian-amd64 -endif - #ifeq ($(DEB_BUILD_ARCH), powerpc) # CONFIGS += debian-powerpc-603 #endif -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]